diff -Nru tupi-0.2+git04/configure tupi-0.2+git05/configure
--- tupi-0.2+git04/configure	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure	2014-12-15 14:21:32.000000000 +0000
@@ -35,12 +35,8 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>. #
 ###########################################################################
 
-function checkQt {
-  hash qmake-qt4 2>&- || { echo >&2 "Fatal error: Package \"qmake/qmake-qt4\" is not installed on your system. Aborting..."; exit 1; }
-}
-
 hash ruby 2>&- || { echo >&2 "Fatal error: Package \"ruby\" is not installed on your system. Aborting..."; exit 1; }
-hash qmake 2>&- || checkQt 
+hash qmake 2>&- || { echo >&2 "Fatal error: Package \"qmake\" is not installed on your system. Aborting..."; exit 1; }
 
 export RUBYLIB=.:${RUBYLIB}
 ruby configure.rb $*
diff -Nru tupi-0.2+git04/configure.rb tupi-0.2+git05/configure.rb
--- tupi-0.2+git04/configure.rb	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.rb	2014-12-15 14:21:32.000000000 +0000
@@ -55,8 +55,10 @@
   --bindir=[path]:      Set binaries path [/usr/bin]
   --libdir=[path]:      Set library path [/usr/lib/tupi | /usr/lib64/tupi]
   --sharedir=[path]:    Set data path [/usr/share]
-  --with-ffmpeg=[path]: Set ffmpeg installation path [/usr]
-  --without-ffmpeg:     Disable ffmpeg support
+  --with-libav=[path]: Set libav installation path [/usr]
+  --with-quazip=[path]: Set quazip installation path [/usr]
+  --with-theora=[path]: Set theora installation path [/usr]
+  --without-libav:     Disable libav support
   --without-debug:      Disable debug
   --with-qtdir=[path]:  Set Qt directory [i.e. /usr/local/qt]
   --package-build:      Option exclusive for package maintainers
@@ -70,104 +72,67 @@
        debug = 0
     end
 
-    if conf.hasArgument?("with-ffmpeg") and conf.hasArgument?("without-ffmpeg")  
-       Info.error << " ERROR: Options --with-ffmpeg and --without-ffmpeg are mutually exclusive\n"
+    if conf.hasArgument?("with-libav") and conf.hasArgument?("without-libav")  
+       Info.error << " ERROR: Options --with-libav and --without-libav are mutually exclusive\n"
        exit 0
     end
 
     config = RQonf::Config.new
 
-    distro = ""
-    if FileTest.exists?("/etc/lsb-release")
-       conf.load_properties("/etc/lsb-release")
-       if conf.hasProperty?("DISTRIB_CODENAME")
-          distro = conf.propertyValue("DISTRIB_CODENAME")
-       end
-       if conf.hasProperty?("DISTRIB_ID")
-          distroName = conf.propertyValue("DISTRIB_ID") 
-          if distroName == "Ubuntu"
-             config.addDefine("UBUNTU")
-          end
-       end
-    end
-
     if conf.hasArgument?("with-qtdir")
        qtdir = conf.argumentValue("with-qtdir")
-       conf.verifyQtVersion("4.7.0", debug, qtdir)
-       if distro == "lucid"
-          config.addDefine("K_LUCID")
-       end
+       conf.verifyQtVersion("5.2.0", debug, qtdir)
     else
-       if distro == "lucid"
-          Info.error << " ERROR: If you are using Ubuntu Lucid (10.04). You must use the parameter --with-qtdir\n"
-          Info.error << " Try the option --help for more info\n"
-          exit 0
-       else
-          conf.verifyQtVersion("4.7.0", debug, "")
-       end
+       conf.verifyQtVersion("5.2.0", debug, "")
     end
 
-    avcodecFile = "/usr/include/libavcodec/version.h"
-
-    if conf.hasArgument?("with-ffmpeg")
-       ffmpegDir = conf.argumentValue("with-ffmpeg")
-       if File.directory? ffmpegDir 
-          ffmpegLib = conf.argumentValue("with-ffmpeg") + "/lib"
-          ffmpegInclude = conf.argumentValue("with-ffmpeg") + "/include"
-          avcodecFile = ffmpegInclude + "/libavcodec/version.h"
-          config.addLib("-L" + ffmpegLib)
-          config.addIncludePath(ffmpegInclude)
+    if conf.hasArgument?("with-libav")
+       libavDir = conf.argumentValue("with-libav")
+       if File.directory? libavDir 
+          libavLib = libavDir + "/lib"
+          libavInclude = libavDir + "/include"
+          config.addLib("-L" + libavLib)
+          config.addIncludePath(libavInclude)
        else
-          Info.error << " ERROR: ffmpeg directory does not exist!\n"
+          Info.error << " ERROR: libav directory does not exist!\n"
           exit 0
        end
+    else
+       if conf.hasArgument?("without-libav")
+          Info.warn << "Disabling libav support: " << $endl
+          conf.disableFFmpeg()
+       end
     end
 
-    if FileTest.exists?(avcodecFile)
-       major = `egrep LIBAVCODEC_VERSION_MAJOR #{avcodecFile} | head -n 1`
-       minor = `egrep LIBAVCODEC_VERSION_MINOR #{avcodecFile} | head -n 1`
-       majorVersion = major.split
-       minorVersion = minor.split
-       destination = "src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp"
-
-       if FileTest.exists?("/etc/debian_version")
-          if FileTest.exists?("/etc/lsb-release") # Ubuntu
-             if majorVersion[2] >= "54" and minorVersion[2] >= "35"
-                FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.new.cpp", destination)
-             else
-                FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp", destination)
-             end
-          else # Debian
-             if majorVersion[2] >= "54" and minorVersion[2] == "35"
-                FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.debian.cpp", destination)
-             end
-          end
-       else # Other distros
-          if FileTest.exists?("/usr/bin/pacman") # Arch / Manjaro
-             FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.arch.cpp", destination)
-          else
-             if majorVersion[2] >= "54" and minorVersion[2] >= "35"
-                FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.new.cpp", destination)
-             else
-                FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp", destination)
-             end
-          end
+    if conf.hasArgument?("with-quazip")
+       quazipDir = conf.argumentValue("with-quazip")
+       if File.directory? quazipDir
+          quazipLib = quazipDir + "/lib"
+          quazipInclude = quazipDir + "/include"
+          config.addLib("-L" + quazipLib)
+          config.addIncludePath(quazipInclude)
+       else
+          Info.error << " ERROR: quazip directory does not exist!\n"
+          exit 0
        end
     end
 
-    if conf.hasArgument?("without-ffmpeg")
-       Info.warn << "Disabling ffmpeg support: " << $endl
-       conf.disableFFmpeg()
+    if conf.hasArgument?("with-theora")
+       theoraDir = conf.argumentValue("with-theora")
+       if File.directory? theoraDir
+          theoraLib = theoraDir + "/lib"
+          theoraInclude = theoraDir + "/include"
+          config.addLib("-L" + theoraLib)
+          config.addIncludePath(theoraInclude)
+       else
+          Info.error << " ERROR: theora directory does not exist!\n"
+          exit 0
+       end
     end
 
     conf.createTests
     conf.setTestDir("configure.tests")
-
-    if distro == "lucid"
-       conf.runTests(config, conf, debug, true)
-    else
-       conf.runTests(config, conf, debug, false)
-    end
+    conf.runTests(config, conf, debug)
 
     config.addModule("core")
     config.addModule("gui")
@@ -180,8 +145,8 @@
     # config.addLib("-ltupifwsound")
     
     config.addDefine('VERSION=\\\\\"0.2\\\\\"')
-    config.addDefine('CODE_NAME=\\\\\"Argentum\\\\\"')
-    config.addDefine('REVISION=\\\\\"git04\\\\\"')
+    config.addDefine('CODE_NAME=\\\\\"Amandy\\\\\"')
+    config.addDefine('REVISION=\\\\\"git05\\\\\"')
 
     if conf.hasArgument?("install-headers")
        config.addDefine("ADD_HEADERS");
@@ -197,13 +162,16 @@
        config.addOption("silent")
        print "[ \033[91mOFF\033[0m ]\n"
     end
-    
+
+    if File.exists?('/etc/canaima_version')
+       config.addDefine("CANAIMA")
+    end
+
     unix = config.addScope("unix")
     unix.addVariable("MOC_DIR", ".moc")
     unix.addVariable("UI_DIR", ".ui")
     unix.addVariable("OBJECTS_DIR", ".obj")
 
-    # The file tupiglobal.pri contains all the global variables for the compilation process        
     config.save("tupiglobal.pri")
     conf.createMakefiles
 
diff -Nru tupi-0.2+git04/configure.tests/ffmpeg/ffmpeg.pro tupi-0.2+git05/configure.tests/ffmpeg/ffmpeg.pro
--- tupi-0.2+git04/configure.tests/ffmpeg/ffmpeg.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/ffmpeg/ffmpeg.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-######################################################################
-# Automatically generated by qmake (1.07a) Fri Jan 20 09:41:23 2006
-######################################################################
-
-TEMPLATE = app
-CONFIG -= moc
-
-macx {
-    CONFIG -= app_bundle
-    CONFIG += warn_on static console
-}
-
-INCLUDEPATH += .
-INCLUDEPATH += /usr/include/ffmpeg
-DEFINES += __STDC_CONSTANT_MACROS
-
-LIBS += -lavformat -lavcodec -lavutil
-# Input
-SOURCES += main.cpp
diff -Nru tupi-0.2+git04/configure.tests/ffmpeg/ffmpeg.qonf tupi-0.2+git05/configure.tests/ffmpeg/ffmpeg.qonf
--- tupi-0.2+git04/configure.tests/ffmpeg/ffmpeg.qonf	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/ffmpeg/ffmpeg.qonf	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" ?>
-<qonf optional="true">
-    <test name="FFmpeg">
-        <dir path="." />
-    </test>
-    <provide>
-        <defines>
-            <define value="HAVE_FFMPEG" />
-        </defines>
-        <libs>
-            <lib path="-lavformat" />
-            <lib path="-lavcodec" />
-        </libs>
-        <includes>
-            <include path="/usr/include/ffmpeg/" />
-        </includes>
-    </provide>
-    <solution>
-        <linux package="ffmpeg" url="http://ffmpeg.sourceforge.net/" comment="" >
-            <distribution name="gentoo" package="ffmpeg" url="http://ffmpeg.sourceforge.net/" comment="Try: emerge ffmpeg" />
-            <distribution name="ubuntu" package="libavcodec-dev libavformat-dev" url="http://ffmpeg.sourceforge.net/" comment="Try: apt-get install libavformat-dev libavcodec-dev" />
-        </linux>
-        <windows package="ffmpeg" url="http://ffmpeg.sourceforge.net/" comment="" />
-        <macosx package="ffmpeg" url="http://ffmpeg.sourceforge.net/" comment="" />
-    </solution>
-</qonf>
diff -Nru tupi-0.2+git04/configure.tests/ffmpeg/main.cpp tupi-0.2+git05/configure.tests/ffmpeg/main.cpp
--- tupi-0.2+git04/configure.tests/ffmpeg/main.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/ffmpeg/main.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifdef __cplusplus
-extern "C" {
-    #include "libavformat/avformat.h"
-    #include "libavcodec/avcodec.h"
-}
-#endif
-
-#include <iostream>
-
-int main()
-{
-    av_register_all();
-
-    #if defined(K_LUCID)
-        AVOutputFormat *fmt = guess_format("mpeg", NULL, NULL);
-    #else
-        AVOutputFormat *fmt = av_guess_format("mpeg", NULL, NULL);
-    #endif
-
-    AVFormatContext *oc = avformat_alloc_context();
-    oc->oformat = fmt;
-
-    AVCodecContext *c;
-    AVStream *st;
-
-    // st = av_new_stream(oc, 0);
-    st = avformat_new_stream(oc, 0);
-
-    c = st->codec;
-    c->time_base.den = 24;
-    c->time_base.num = 1;
-    c->gop_size = 12;
-    c->pix_fmt = PIX_FMT_YUV420P;
-
-    av_free(oc);
-
-    return 0;
-}
-
diff -Nru tupi-0.2+git04/configure.tests/libav/libav.pro tupi-0.2+git05/configure.tests/libav/libav.pro
--- tupi-0.2+git04/configure.tests/libav/libav.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/libav/libav.pro	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,15 @@
+TEMPLATE = app
+CONFIG -= moc
+TARGET = libav 
+
+macx {
+    CONFIG -= app_bundle
+    CONFIG += warn_on static console
+}
+
+INCLUDEPATH += .
+DEFINES += __STDC_CONSTANT_MACROS
+LIBS += -lavformat -lavcodec -lavutil
+
+# Input
+SOURCES += main.cpp
diff -Nru tupi-0.2+git04/configure.tests/libav/libav.qonf tupi-0.2+git05/configure.tests/libav/libav.qonf
--- tupi-0.2+git04/configure.tests/libav/libav.qonf	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/libav/libav.qonf	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<qonf optional="true">
+    <test name="Libav">
+        <dir path="." />
+    </test>
+    <provide>
+        <defines>
+            <define value="HAVE_LIBAV" />
+        </defines>
+        <libs>
+            <lib path="-lavformat" />
+            <lib path="-lavcodec" />
+        </libs>
+        <includes>
+            <include path="/usr/include/libavformat/" />
+            <include path="/usr/include/libavcodec/" />
+        </includes>
+    </provide>
+    <solution>
+        <linux package="ffmpeg" url="http://libav.org/" comment="" >
+            <distribution name="gentoo" package="ffmpeg" url="http://libav.org/" comment="Try: emerge ffmpeg" />
+            <distribution name="ubuntu" package="libavcodec-dev libavformat-dev" url="http://libav.org/" comment="Try: apt-get install libavformat-dev libavcodec-dev" />
+            <distribution name="fedora" package="ffmpeg-devel libvpx-devel" url="http://libav.org/" comment="Try: yum install ffmpeg-devel libvpx-devel" />
+        </linux>
+        <windows package="libav" url="http://libav.org/" comment="" />
+        <macosx package="libav" url="http://libav.org/" comment="" />
+    </solution>
+</qonf>
diff -Nru tupi-0.2+git04/configure.tests/libav/main.cpp tupi-0.2+git05/configure.tests/libav/main.cpp
--- tupi-0.2+git04/configure.tests/libav/main.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/libav/main.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,74 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifdef __cplusplus
+extern "C" {
+    #include "libavformat/avformat.h"
+    #include "libavcodec/avcodec.h"
+}
+#endif
+
+#include <iostream>
+
+int main()
+{
+    av_register_all();
+
+    #if defined(K_LUCID)
+        AVOutputFormat *fmt = guess_format("mpeg", NULL, NULL);
+    #else
+        AVOutputFormat *fmt = av_guess_format("mpeg", NULL, NULL);
+    #endif
+
+    AVFormatContext *oc = avformat_alloc_context();
+    oc->oformat = fmt;
+
+    AVCodecContext *c;
+    AVStream *st;
+
+    // st = av_new_stream(oc, 0);
+    st = avformat_new_stream(oc, 0);
+
+    c = st->codec;
+    c->time_base.den = 24;
+    c->time_base.num = 1;
+    c->gop_size = 12;
+    c->pix_fmt = PIX_FMT_YUV420P;
+
+    av_free(oc);
+
+    return 0;
+}
+
diff -Nru tupi-0.2+git04/configure.tests/libav/Makefile tupi-0.2+git05/configure.tests/libav/Makefile
--- tupi-0.2+git04/configure.tests/libav/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/libav/Makefile	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,311 @@
+#############################################################################
+# Makefile for building: libav
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project:  libav.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile libav.pro
+#############################################################################
+
+MAKEFILE      = Makefile
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -D__STDC_CONSTANT_MACROS -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS        = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS      = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH       = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK          = g++
+LFLAGS        = -m64 -Wl,-O1
+LIBS          = $(SUBLIBS) -L/usr/X11R6/lib64 -lavformat -lavcodec -lavutil -lQt5Gui -L/usr/lib/x86_64-linux-gnu -lQt5Core -lGL -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       = main.cpp 
+OBJECTS       = main.o
+DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		libav.pro main.cpp
+QMAKE_TARGET  = libav
+TARGET        = libav
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: libav.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		libav.pro \
+		/usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Core.prl
+	$(QMAKE) -o Makefile libav.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+libav.pro:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+	@$(QMAKE) -o Makefile libav.pro
+
+qmake_all: FORCE
+
+dist: 
+	@test -d .tmp/libav1.0.0 || mkdir -p .tmp/libav1.0.0
+	$(COPY_FILE) --parents $(DIST) .tmp/libav1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/libav1.0.0/ && (cd `dirname .tmp/libav1.0.0` && $(TAR) libav1.0.0.tar libav1.0.0 && $(COMPRESS) libav1.0.0.tar) && $(MOVE) `dirname .tmp/libav1.0.0`/libav1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/libav1.0.0
+
+
+clean:compiler_clean 
+	-$(DEL_FILE) $(OBJECTS)
+	-$(DEL_FILE) *~ core *.core
+
+
+distclean: clean 
+	-$(DEL_FILE) $(TARGET) 
+	-$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: 
+
+####### Compile
+
+main.o: main.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/mobility/main.cpp tupi-0.2+git05/configure.tests/mobility/main.cpp
--- tupi-0.2+git04/configure.tests/mobility/main.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/mobility/main.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-/*
-#include <stdio.h>
-#include <string.h>
-#include "zlib.h"
-*/
-
-#include <QCamera>
-#include <QCameraImageCapture>
-#include <QCameraViewfinder>
-
-int main()
-{
-    QByteArray cameraDevice = QCamera::availableDevices()[0];
-    QCamera *camera = new QCamera(cameraDevice);
-    QCameraViewfinder *viewFinder = new QCameraViewfinder();
-    camera->setViewfinder(viewFinder);
-
-    camera->setCaptureMode(QCamera::CaptureStillImage);
-    new QCameraImageCapture(camera);
-
-    if (camera->state() == QCamera::ActiveState)
-        camera->stop();
- 
-    camera->start();
-}
diff -Nru tupi-0.2+git04/configure.tests/mobility/mobility.pro tupi-0.2+git05/configure.tests/mobility/mobility.pro
--- tupi-0.2+git04/configure.tests/mobility/mobility.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/mobility/mobility.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-DEPENDPATH += .
-INCLUDEPATH += /usr/include/QtMobility /usr/include/QtMultimediaKit
-
-macx {
-    CONFIG -= app_bundle
-    CONFIG += warn_on static console
-}
-
-# Input
-SOURCES += main.cpp
-LIBS += -lQtMultimediaKit
diff -Nru tupi-0.2+git04/configure.tests/mobility/mobility.qonf tupi-0.2+git05/configure.tests/mobility/mobility.qonf
--- tupi-0.2+git04/configure.tests/mobility/mobility.qonf	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/mobility/mobility.qonf	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" ?>
-<qonf optional="false" >
-	<test name="Qt Mobility">
-		<dir path="." />
-	</test>
-	<provide>
-		<defines>
-			<define value="HAVE_MOBILITY" />
-		</defines>
-		<libs>
-			<lib path="-lQtMultimediaKit" />
-		</libs>
-	</provide>
-	<solution>
-		<linux package="qtmobility" url="http://doc.qt.digia.com/qtmobility" comment="" >
-			<distribution name="gentoo" package="qtmobility" url="http://doc.qt.digia.com/qtmobility" comment="Try: emerge qt-mobility" />
-			<distribution name="ubuntu" package="qtmobility-dev" url="http://doc.qt.digia.com/qtmobility" comment="Try: apt-get install qtmobility-dev" />
-		</linux>
-		<windows package="qtmobility" url="http://doc.qt.digia.com/qtmobility" comment="" />
-		<macosx package="qtmobility" url="http://doc.qt.digia.com/qtmobility" comment="" />
-	</solution>
-</qonf>
diff -Nru tupi-0.2+git04/configure.tests/multimedia/main.cpp tupi-0.2+git05/configure.tests/multimedia/main.cpp
--- tupi-0.2+git04/configure.tests/multimedia/main.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/multimedia/main.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,60 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+/*
+#include <stdio.h>
+#include <string.h>
+#include "zlib.h"
+*/
+
+#include <QCamera>
+#include <QCameraImageCapture>
+#include <QCameraViewfinder>
+
+int main()
+{
+    QByteArray cameraDevice = QCamera::availableDevices()[0];
+    QCamera *camera = new QCamera(cameraDevice);
+    QCameraViewfinder *viewFinder = new QCameraViewfinder();
+    camera->setViewfinder(viewFinder);
+
+    camera->setCaptureMode(QCamera::CaptureStillImage);
+    new QCameraImageCapture(camera);
+
+    if (camera->state() == QCamera::ActiveState)
+        camera->stop();
+ 
+    camera->start();
+}
diff -Nru tupi-0.2+git04/configure.tests/multimedia/Makefile tupi-0.2+git05/configure.tests/multimedia/Makefile
--- tupi-0.2+git04/configure.tests/multimedia/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/multimedia/Makefile	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,324 @@
+#############################################################################
+# Makefile for building: multimedia
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project:  multimedia.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile multimedia.pro
+#############################################################################
+
+MAKEFILE      = Makefile
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -DQT_NO_DEBUG -DQT_MULTIMEDIAWIDGETS_LIB -DQT_MULTIMEDIA_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS        = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS      = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH       = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -isystem /usr/include/qt5/QtMultimedia -isystem /usr/include/qt5/QtMultimediaWidgets -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtMultimediaWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtMultimedia -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtNetwork -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK          = g++
+LFLAGS        = -m64 -Wl,-O1 -Wl,-rpath-link,/usr/lib/x86_64-linux-gnu
+LIBS          = $(SUBLIBS) -L/usr/X11R6/lib64 -lQt5MultimediaWidgets -L/usr/lib/x86_64-linux-gnu -lQt5Multimedia -lQt5Widgets -lQt5Network -lQt5Gui -lQt5Core -lGL -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       = main.cpp 
+OBJECTS       = main.o
+DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		multimedia.pro main.cpp
+QMAKE_TARGET  = multimedia
+TARGET        = multimedia
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: multimedia.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		multimedia.pro \
+		/usr/lib/x86_64-linux-gnu/libQt5MultimediaWidgets.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Multimedia.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Core.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Network.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl
+	$(QMAKE) -o Makefile multimedia.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+multimedia.pro:
+/usr/lib/x86_64-linux-gnu/libQt5MultimediaWidgets.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Multimedia.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Network.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl:
+qmake: FORCE
+	@$(QMAKE) -o Makefile multimedia.pro
+
+qmake_all: FORCE
+
+dist: 
+	@test -d .tmp/multimedia1.0.0 || mkdir -p .tmp/multimedia1.0.0
+	$(COPY_FILE) --parents $(DIST) .tmp/multimedia1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/multimedia1.0.0/ && (cd `dirname .tmp/multimedia1.0.0` && $(TAR) multimedia1.0.0.tar multimedia1.0.0 && $(COMPRESS) multimedia1.0.0.tar) && $(MOVE) `dirname .tmp/multimedia1.0.0`/multimedia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/multimedia1.0.0
+
+
+clean:compiler_clean 
+	-$(DEL_FILE) $(OBJECTS)
+	-$(DEL_FILE) *~ core *.core
+
+
+distclean: clean 
+	-$(DEL_FILE) $(TARGET) 
+	-$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_uic_make_all:
+compiler_uic_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: 
+
+####### Compile
+
+main.o: main.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/multimedia/multimedia.pro tupi-0.2+git05/configure.tests/multimedia/multimedia.pro
--- tupi-0.2+git04/configure.tests/multimedia/multimedia.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/multimedia/multimedia.pro	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,15 @@
+TEMPLATE = app
+CONFIG -= moc
+TARGET = multimedia
+
+macx {
+    CONFIG -= app_bundle
+    CONFIG += warn_on static console
+}
+
+QT += multimedia multimediawidgets
+DEPENDPATH += .
+INCLUDEPATH += /usr/include/qt5/QtMultimedia /usr/include/qt5/QtMultimediaWidgets
+
+# Input
+SOURCES += main.cpp
diff -Nru tupi-0.2+git04/configure.tests/multimedia/multimedia.qonf tupi-0.2+git05/configure.tests/multimedia/multimedia.qonf
--- tupi-0.2+git04/configure.tests/multimedia/multimedia.qonf	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/multimedia/multimedia.qonf	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<qonf optional="false" >
+	<test name="Qt Multimedia">
+		<dir path="." />
+	</test>
+	<provide>
+		<defines>
+			<define value="HAVE_MULTIMEDIA" />
+		</defines>
+	</provide>
+	<solution>
+		<linux package="qtmultimedia5-dev" url="http://qt-project.org" comment="" >
+			<distribution name="gentoo" package="qtmultimedia5-dev" url="http://qt-project.org" comment="Try: emerge qtmultimedia5-dev" />
+			<distribution name="ubuntu" package="qtmultimedia5-dev" url="http://qt-project.org" comment="Try: apt-get install qtmultimedia5-dev" />
+		</linux>
+		<windows package="qtmultimedia5-dev" url="http://qt-project.org" comment="" />
+		<macosx package="qtmultimedia5-dev" url="http://http://qt-project.org" comment="" />
+	</solution>
+</qonf>
diff -Nru tupi-0.2+git04/configure.tests/opengl/Makefile tupi-0.2+git05/configure.tests/opengl/Makefile
--- tupi-0.2+git04/configure.tests/opengl/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/opengl/Makefile	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,320 @@
+#############################################################################
+# Makefile for building: opengl
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project:  opengl.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile opengl.pro
+#############################################################################
+
+MAKEFILE      = Makefile
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS        = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS      = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH       = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtOpenGL -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK          = g++
+LFLAGS        = -m64 -Wl,-O1
+LIBS          = $(SUBLIBS) -L/usr/X11R6/lib64 -lQt5OpenGL -L/usr/lib/x86_64-linux-gnu -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       = main.cpp 
+OBJECTS       = main.o
+DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		opengl.pro main.cpp
+QMAKE_TARGET  = opengl
+TARGET        = opengl
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: opengl.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		opengl.pro \
+		/usr/lib/x86_64-linux-gnu/libQt5OpenGL.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Core.prl
+	$(QMAKE) -o Makefile opengl.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+opengl.pro:
+/usr/lib/x86_64-linux-gnu/libQt5OpenGL.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+	@$(QMAKE) -o Makefile opengl.pro
+
+qmake_all: FORCE
+
+dist: 
+	@test -d .tmp/opengl1.0.0 || mkdir -p .tmp/opengl1.0.0
+	$(COPY_FILE) --parents $(DIST) .tmp/opengl1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/opengl1.0.0/ && (cd `dirname .tmp/opengl1.0.0` && $(TAR) opengl1.0.0.tar opengl1.0.0 && $(COMPRESS) opengl1.0.0.tar) && $(MOVE) `dirname .tmp/opengl1.0.0`/opengl1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/opengl1.0.0
+
+
+clean:compiler_clean 
+	-$(DEL_FILE) $(OBJECTS)
+	-$(DEL_FILE) *~ core *.core
+
+
+distclean: clean 
+	-$(DEL_FILE) $(TARGET) 
+	-$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_uic_make_all:
+compiler_uic_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: 
+
+####### Compile
+
+main.o: main.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/opengl/opengl.pro tupi-0.2+git05/configure.tests/opengl/opengl.pro
--- tupi-0.2+git04/configure.tests/opengl/opengl.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/opengl/opengl.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,17 +1,15 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Tue Jan 2 12:58:43 2007
-######################################################################
-
 TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
+CONFIG -= moc
+TARGET = opengl 
 
 macx {
     CONFIG -= app_bundle
     CONFIG += warn_on static console
 }
 
+QT += opengl
+DEPENDPATH += .
+INCLUDEPATH += .
+
 # Input
 SOURCES += main.cpp
-
-QT += opengl
diff -Nru tupi-0.2+git04/configure.tests/quazip/Makefile tupi-0.2+git05/configure.tests/quazip/Makefile
--- tupi-0.2+git04/configure.tests/quazip/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/quazip/Makefile	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,311 @@
+#############################################################################
+# Makefile for building: quazip
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project:  quazip.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake LIBS\ +=\ -lquazip-qt5 -o Makefile quazip.pro
+#############################################################################
+
+MAKEFILE      = Makefile
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS        = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS      = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH       = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -isystem /usr/include/quazip -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK          = g++
+LFLAGS        = -m64 -Wl,-O1
+LIBS          = $(SUBLIBS) -L/usr/X11R6/lib64 -lquazip-qt5 -lz -lQt5Gui -L/usr/lib/x86_64-linux-gnu -lQt5Core -lGL -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       = main.cpp 
+OBJECTS       = main.o
+DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		quazip.pro main.cpp
+QMAKE_TARGET  = quazip
+TARGET        = quazip
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: quazip.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		quazip.pro \
+		/usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Core.prl
+	$(QMAKE) LIBS\ +=\ -lquazip-qt5 -o Makefile quazip.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+quazip.pro:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+	@$(QMAKE) LIBS\ +=\ -lquazip-qt5 -o Makefile quazip.pro
+
+qmake_all: FORCE
+
+dist: 
+	@test -d .tmp/quazip1.0.0 || mkdir -p .tmp/quazip1.0.0
+	$(COPY_FILE) --parents $(DIST) .tmp/quazip1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/quazip1.0.0/ && (cd `dirname .tmp/quazip1.0.0` && $(TAR) quazip1.0.0.tar quazip1.0.0 && $(COMPRESS) quazip1.0.0.tar) && $(MOVE) `dirname .tmp/quazip1.0.0`/quazip1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/quazip1.0.0
+
+
+clean:compiler_clean 
+	-$(DEL_FILE) $(OBJECTS)
+	-$(DEL_FILE) *~ core *.core
+
+
+distclean: clean 
+	-$(DEL_FILE) $(TARGET) 
+	-$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: 
+
+####### Compile
+
+main.o: main.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/quazip/quazip.pro tupi-0.2+git05/configure.tests/quazip/quazip.pro
--- tupi-0.2+git04/configure.tests/quazip/quazip.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/quazip/quazip.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,10 @@
+TEMPLATE = app
+CONFIG -= moc
+TARGET = quazip 
 DEPENDPATH += .
 
 macx {
-    INCLUDEPATH += /usr/local/include/quazip
+    INCLUDEPATH += /usr/local/include
     CONFIG -= app_bundle
     CONFIG += warn_on static console
 }
@@ -10,6 +13,7 @@
   INCLUDEPATH += /usr/include/quazip
 }
 
+LIBS += -lz
+
 # Input
 SOURCES += main.cpp
-LIBS += -lquazip
diff -Nru tupi-0.2+git04/configure.tests/quazip/quazip.qonf tupi-0.2+git05/configure.tests/quazip/quazip.qonf
--- tupi-0.2+git04/configure.tests/quazip/quazip.qonf	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/quazip/quazip.qonf	2014-12-15 14:21:32.000000000 +0000
@@ -7,9 +7,6 @@
 		<defines>
 			<define value="HAVE_QUAZIP" />
 		</defines>
-		<libs>
-			<lib path="-lquazip" />
-		</libs>
                 <includes>
                         <include path="/usr/include/quazip/" />
                 </includes>
diff -Nru tupi-0.2+git04/configure.tests/theora/Makefile tupi-0.2+git05/configure.tests/theora/Makefile
--- tupi-0.2+git04/configure.tests/theora/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/theora/Makefile	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,311 @@
+#############################################################################
+# Makefile for building: theora
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project:  theora.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile theora.pro
+#############################################################################
+
+MAKEFILE      = Makefile
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS        = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS      = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH       = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK          = g++
+LFLAGS        = -m64 -Wl,-O1
+LIBS          = $(SUBLIBS) -L/usr/X11R6/lib64 -ltheora -ltheoraenc -ltheoradec -logg -lQt5Gui -L/usr/lib/x86_64-linux-gnu -lQt5Core -lGL -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       = main.cpp 
+OBJECTS       = main.o
+DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		theora.pro main.cpp
+QMAKE_TARGET  = theora
+TARGET        = theora
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: theora.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		theora.pro \
+		/usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Core.prl
+	$(QMAKE) -o Makefile theora.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+theora.pro:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+	@$(QMAKE) -o Makefile theora.pro
+
+qmake_all: FORCE
+
+dist: 
+	@test -d .tmp/theora1.0.0 || mkdir -p .tmp/theora1.0.0
+	$(COPY_FILE) --parents $(DIST) .tmp/theora1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/theora1.0.0/ && (cd `dirname .tmp/theora1.0.0` && $(TAR) theora1.0.0.tar theora1.0.0 && $(COMPRESS) theora1.0.0.tar) && $(MOVE) `dirname .tmp/theora1.0.0`/theora1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/theora1.0.0
+
+
+clean:compiler_clean 
+	-$(DEL_FILE) $(OBJECTS)
+	-$(DEL_FILE) *~ core *.core
+
+
+distclean: clean 
+	-$(DEL_FILE) $(TARGET) 
+	-$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: 
+
+####### Compile
+
+main.o: main.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/theora/theora.pro tupi-0.2+git05/configure.tests/theora/theora.pro
--- tupi-0.2+git04/configure.tests/theora/theora.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/theora/theora.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,6 @@
 TEMPLATE = app
 CONFIG -= moc
+TARGET = theora
 
 macx {
     CONFIG -= app_bundle
@@ -7,7 +8,7 @@
 }
 
 INCLUDEPATH += .
-
 LIBS += -ltheora -ltheoraenc -ltheoradec -logg
 
+# Input
 SOURCES += main.cpp
diff -Nru tupi-0.2+git04/configure.tests/zlib/Makefile tupi-0.2+git05/configure.tests/zlib/Makefile
--- tupi-0.2+git04/configure.tests/zlib/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/zlib/Makefile	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,311 @@
+#############################################################################
+# Makefile for building: zlib
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project:  zlib.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile zlib.pro
+#############################################################################
+
+MAKEFILE      = Makefile
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS        = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS      = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH       = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK          = g++
+LFLAGS        = -m64 -Wl,-O1
+LIBS          = $(SUBLIBS) -L/usr/X11R6/lib64 -lz -lQt5Gui -L/usr/lib/x86_64-linux-gnu -lQt5Core -lGL -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       = main.cpp 
+OBJECTS       = main.o
+DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		zlib.pro main.cpp
+QMAKE_TARGET  = zlib
+TARGET        = zlib
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: zlib.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+		zlib.pro \
+		/usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+		/usr/lib/x86_64-linux-gnu/libQt5Core.prl
+	$(QMAKE) -o Makefile zlib.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+zlib.pro:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+	@$(QMAKE) -o Makefile zlib.pro
+
+qmake_all: FORCE
+
+dist: 
+	@test -d .tmp/zlib1.0.0 || mkdir -p .tmp/zlib1.0.0
+	$(COPY_FILE) --parents $(DIST) .tmp/zlib1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/zlib1.0.0/ && (cd `dirname .tmp/zlib1.0.0` && $(TAR) zlib1.0.0.tar zlib1.0.0 && $(COMPRESS) zlib1.0.0.tar) && $(MOVE) `dirname .tmp/zlib1.0.0`/zlib1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/zlib1.0.0
+
+
+clean:compiler_clean 
+	-$(DEL_FILE) $(OBJECTS)
+	-$(DEL_FILE) *~ core *.core
+
+
+distclean: clean 
+	-$(DEL_FILE) $(TARGET) 
+	-$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: 
+
+####### Compile
+
+main.o: main.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/zlib/zlib.pro tupi-0.2+git05/configure.tests/zlib/zlib.pro
--- tupi-0.2+git04/configure.tests/zlib/zlib.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/zlib/zlib.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,11 +1,15 @@
-DEPENDPATH += .
-INCLUDEPATH += .
+TEMPLATE = app
+CONFIG -= moc
+TARGET = zlib
 
 macx {
     CONFIG -= app_bundle
     CONFIG += warn_on static console
 }
 
+DEPENDPATH += .
+INCLUDEPATH += .
+LIBS += -lz
+
 # Input
 SOURCES += main.cpp
-LIBS += -lz
diff -Nru tupi-0.2+git04/debian/changelog tupi-0.2+git05/debian/changelog
--- tupi-0.2+git04/debian/changelog	2014-09-18 10:11:54.000000000 +0000
+++ tupi-0.2+git05/debian/changelog	2015-05-21 04:55:03.000000000 +0000
@@ -1,20 +1,43 @@
-tupi (0.2+git04-2build3) utopic; urgency=medium
+tupi (0.2+git05-3) unstable; urgency=medium
 
-  * Rebuild against libquazip1.
+  * Upload to unstable (Closes: #786337).
 
- -- Colin Watson <cjwatson@ubuntu.com>  Thu, 18 Sep 2014 11:11:54 +0100
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 21 May 2015 14:54:58 +1000
 
-tupi (0.2+git04-2build2) utopic; urgency=medium
+tupi (0.2+git05-2) experimental; urgency=low
 
-  * Rebuild against libav11.
+  * override_dh_fixperms: check if -data package is built to fix
+    FTBFS "-B" type, like on buildd servers.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 05 Jan 2015 10:25:13 +1100
+
+tupi (0.2+git05-1) experimental; urgency=low
+
+  * New upstream release [December 2014].
+  * Build-Depends:
+    - pkg-config
+    - qtmobility-dev
+    - qt4-linguist-tools
+    + qttools5-dev-tools
+    - qt4-qmake
+    + qt5-qmake
+    + qtmultimedia5-dev
+    - libqt4-opengl-dev
+    + libqt5opengl5-dev
+    + libqt5svg5-dev
+    - libquazip-dev
+    + libquazip-qt5-dev
+  * Build with "--without-debug"; added new patch to enable verbose build.
+  * Do not inject "-Wl,--as-needed" to LDFLAGS.
+  * Added new patch to disable defective libquazip detection.
+  * Standards-Version: 3.9.6.
+  * Updated Vcs-Browser URL.
+  * Updated "debian/watch" file.
+  * Updated link to new upstream repository.
+  * tupi-data: new lintian-override for "extra-license-file".
+  * "debian/rules": --parallel build; minor cleanup; override_dh_fixperms.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Fri, 05 Sep 2014 02:39:17 +0100
-
-tupi (0.2+git04-2build1) utopic; urgency=medium
-
-  * No-change rebuild against libav10.
-
- -- Logan Rosen <logan@ubuntu.com>  Fri, 30 May 2014 23:28:15 -0400
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 04 Jan 2015 18:42:38 +1100
 
 tupi (0.2+git04-2) unstable; urgency=low
 
diff -Nru tupi-0.2+git04/debian/clean tupi-0.2+git05/debian/clean
--- tupi-0.2+git04/debian/clean	2014-05-17 11:55:17.000000000 +0000
+++ tupi-0.2+git05/debian/clean	2015-01-07 06:11:38.000000000 +0000
@@ -1,8 +1,8 @@
 debian/*.xpm
+bin/tupi.bin
 tupiglobal.pri
 launcher/tupi
 launcher/tupi.desktop
-src/components/help/help/css/tupi.css
 src/framework/tupconfig.pri
 src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp
 src/components/help/man/*.1.gz
diff -Nru tupi-0.2+git04/debian/control tupi-0.2+git05/debian/control
--- tupi-0.2+git04/debian/control	2014-05-17 10:33:21.000000000 +0000
+++ tupi-0.2+git05/debian/control	2015-05-21 04:54:38.000000000 +0000
@@ -2,22 +2,24 @@
 Section: graphics
 Priority: optional
 Maintainer: Dmitry Smirnov <onlyjob@debian.org>
-Build-Depends: debhelper (>= 9), ruby (>= 4.9), perl, qt4-qmake, pkg-config
+Build-Depends: debhelper (>= 9), ruby (>= 4.9), perl
  ,imagemagick ,rdfind ,symlinks
- ,qt4-linguist-tools
- ,qtmobility-dev
  ,libaspell-dev (>= 0.60.7~)
  ,libavformat-dev
  ,libavutil-dev
  ,libogg-dev
- ,libqt4-opengl-dev
- ,libquazip-dev
+ ,qt5-qmake
+ ,qttools5-dev-tools
+ ,qtmultimedia5-dev
+ ,libqt5opengl5-dev
+ ,libqt5svg5-dev
+ ,libquazip-qt5-dev
  ,libtheora-dev
  ,zlib1g-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.maefloresta.com/portal
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/tupi.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/tupi.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/tupi.git
 
 Package: tupi
 Architecture: linux-any
diff -Nru tupi-0.2+git04/debian/copyright tupi-0.2+git05/debian/copyright
--- tupi-0.2+git04/debian/copyright	2014-03-01 07:09:28.000000000 +0000
+++ tupi-0.2+git05/debian/copyright	2015-01-01 11:30:56.000000000 +0000
@@ -1,20 +1,20 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: tupi
 Upstream-Contact: Gustav Gonzalez <info@maefloresta.com>
-Source: https://github.com/xtingray/tupi
-
-Files: debian/*
-Copyright: 2011-2014 Dmitry Smirnov <onlyjob@debian.org>
-License: GPL-2+
+Source: https://projects.kde.org/projects/playground/artwork/tupi/repository
 
 Files: *
-Copyright: 2010-2013 Gustav Gonzalez <info@maefloresta.com>
+Copyright: 2010-2014 Gustav Gonzalez <info@maefloresta.com>
            2006      David Cuadrado
            2006      Jorge Cuadrado
            2003      Fernado Roldan
            2003      Simena Dinas
 License: GPL-2+
 
+Files: debian/*
+Copyright: 2011-2015 Dmitry Smirnov <onlyjob@debian.org>
+License: GPL-2+
+
 License: GPL-2+
  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
diff -Nru tupi-0.2+git04/debian/patches/quazip.patch tupi-0.2+git05/debian/patches/quazip.patch
--- tupi-0.2+git04/debian/patches/quazip.patch	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/debian/patches/quazip.patch	2015-01-01 21:42:21.000000000 +0000
@@ -0,0 +1,37 @@
+Last-Update: 2015-01-02
+Forwarded: yes
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Description: drop stupid quazip detection.
+
+--- a/qonf/test.rb
++++ b/qonf/test.rb
+@@ -102,13 +102,9 @@
+                          extraInclude = quazipDir + "/include"
+                          qmakeLine = "'LIBS += #{extraLib}'"
+                          qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
+                       else
+-                         if parser.os.eql? "14.10" 
+-                            extraLib = "-lquazip-qt5"
+-                         else
+-                            extraLib = "-lquazip"
+-                         end
++                         extraLib = "-lquazip-qt5"
+                          qmakeLine = "'LIBS += #{extraLib}'"
+                       end
+                    else
+                       if File.dirname(@rules).end_with?("theora")
+@@ -176,13 +172,9 @@
+         parser.libs.each { |lib|
+             config.addLib(lib)
+         }
+ 
+-        if parser.os.eql? "14.10"
+-           config.addLib("-lquazip-qt5")
+-        else
+-           config.addLib("-lquazip")
+-        end
++        config.addLib("-lquazip-qt5")
+         
+         parser.defines.each { |define|
+             config.addDefine(define)
+         }
diff -Nru tupi-0.2+git04/debian/patches/series tupi-0.2+git05/debian/patches/series
--- tupi-0.2+git04/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/debian/patches/series	2015-01-16 18:26:31.000000000 +0000
@@ -0,0 +1,2 @@
+quazip.patch
+verbose-build.patch
diff -Nru tupi-0.2+git04/debian/patches/verbose-build.patch tupi-0.2+git05/debian/patches/verbose-build.patch
--- tupi-0.2+git04/debian/patches/verbose-build.patch	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/debian/patches/verbose-build.patch	2015-01-04 06:18:08.000000000 +0000
@@ -0,0 +1,17 @@
+Last-Update: 2015-01-04
+Forwarded: no
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Description: enable verbose build.
+
+--- a/configure.rb
++++ b/configure.rb
+@@ -158,9 +158,8 @@
+        config.addDefine("K_DEBUG")
+        print "[ \033[92mON\033[0m ]\n"
+     else
+        config.addDefine("K_NODEBUG")
+-       config.addOption("silent")
+        print "[ \033[91mOFF\033[0m ]\n"
+     end
+ 
+     if File.exists?('/etc/canaima_version')
diff -Nru tupi-0.2+git04/debian/rules tupi-0.2+git05/debian/rules
--- tupi-0.2+git04/debian/rules	2014-05-17 11:55:06.000000000 +0000
+++ tupi-0.2+git05/debian/rules	2015-01-04 23:06:57.000000000 +0000
@@ -4,25 +4,20 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export QT_SELECT=5
 QM_FILES := $(patsubst %.ts, %.qm, $(wildcard src/shell/data/translations/*.ts))
 
 %:
-	dh $@
+	dh $@ --parallel
 
 override_dh_auto_clean:
-	# remove pre-generated binaries; the following is intentional:
-	# trick lintian and always use Makefile.common to clean generated files.
-	-true && $(MAKE) -f Makefile.common confclean
 	$(RM) -v configure.tests/*/Makefile $(QM_FILES)
 	dh_auto_clean
 
 override_dh_auto_configure:
-	# arch-dependent patching
-	cat debian/patches/series.$(DEB_HOST_ARCH_OS) >> debian/patches/series \
-        && $(RM) debian/patches/series.$(DEB_HOST_ARCH_OS) \
-        && dh_quilt_patch || true
 	# override qonf/defaults.rb
 	ruby configure.rb \
+            --without-debug \
             --prefix=/usr \
             --bindir=/usr/lib/tupi/bin \
             --libdir=/usr/lib/tupi \
@@ -30,19 +25,10 @@
             --includedir=/usr/include/tupi
 	# force qmake-generated Makefiles to respect dpkg-provided flags and don't strip
 	perl -0pi -e 's[(CXXFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}]; \
-                      s[(LFLAGS\s*=)][$$1 -Wl,--as-needed $$ENV{LDFLAGS}]; \
-                      s[(CFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}]; \
+                      s[(LFLAGS\s*=)][$$1 $$ENV{LDFLAGS}]; \
+                      s[(CFLAGS\s*=)][$$1 $$ENV{CFLAGS}]; \
                       s[(STRIP\s*=)\s*\w+][$$1 true];' \
                      $$(find . -name Makefile)
-	## libav9 and older: ugly override for upstream libav detection:
-	## FTBFS: "WARNING: Failure to find: tffmpegmoviegenerator.cpp"
-	## https://github.com/xtingray/tupi/issues/2
-	## remove "pkg-config" fron Build-Depends when this will not be needed.
-	dpkg --compare-versions $$(pkg-config --modversion libavcodec) lt 54.35.0 \
-        && cp -v src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp    \
-                 src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp        \
-        || cp -v src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.debian.cpp \
-                 src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp
 
 $(QM_FILES):
 	# rebuild translations
@@ -54,6 +40,13 @@
 	cd src/components/help/man && gzip -9 -c tupi.man > tupi.1.gz
 	dh_auto_build
 
+override_dh_fixperms:
+	dh_fixperms
+	if [ -d "$(CURDIR)/debian/tupi-data" ]; then \
+            find $(CURDIR)/debian/tupi-data/usr/share/tupi/data/xml/ \
+                -type f -executable -exec chmod -c a-x '{}' \;\
+        ;fi
+
 override_dh_install:
 	dh_install
 	# De-duplication (http://wiki.debian.org/dedup.debian.net):
@@ -68,10 +61,7 @@
 	dh_makeshlibs --noscripts
 
 override_dh_strip:
-	dh_strip -v --dbg-package=tupi-dbg
-
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
+	dh_strip --dbg-package=tupi-dbg
 
 PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
diff -Nru tupi-0.2+git04/debian/tupi-data.lintian-overrides tupi-0.2+git05/debian/tupi-data.lintian-overrides
--- tupi-0.2+git04/debian/tupi-data.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/debian/tupi-data.lintian-overrides	2015-01-01 11:30:56.000000000 +0000
@@ -0,0 +1,2 @@
+## False-positive, this is a CSS file, not a text of the license:
+extra-license-file usr/share/tupi/data/xml/en/gpl.css
diff -Nru tupi-0.2+git04/debian/tupi.lintian-overrides tupi-0.2+git05/debian/tupi.lintian-overrides
--- tupi-0.2+git04/debian/tupi.lintian-overrides	2014-04-26 12:12:03.000000000 +0000
+++ tupi-0.2+git05/debian/tupi.lintian-overrides	2015-01-04 06:21:57.000000000 +0000
@@ -1,3 +1,3 @@
 ## false-positives:
-hardening-no-fortify-functions usr/lib/tupi/bin/tupi.bin
+hardening-no-fortify-functions usr/lib/tupi/libtupifwcore.so.1.0.0
 
diff -Nru tupi-0.2+git04/debian/watch tupi-0.2+git05/debian/watch
--- tupi-0.2+git04/debian/watch	2013-06-23 02:22:36.000000000 +0000
+++ tupi-0.2+git05/debian/watch	2015-01-01 07:47:31.000000000 +0000
@@ -10,6 +10,7 @@
 uversionmangle=s/\-git/+git/ \
  https://github.com/xtingray/tupi/tags .*/archive/v?(\d[-\d\.git]+)\.tar\.(?:gz|bzip2|xz)
 
+## Redirector http://qa.debian.org/watch/sf.php/tupi2d/
 opts=\
 uversionmangle=s/\-git/\+git/ \
- http://sf.net/tupi.berlios/tupi_([0-9.]+\-git[0-9]+)\.tar\.(?:gz|bzip2|xz)
+ http://sf.net/tupi2d/tupi[_-]([0-9.]+\-git[0-9]+)\.tar\.(?:gz|bzip2|xz)
diff -Nru tupi-0.2+git04/.gitignore tupi-0.2+git05/.gitignore
--- tupi-0.2+git04/.gitignore	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/.gitignore	2014-12-15 14:21:32.000000000 +0000
@@ -7,6 +7,10 @@
 *.1
 *.dylib
 *.pro.user
+*.moc
+*.Debug
+*.Release
+moc_*
 
 bin/
 src/framework/tgui/qrc_tgui_images.cpp
@@ -27,6 +31,7 @@
 
 launcher/tupi
 launcher/tupi.desktop
+src/components/help/help/css/tupi.css
 
 3rdparty/Makefile
 3rdparty/potrace/Makefile
diff -Nru tupi-0.2+git04/INSTALL tupi-0.2+git05/INSTALL
--- tupi-0.2+git04/INSTALL	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/INSTALL	2014-12-15 14:21:32.000000000 +0000
@@ -18,9 +18,9 @@
     * Qt: The full development toolkit used to create Tupi 
     * ruby: A script language used to do the configuration process previous 
       to the compilation
-    * libavcodec-dev: A subcomponent of the project ffmpeg, to deal with 
+    * libavcodec-dev: A subcomponent of the project libav, to deal with 
       video manipulation
-    * libavformat-dev: A subcomponent of the project ffmpeg, to deal with 
+    * libavformat-dev: A subcomponent of the project libav, to deal with 
       video manipulation
     * zlib-dev: A file-compression library
     * quazip: A very handy API to deal with zip files
@@ -70,3 +70,4 @@
 
 Additional info: http://www.maefloresta.com
 
+
diff -Nru tupi-0.2+git04/INSTALL.md tupi-0.2+git05/INSTALL.md
--- tupi-0.2+git04/INSTALL.md	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/INSTALL.md	2014-12-15 14:21:32.000000000 +0000
@@ -18,9 +18,9 @@
 * Qt: The full development toolkit used to create Tupi
 * ruby: A script language used to do the configuration process previous 
   to the compilation
-* libavcodec-dev: A subcomponent of the project ffmpeg, to deal with 
+* libavcodec-dev: A subcomponent of the project libav, to deal with 
   video manipulation
-* libavformat-dev: A subcomponent of the project ffmpeg, to deal with 
+* libavformat-dev: A subcomponent of the project libav, to deal with 
   video manipulation
 * zlib-dev: A file-compression library
 * quazip: A very handy API to deal with zip files
diff -Nru tupi-0.2+git04/INSTALL.osx tupi-0.2+git05/INSTALL.osx
--- tupi-0.2+git04/INSTALL.osx	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/INSTALL.osx	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,56 @@
+* Warning: Guide pending for update!
+  
+                   Tupi basic installation guide for Mac OSX
+
+Note: Currently, to build and install Tupi on Mac OSX the Terminal application 
+is required. This tool can be located at /Applications/Utilities/Terminal using 
+the Finder application.
+The Terminal is just a command console, so if you have no experience using it, 
+we recommend you to take a look at this little guide:
+     http://www.hacktheday.com/beginners-guide-to-apple-terminal-part-1/
+
+Now, to compile/install Tupi from source code, please follow the instructions 
+below:
+
+1. Install the XCode Developer Tools available at:
+              https://developer.apple.com/downloads/index.action 
+   If your OSX version is Lion, try version 4.1 or later and include the 
+   package called "Command Line Tools for Xcode"
+   If your OSX version is Snow Leopard, try version 3.2 or later
+
+   Note: an Apple ID account is required to download XCode
+
+2. Install the Macports (package manager) available at:
+                        http://www.macports.org/
+   Read the installation instructions at:
+                  http://www.macports.org/install.php
+
+3. Install required ports:
+   $ sudo port install zlib
+   $ sudo port install ffmpeg +nonfree 
+   $ sudo port install aspell
+   $ sudo port install git-core
+   $ sudo port install qt4-mac
+
+4. Download Tupi source code from Gitorious:
+   $ git clone -b experimental https://git.gitorious.org/tupi/tupi.git
+
+5. Move into project's directory:
+   $ cd tupi
+
+6. Run the configure script: 
+   $ ./configure --prefix=/opt/local --bindir=/opt/local/bin/ --libdir=/opt/local/lib 
+                 --sharedir=/opt/local/share --with-debug
+
+7. Compile the project:
+   $ make
+
+8. Install binaries and resources:
+   $ sudo make install
+
+9. Run Tupi:
+   /opt/local/bin/tupi
+
+TODO:
+1. To make Tupi port file for Macports
+2. To build App Bundle for easy install (.dmg)
diff -Nru tupi-0.2+git04/launcher/tupi tupi-0.2+git05/launcher/tupi
--- tupi-0.2+git04/launcher/tupi	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/launcher/tupi	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export TUPI_HOME="/usr/local/tupi"
+export TUPI_SHARE="/usr/local/tupi/share/tupi"
+export TUPI_LIB="/usr/local/tupi/lib/tupi"
+export TUPI_PLUGIN="/usr/local/tupi/lib/tupi/plugins"
+export TUPI_BIN="/usr/local/tupi/bin"
+
+export LD_LIBRARY_PATH="${TUPI_LIB}:${TUPI_PLUGIN}:$LD_LIBRARY_PATH"
+
+exec ${TUPI_BIN}/tupi.bin $*
\ No newline at end of file
diff -Nru tupi-0.2+git04/launcher/tupi.desktop tupi-0.2+git05/launcher/tupi.desktop
--- tupi-0.2+git04/launcher/tupi.desktop	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/launcher/tupi.desktop	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=Tupi: Open 2D Magic
+Name[es]=Tupí: Magia 2D Libre
+Name[pt]=Tupí: Magia 2D Libre
+Name[ru]=Tupi: Open 2D Magic
+Exec=/usr/local/tupi/bin/tupi
+Icon=tupi
+Type=Application
+MimeType=application/tup;
+Categories=Graphics;2DGraphics;RasterGraphics;
+Comment=2D Animation Toolkit
+Comment[es]=Herramienta para Animación 2D
+Comment[pt]=Ferramenta de animação 2D
+Comment[ru]=Создание двухмерной векторной анимации
+Terminal=false
diff -Nru tupi-0.2+git04/libav.win.pri tupi-0.2+git05/libav.win.pri
--- tupi-0.2+git04/libav.win.pri	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/libav.win.pri	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,2 @@
+LIBS += -LC:\libav\bin\ -lavformat -lavcodec -lavutil
+INCLUDEPATH += C:\libav\include
\ No newline at end of file
diff -Nru tupi-0.2+git04/qonf/config.rb tupi-0.2+git05/qonf/config.rb
--- tupi-0.2+git04/qonf/config.rb	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/config.rb	2014-12-15 14:21:32.000000000 +0000
@@ -109,20 +109,18 @@
         }
 
         File.open("src/framework/tupconfig.pri", "w") { |f|
-            f << "# Generated automatically at #{Time.now}! PLEASE DO NOT EDIT!"<< $endl
-            f << "contains(DEFINES, HAVE_FFMPEG){" << $endl
-            f << "LIBS += -lavcodec -lavformat -lavutil" << $endl
-            f << "}" << $endl
+            # f << "# Generated automatically at #{Time.now}! PLEASE DO NOT EDIT!"<< $endl
+            # f << "contains(DEFINES, HAVE_LIBAV){" << $endl
+            # f << "LIBS += -lavcodec -lavformat -lavutil" << $endl
+            # f << "}" << $endl
             if @defines.include? 'ADD_HEADERS'
                f << "DEFINES += ADD_HEADERS" << $endl
             end
             f << $endl
-            f << "QT += opengl core gui svg xml network" << $endl
-            f << "unix {" << $endl
-            f << "   OBJECTS_DIR = .obj" << $endl
-            f << "   UI_DIR = .ui" << $endl
-            f << "   MOC_DIR = .moc" << $endl
-            f << "}" << $endl
+
+            if not @defines.empty?
+                f << "DEFINES += " << @defines.uniq.join(" ") << $endl
+            end
 
             if not @options.empty?
                f << "CONFIG += " << @options.uniq.join(" ") << $endl
diff -Nru tupi-0.2+git04/qonf/configure.rb tupi-0.2+git05/qonf/configure.rb
--- tupi-0.2+git04/qonf/configure.rb	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/configure.rb	2014-12-15 14:21:32.000000000 +0000
@@ -67,7 +67,7 @@
       @qmake = QMake.new
       @properties = {}
 
-      @ffmpeg = true
+      @libav = true
 
       setPath()
       Makefile::setArgs(@options)
@@ -111,17 +111,17 @@
     end
 
     def disableFFmpeg()
-      @ffmpeg = false
+      @libav = false
     end
 
     def verifyQtVersion(minqtversion, verbose, qtdir)
-      Info.info << "Checking for Qt >= " << minqtversion << " and Qt < 5.x ..." << $endl
+      Info.info << "Checking for Qt >= " << minqtversion << $endl
 
       if @qmake.findQMake(minqtversion, verbose, qtdir)
         print "[ \033[92mOK\033[0m ]\n"
       else
         print "[ \033[91mFAILED\033[0m ]\n"
-        raise QonfException.new("\033[91mInvalid Qt version\033[0m.\n   Please, upgrade to #{minqtversion} or higher (Visit: http://qt.nokia.com)")
+        raise QonfException.new("\033[91mInvalid Qt version\033[0m.\n   Please, upgrade to #{minqtversion} or higher (Visit: http://qt-project.org)")
       end
     end
 
@@ -130,10 +130,10 @@
       findTest(@testsDir)
     end
 
-    def runTests(config, conf, debug, isLucid)
+    def runTests(config, conf, debug)
       @tests.each { |test|
-        if not test.run(config, conf, debug, isLucid) and not test.optional
-          raise QonfException.new("\033[91mMissing required dependency\033[0m")
+        if not test.run(config, conf, debug) and not test.optional
+           raise QonfException.new("\033[91mMissing required dependency\033[0m")
         end
       }
     end
@@ -142,7 +142,7 @@
       Info.info << "Creating makefiles..." << $endl
 
       if RUBY_PLATFORM.downcase.include?("darwin")
-        qmakeLine = "'CONFIG += console warn_on' 'INCLUDEPATH += /usr/local/include/quazip LIBS += -L/usr/local/lib -lavcodec -lavutil -lavformat -framework CoreFoundation'"
+        qmakeLine = "'CONFIG += console warn_on' 'INCLUDEPATH += /opt/local/include LIBS += -L/opt/local/lib -lavcodec -lavutil -lavformat -framework CoreFoundation'"
         @qmake.run(qmakeLine, true)
       else
         @qmake.run("", true)
@@ -203,9 +203,9 @@
             findTest(file)
           end
         elsif file =~ /.qonf$/
-          if file.include? "ffmpeg"
-             if @ffmpeg
-                Info.warn << "Adding ffmpeg support: " << @ffmpeg << $endl
+          if file.include? "libav"
+             if @libav
+                Info.warn << "Adding libav support: " << @libav << $endl
                 @tests << Test.new(file, @qmake)
              end
           else
@@ -269,15 +269,27 @@
       newfile += "export TUPI_PLUGIN=\"" + launcher_libdir + "/plugins\"\n"
       newfile += "export TUPI_BIN=\"" + launcher_bindir + "\"\n\n"
 
+      path = ""
+      unless @options['with-libav'].nil? then
+        value = @options['with-libav']
+        path = value + "/lib:"
+      end
+
+      unless @options['with-quazip'].nil? then
+        value = @options['with-quazip']
+        path += value + "/lib:"
+      end
+
+      unless @options['with-theora'].nil? then
+        value = @options['with-theora']
+        path += value + "/lib:"
+      end
+
       if RUBY_PLATFORM.downcase.include?("darwin")
-        newfile += "export DYLD_FALLBACK_LIBRARY_PATH=\"\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$DYLD_FALLBACK_LIBRARY_PATH\"\n\n"
+        newfile += "export DYLD_FALLBACK_LIBRARY_PATH=\"" + path + "\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$DYLD_FALLBACK_LIBRARY_PATH\"\n\n"
         newfile += "open ${TUPI_BIN}/Tupi.app $*"
       else
-        if @options['with-ffmpeg'].nil? then 
-           newfile += "export LD_LIBRARY_PATH=\"\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$LD_LIBRARY_PATH\"\n\n"
-        else
-           newfile += "export LD_LIBRARY_PATH=\"" + @options['with-ffmpeg'] + "/lib:\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$LD_LIBRARY_PATH\"\n\n" 
-        end
+        newfile += "export LD_LIBRARY_PATH=\"" + path + "\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$LD_LIBRARY_PATH\"\n\n"
         newfile += "exec ${TUPI_BIN}/tupi.bin $*"
       end
 
@@ -285,26 +297,26 @@
         f << newfile
       }
 
-        newfile = "[Desktop Entry]\n"
-        # newfile += "Encoding=UTF-8\n"
-        newfile += "Name=Tupi: Open 2D Magic\n"
-        newfile += "Name[es]=Tupí: Magia 2D Libre\n"
-        newfile += "Name[pt]=Tupí: Magia 2D Libre\n"
-        newfile += "Name[ru]=Tupi: Open 2D Magic\n"
-        newfile += "Exec=" + launcher_bindir + "/tupi\n"
-        newfile += "Icon=tupi\n"
-        newfile += "Type=Application\n"
-        newfile += "MimeType=application/tup;\n"
-        newfile += "Categories=Graphics;2DGraphics;RasterGraphics;\n"
-        newfile += "Comment=2D Animation Toolkit\n"
-        newfile += "Comment[es]=Herramienta para Animación 2D\n"
-        newfile += "Comment[pt]=Ferramenta de animação 2D\n"
-        newfile += "Comment[ru]=Создание двухмерной векторной анимации\n"
-        newfile += "Terminal=false\n"
-
-        File.open("launcher/tupi.desktop", "w") { |f|
-          f << newfile
-        }
+      newfile = "[Desktop Entry]\n"
+      # newfile += "Encoding=UTF-8\n"
+      newfile += "Name=Tupi: Open 2D Magic\n"
+      newfile += "Name[es]=Tupí: Magia 2D Libre\n"
+      newfile += "Name[pt]=Tupí: Magia 2D Libre\n"
+      newfile += "Name[ru]=Tupi: Open 2D Magic\n"
+      newfile += "Exec=" + launcher_bindir + "/tupi\n"
+      newfile += "Icon=tupi\n"
+      newfile += "Type=Application\n"
+      newfile += "MimeType=application/tup;\n"
+      newfile += "Categories=Graphics;2DGraphics;RasterGraphics;\n"
+      newfile += "Comment=2D Animation Toolkit\n"
+      newfile += "Comment[es]=Herramienta para Animación 2D\n"
+      newfile += "Comment[pt]=Ferramenta de animação 2D\n"
+      newfile += "Comment[ru]=Создание двухмерной векторной анимации\n"
+      newfile += "Terminal=false\n"
+
+      File.open("launcher/tupi.desktop", "w") { |f|
+        f << newfile
+      }
 
     end
   end
diff -Nru tupi-0.2+git04/qonf/defaults.rb tupi-0.2+git05/qonf/defaults.rb
--- tupi-0.2+git04/qonf/defaults.rb	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/defaults.rb	2014-12-15 14:21:32.000000000 +0000
@@ -40,5 +40,5 @@
     CONFIG["libdir"] = "/usr/local/tupi/lib"
     CONFIG["includedir"] = "/usr/local/tupi/include"
     CONFIG["sharedir"] = "/usr/local/tupi/share"
-    CONFIG["ffmpegdir"] = "/usr"
+    CONFIG["libavdir"] = "/usr"
 end
diff -Nru tupi-0.2+git04/qonf/detectos.rb tupi-0.2+git05/qonf/detectos.rb
--- tupi-0.2+git04/qonf/detectos.rb	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/detectos.rb	2014-12-15 14:21:32.000000000 +0000
@@ -43,6 +43,8 @@
         3 => "Linux",
         31 => "Debian",
         311 => "Ubuntu",
+        312 => "14.04",
+        313 => "14.10",
         32 => "Gentoo",
         4 => "Mac OS X"
     }
@@ -58,38 +60,43 @@
             @os = linux if linux > 0
         end
         
-        
         return @os
     end
     
     def self.tryToFindLinuxDistribution
-        cwd = Dir.getwd
-        Dir.chdir("/etc/")
-        
-        Dir["*{-,_}{version,release}"].each { |path|
-            if path.downcase =~ /^(\w*)(-|_)(version|release)/
-                DetectOS::OS.each { |id, os|
-                    if os.downcase == $1
-                        Dir.chdir(cwd)
-                        
-                        if $1 == "debian"
-                            if `apt-cache -v`.include?("ubuntu")
-                                return 311
-                            end
-                        end
-                        
-                        return id
-                    end
-                }
-            end
-        }
-        
-        Dir.chdir(cwd)
+        lsb = "/etc/lsb-release"
+        if File.exist?(lsb) 
+           distro = ""
+           version = ""
+           File.open(lsb, "r") do |f|
+              f.each_line do |line|
+                 line = line.chop 
+                 tag, value = line.split("=")
+
+                 if tag.eql? "DISTRIB_ID"
+                    distro = value 
+                 end
+                 if tag.eql? "DISTRIB_RELEASE"
+                    version = value
+                 end
+              end
+           end
+
+           if distro.eql? "Ubuntu"
+              if version.eql? "14.04"
+                 return 312
+              end
+              if version.eql? "14.10"
+                 return 313
+              end
+              return 311
+           end
+        end
         
         if `uname`.downcase == "linux"
             return 2
         end
-        
+
         return 0
     end
 end
diff -Nru tupi-0.2+git04/qonf/qmake.rb tupi-0.2+git05/qonf/qmake.rb
--- tupi-0.2+git04/qonf/qmake.rb	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/qmake.rb	2014-12-15 14:21:32.000000000 +0000
@@ -48,88 +48,66 @@
 
     # This method check if the current version of Qt is valid for Tupi compilation    
     def findQMake(minqtversion, verbose, qtdir)
+        path = "qmake"
+        command = ""
+
+        Info.info << "Testing for #{path}... "
+
+        IO.popen("which #{path}") { |result|
+                 if qtdir.length > 0
+                    command = qtdir + "/bin/qmake"
+                 else
+                    pathVar = result.readlines.join("").split(":")
+                    if pathVar.length > 0
+                       command = pathVar[0].chop
+                    end
+                 end
+
+                 if command.length == 0
+                    return false
+                 end
+        }
+
         qtversion = ""
-        paths = [ "qmake", "qmake-qt4", "qmake4" ]
+        version = []
+
+        IO.popen("#{command} -query QT_VERSION") { |prc|
+                 found = prc.readlines.join("")
+                 version = found.split(".")
+                 if (found.length != 0)
+                     qtversion = found.chop
+                 end
+        }
+
         minver = minqtversion.split(".")
-        valid = true
-        count = 0
 
-        paths.each { |path|
-            begin
-                Info.info << "Testing for #{path}... "
-                valid = true
-                version = []
-                sites = []
-                distance = 0
-                IO.popen("which #{path}") { |result|
-                          sites = result.readlines.join("").split(":")
-                          word = ""
-                          if qtdir.length > 0
-                             word = qtdir + "/bin/qmake"
-                          else
-                             if sites.length > 0
-                                word = sites[0].chop
-                             end
-                          end
-                          distance = word.length
-                }
-
-                if distance > 0
-                    IO.popen("#{path} -query QT_VERSION") { |prc|
-                        found = prc.readlines.join("")
-                        version = found.split(".")
-                        if (found.length != 0)
-                            qtversion = found.chop
-                            if (qtversion.start_with?('5'))
-                                return false
-                            end
-                        end
-                    }
-                    next if $? != 0
-
-                    version.size.times { |i|
-                        if i == 0
-                           if version[i] < minver[i]
-                              return false 
-                           elsif version[i] > minver[i]
-                              return true
-                           end
-                        end
-
-                        if i == 1
-                           if version[i] < minver[i]
-                              return false
-                           end
-                        end
-
-                        if i == 2
-                           if version[i] < minver[i]
-                              return false
-                           end
-                        end
-                    }
-                
-                    if valid  
-                        @path = path
-                        break
-                    end
+        version.size.times { |i|
+                if i == 0
+                   if version[i] < minver[i]
+                      return false 
+                   end
+                end
 
-                else
-                    count = count + 1
+                if i == 1
+                   if version[i] < minver[i]
+                      return false
+                   end
                 end
 
-            end
+                if i == 2
+                   if version[i] < minver[i]
+                      return false
+                   end
+                end
         }
+                
+        @path = command
 
-        if count == 3
-           return false
-        end
-
-        if verbose == 1 && valid 
+        if verbose == 1
             print "(Found: #{qtversion}) "
         end
 
-        return valid
+        return true
     end
 
     def query(var)
@@ -143,8 +121,8 @@
         if recur
             options += "-r"
         end
-        
-        output = `#{@path} #{args} #{options} `
+
+        output = `#{@path} #{args} #{options}`
         
         if output.strip.empty?
             return true
diff -Nru tupi-0.2+git04/qonf/test.rb tupi-0.2+git05/qonf/test.rb
--- tupi-0.2+git04/qonf/test.rb	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/test.rb	2014-12-15 14:21:32.000000000 +0000
@@ -55,13 +55,13 @@
         @optional = false
     end
     
-    def run(config, conf, debug, isLucid)
+    def run(config, conf, debug)
 
         parser = Parser.new
         parser.os = DetectOS::OS[DetectOS.whatOS].to_s.downcase
-        
+
         return false if not parser.parse(@rules) or parser.name.empty?
-        
+
         @optional = parser.optional
         
         Info.info << "Checking for " << parser.name << "... "
@@ -84,25 +84,51 @@
                    extraLib = "-L/usr/lib64 "
                 end
 
-                if File.dirname(@rules).end_with?("ffmpeg")  
-                   if conf.hasArgument?("with-ffmpeg")
-                      ffmpegLib = conf.argumentValue("with-ffmpeg") + "/lib"
-                      extraLib += "-L#{ffmpegLib}"
-                      extraInclude = conf.argumentValue("with-ffmpeg") + "/include"
+                if File.dirname(@rules).end_with?("libav")  
+                   if conf.hasArgument?("with-libav")
+                      libavDir = conf.argumentValue("with-libav")
+                      libavLib = libavDir + "/lib"
+                      extraLib += "-L#{libavLib}"
+                      extraInclude = libavDir + "/include"
                       qmakeLine = "'LIBS += #{extraLib}'";
                       qmakeLine += " 'INCLUDEPATH += #{extraInclude}'";
                    end
                 else
-                   qmakeLine = ""
-                   if extraLib.length > 0 
-                      qmakeLine = "'LIBS += #{extraLib} #{parser.libs.join(" ")}'";
+                   if File.dirname(@rules).end_with?("quazip")
+                      if conf.hasArgument?("with-quazip")
+                         quazipDir = conf.argumentValue("with-quazip")
+                         quazipLib = quazipDir + "/lib"
+                         extraLib += "-L#{quazipLib} -lquazip"
+                         extraInclude = quazipDir + "/include"
+                         qmakeLine = "'LIBS += #{extraLib}'"
+                         qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
+                      else
+                         if parser.os.eql? "14.10" 
+                            extraLib = "-lquazip-qt5"
+                         else
+                            extraLib = "-lquazip"
+                         end
+                         qmakeLine = "'LIBS += #{extraLib}'"
+                      end
+                   else
+                      if File.dirname(@rules).end_with?("theora")
+                         if conf.hasArgument?("with-theora")
+                            theoraDir = conf.argumentValue("with-theora")
+                            theoraLib = theoraDir + "/lib"
+                            extraLib += "-L#{theoraLib}"
+                            extraInclude = theoraDir + "/include"
+                            qmakeLine = "'LIBS += #{extraLib}'"
+                            qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
+                         end
+                      else
+                         qmakeLine = ""
+                         if extraLib.length > 0 
+                            qmakeLine = "'LIBS += #{extraLib} #{parser.libs.join(" ")}'"
+                         end
+                      end
                    end
                 end
 
-                if isLucid
-                   qmakeLine = "'DEFINES += K_LUCID' " + qmakeLine
-                end
-
                 @qmake.run(qmakeLine, true)
 
                 if not @qmake.compile(debug)
@@ -150,6 +176,12 @@
         parser.libs.each { |lib|
             config.addLib(lib)
         }
+
+        if parser.os.eql? "14.10"
+           config.addLib("-lquazip-qt5")
+        else
+           config.addLib("-lquazip")
+        end
         
         parser.defines.each { |define|
             config.addDefine(define)
diff -Nru tupi-0.2+git04/quazip.win.pri tupi-0.2+git05/quazip.win.pri
--- tupi-0.2+git04/quazip.win.pri	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/quazip.win.pri	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,2 @@
+LIBS += -LC:/Quazip/lib/ -lquazip
+INCLUDEPATH += C:\Quazip\include\quazip
\ No newline at end of file
diff -Nru tupi-0.2+git04/src/components/animation/animation.pri tupi-0.2+git05/src/components/animation/animation.pri
--- tupi-0.2+git04/src/components/animation/animation.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/animation.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$ANIMATION_DIR
-LIBS += -L$$ANIMATION_DIR -ltupianimation
+
+unix {
+    LIBS += -L$$ANIMATION_DIR -ltupianimation
+}
+
+win32 {
+    LIBS += -L$$ANIMATION_DIR/release/ -ltupianimation
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$ANIMATION_DIR/libtupianimation.so
diff -Nru tupi-0.2+git04/src/components/animation/animation.pro tupi-0.2+git05/src/components/animation/animation.pro
--- tupi-0.2+git04/src/components/animation/animation.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/animation.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/animation
-# Target is a library: animation 
+QT += opengl core gui svg xml network multimedia
 
 INSTALLS += target
 target.path = /lib/
@@ -34,4 +31,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/animation/tupanimationspace.cpp tupi-0.2+git05/src/components/animation/tupanimationspace.cpp
--- tupi-0.2+git04/src/components/animation/tupanimationspace.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupanimationspace.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,12 +34,6 @@
  ***************************************************************************/
 
 #include "tupanimationspace.h"
-#include "tdebug.h"
-
-#include <QMouseEvent>
-#include <QDropEvent>
-#include <QLinearGradient>
-#include <QBoxLayout>
 
 /**
  * This class defines the space which contains the Animation Mode interface.
diff -Nru tupi-0.2+git04/src/components/animation/tupanimationspace.h tupi-0.2+git05/src/components/animation/tupanimationspace.h
--- tupi-0.2+git04/src/components/animation/tupanimationspace.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupanimationspace.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,20 @@
 #ifndef TUPWORKSPACE_H
 #define TUPWORKSPACE_H
 
+#include "tglobal.h"
 #include "tupcamerawidget.h"
+
 #include <QMainWindow>
+#include <QMouseEvent>
+#include <QDropEvent>
+#include <QLinearGradient>
+#include <QBoxLayout>
 
 /**
  * @author David Cuadrado
 **/
 
-class TupAnimationspace : public QMainWindow
+class TUPI_EXPORT TupAnimationspace : public QMainWindow
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerabar.cpp tupi-0.2+git05/src/components/animation/tupcamerabar.cpp
--- tupi-0.2+git04/src/components/animation/tupcamerabar.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerabar.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,17 +34,15 @@
  ***************************************************************************/
 
 #include "tupcamerabar.h"
-#include "tdebug.h"
-#include "tglobal.h"
 
-#include <QBoxLayout>
-
-
-TupCameraBar::TupCameraBar(QWidget *parent)
- : QFrame(parent)
+TupCameraBar::TupCameraBar(QWidget *parent) : QFrame(parent)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCameraBar()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
@@ -89,7 +87,11 @@
 TupCameraBar::~TupCameraBar()
 {
     #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupCameraBar()]";
+        #else
            TEND;
+        #endif
     #endif
 }
 
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerabar.h tupi-0.2+git05/src/components/animation/tupcamerabar.h
--- tupi-0.2+git04/src/components/animation/tupcamerabar.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerabar.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,18 +36,20 @@
 #ifndef TUPCAMERABAR_H
 #define TUPCAMERABAR_H
 
+#include "tglobal.h"
 #include "timagebutton.h"
 #include "tapplicationproperties.h"
 
 #include <QFrame>
 #include <QPainter>
 #include <QPushButton>
+#include <QBoxLayout>
 
 /**
  * @author David Cuadrado
 */
 
-class TupCameraBar : public QFrame
+class TUPI_EXPORT TupCameraBar : public QFrame
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerastatus.cpp tupi-0.2+git05/src/components/animation/tupcamerastatus.cpp
--- tupi-0.2+git04/src/components/animation/tupcamerastatus.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerastatus.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,22 +34,9 @@
  ***************************************************************************/
 
 #include "tupcamerastatus.h"
-#include "tupexportwidget.h"
-#include "tdebug.h"
-#include "tconfig.h"
-#include "tseparator.h"
-
-#include <QStatusBar>
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QApplication>
-#include <QCheckBox>
-#include <QSpinBox>
-#include <QComboBox>
 
 struct TupCameraStatus::Private
 {
-    // QComboBox *fps;
     QSpinBox *fps;
     QComboBox *scenes;
     QLabel *framesTotal;
@@ -60,7 +47,11 @@
 TupCameraStatus::TupCameraStatus(TupCameraWidget *camera, bool isNetworked, QWidget *parent) : QFrame(parent), k(new Private)
 {
     #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCameraStatus()]";
+        #else
            TINIT;
+        #endif
     #endif
 
     setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
@@ -159,7 +150,11 @@
 TupCameraStatus::~TupCameraStatus()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupCameraStatus()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
@@ -187,9 +182,12 @@
     if (k->scenes->count())
         k->scenes->clear(); 
 
-    foreach (TupScene *scene, project->scenes().values()) { 
-             if (scene)
-                 k->scenes->addItem(scene->sceneName());
+    int scenesTotal = project->scenes().size();
+    for (int i = 0; i < scenesTotal; i++) {
+         TupScene *scene = project->scenes().at(i);
+         if (scene)
+             k->scenes->addItem(scene->sceneName());
+
     }
 }
 
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerastatus.h tupi-0.2+git05/src/components/animation/tupcamerastatus.h
--- tupi-0.2+git04/src/components/animation/tupcamerastatus.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerastatus.h	2014-12-15 14:21:32.000000000 +0000
@@ -37,16 +37,22 @@
 #define TUPCAMERASTATUS_H
 
 #include "tupcamerawidget.h"
+#include "tupexportwidget.h"
+#include "tconfig.h"
+#include "tseparator.h"
 
 #include <QFrame>
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QStatusBar>
+#include <QApplication>
+#include <QSpinBox>
 
 class TupCameraWidget;
 
-class TupCameraStatus : public QFrame
+class TUPI_EXPORT TupCameraStatus : public QFrame
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerawidget.cpp tupi-0.2+git05/src/components/animation/tupcamerawidget.cpp
--- tupi-0.2+git04/src/components/animation/tupcamerawidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerawidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,22 +34,13 @@
  ***************************************************************************/
 
 #include "tupcamerawidget.h"
-#include "tupexportwidget.h"
-#include "tdebug.h"
-#include "tseparator.h"
-#include "tupprojectrequest.h"
-#include "tupprojectresponse.h"
-#include "tuprequestbuilder.h"
-
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QApplication>
-#include <QDesktopWidget>
 
 struct TupCameraWidget::Private
 {
     QFrame *container;
     TupScreen *screen;
+    TupCameraBar *cameraBar;
+    QProgressBar *progressBar;
     TupCameraStatus *status;
     TupProject *project;
     int currentSceneIndex;
@@ -62,7 +53,11 @@
 TupCameraWidget::TupCameraWidget(TupProject *project, bool isNetworked, QWidget *parent) : QFrame(parent), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCameraWidget()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     QDesktopWidget desktop;
@@ -118,18 +113,27 @@
     layout->addWidget(scaleWidget, 0, Qt::AlignCenter);
     layout->addLayout(labelLayout, Qt::AlignCenter);
 
+    k->progressBar = new QProgressBar(this); 
+    QString style = "QProgressBar { background-color: #DDDDDD; text-align: center; color: #FFFFFF; border-radius: 2px; } QProgressBar::chunk { background-color: #009500; border-radius: 2px; }";
+    k->progressBar->setStyleSheet(style);
+    k->progressBar->setMaximumHeight(5);
+    k->progressBar->setTextVisible(false);
+    k->progressBar->setRange(1, 100);
+    layout->addWidget(k->progressBar, 0, Qt::AlignCenter);
+
     k->screen = new TupScreen(k->project, k->playerDimension, k->isScaled);
+    connect(k->screen, SIGNAL(isRendering(int)), this, SLOT(updateProgressBar(int)));
+
     layout->addWidget(k->screen, 0, Qt::AlignCenter);
 
-    TupCameraBar *cameraBar = new TupCameraBar;
-    layout->addWidget(cameraBar, 0, Qt::AlignCenter);
-    cameraBar->show();
-
-    connect(cameraBar, SIGNAL(play()), this, SLOT(doPlay()));
-    connect(cameraBar, SIGNAL(playBack()), this, SLOT(doPlayBack()));
-    connect(cameraBar, SIGNAL(stop()), k->screen, SLOT(stop()));
-    connect(cameraBar, SIGNAL(ff()), k->screen, SLOT(nextFrame()));
-    connect(cameraBar, SIGNAL(rew()), k->screen, SLOT(previousFrame()));
+    k->cameraBar = new TupCameraBar;
+    layout->addWidget(k->cameraBar, 0, Qt::AlignCenter);
+
+    connect(k->cameraBar, SIGNAL(play()), this, SLOT(doPlay()));
+    connect(k->cameraBar, SIGNAL(playBack()), this, SLOT(doPlayBack()));
+    connect(k->cameraBar, SIGNAL(stop()), k->screen, SLOT(stop()));
+    connect(k->cameraBar, SIGNAL(ff()), k->screen, SLOT(nextFrame()));
+    connect(k->cameraBar, SIGNAL(rew()), k->screen, SLOT(previousFrame()));
 
     k->status = new TupCameraStatus(this, isNetworked);
     k->status->setScenes(k->project); 
@@ -147,7 +151,11 @@
 TupCameraWidget::~TupCameraWidget()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupCameraWidget()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
@@ -228,7 +236,11 @@
 bool TupCameraWidget::handleProjectResponse(TupProjectResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCameraWidget::handleProjectResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (TupSceneResponse *sceneResponse = static_cast<TupSceneResponse *>(response)) {
@@ -276,7 +288,12 @@
             default:
             {
                  #ifdef K_DEBUG
-                        tFatal() << "TupCameraWidget::handleProjectResponse() - Unknown/Unhandled project action: " << sceneResponse->action();
+                     QString msg = "TupCameraWidget::handleProjectResponse() - Unknown/Unhandled project action: " + QString::number(sceneResponse->action());
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tFatal() << msg;
+                     #endif
                  #endif
             }
             break;
@@ -293,13 +310,23 @@
     k->screen->setFPS(fps);
 }
 
+void TupCameraWidget::setStatusFPS(int fps)
+{
+    k->status->blockSignals(true);
+    k->status->setFPS(fps);
+    k->status->blockSignals(false);
+
+    k->project->setFPS(fps);
+    k->screen->setFPS(fps);
+}
+
 void TupCameraWidget::updateFramesTotal(int sceneIndex)
 {
     TupScene *scene = k->project->scene(sceneIndex);
     if (scene) {
-        QString total = "";
-        total = total.setNum(scene->framesTotal()); 
-        k->status->setFramesTotal(total); 
+        int total = scene->framesTotal();
+        k->status->setFramesTotal(QString::number(total)); 
+        k->progressBar->setRange(0, total);
     }
 }
 
@@ -352,3 +379,8 @@
 {
     k->screen->updateAnimationArea();
 }
+
+void TupCameraWidget::updateProgressBar(int advance)
+{
+    k->progressBar->setValue(advance);
+}
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerawidget.h tupi-0.2+git05/src/components/animation/tupcamerawidget.h
--- tupi-0.2+git04/src/components/animation/tupcamerawidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerawidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,6 +36,12 @@
 #ifndef TUPCAMERAWIDGET_H
 #define TUPCAMERAWIDGET_H
 
+#include "tglobal.h"
+#include "tupexportwidget.h"
+#include "tseparator.h"
+#include "tupprojectrequest.h"
+#include "tupprojectresponse.h"
+#include "tuprequestbuilder.h"
 #include "tcirclebuttonbar.h"
 #include "tvhbox.h"
 #include "tupscreen.h"
@@ -44,6 +50,11 @@
 
 #include <QMainWindow>
 #include <QFrame>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QProgressBar>
 
 class TupProjectResponse;
 class QCheckBox;
@@ -53,7 +64,7 @@
  * @author David Cuadrado 
 */
 
-class TupCameraWidget : public QFrame
+class TUPI_EXPORT TupCameraWidget : public QFrame
 {
     Q_OBJECT
 
@@ -68,10 +79,12 @@
     private slots:
         void setLoop();
         void selectScene(int index);
+        void updateProgressBar(int advance);
 
     public slots:
         bool handleProjectResponse(TupProjectResponse *event);
         void setFPS(int fps);
+        void setStatusFPS(int fps);
         void updateFramesTotal(int sceneIndex);
         void exportDialog();
         void postDialog();
diff -Nru tupi-0.2+git04/src/components/animation/tupscreen.cpp tupi-0.2+git05/src/components/animation/tupscreen.cpp
--- tupi-0.2+git04/src/components/animation/tupscreen.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupscreen.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,19 +34,6 @@
  ***************************************************************************/
 
 #include "tupscreen.h"
-#include "tupprojectresponse.h"
-#include "tupgraphicobject.h"
-#include "tupgraphicsscene.h"
-#include "tupanimationrenderer.h"
-#include "tupsoundlayer.h"
-#include "tdebug.h"
-
-#include <QGraphicsItem>
-#include <QApplication>
-#include <QMessageBox>
-#include <QProgressDialog>
-#include <QDesktopWidget>
-#include <QTimer>
 
 typedef QList<QImage> photoArray;
 
@@ -54,6 +41,7 @@
 {
     QWidget *container;
     QImage renderCamera;
+    QPoint imagePos;
     bool firstShoot;
     bool isScaled;
     const TupProject *project;
@@ -70,24 +58,35 @@
     QList<photoArray> animationList;
     QList<bool> renderControl;
     QSize screenDimension;
+
+    TupLibrary *library;
+    QList<QPair<int, QString> > lipSyncRecords;
+    QMediaPlayer *soundPlayer;
+
+    bool isPlaying;
 };
 
-TupScreen::TupScreen(const TupProject *project, const QSize viewSize, bool isScaled, QWidget *parent) : QFrame(parent), k(new Private)
+TupScreen::TupScreen(TupProject *project, const QSize viewSize, bool isScaled, QWidget *parent) : QFrame(parent), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     k->container = parent;
     k->project = project;
+    k->library = project->library();
     k->isScaled = isScaled;
-
     k->screenDimension = viewSize;
-
     k->cyclicAnimation = false;
     k->fps = 24;
     k->currentSceneIndex = 0;
     k->currentFramePosition = 0;
+    k->soundPlayer = new QMediaPlayer;
+    k->isPlaying = false;
 
     k->timer = new QTimer(this);
     k->playBackTimer = new QTimer(this);
@@ -96,15 +95,19 @@
     connect(k->playBackTimer, SIGNAL(timeout()), this, SLOT(back()));
 
     initPhotogramsArray();
-    updateFirstFrame();
 
     updateSceneIndex(0);
+    updateFirstFrame();
 }
 
 TupScreen::~TupScreen()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupScreen()]";
+        #else
+            TEND;
+        #endif
     #endif
 
     k->timer->stop();
@@ -122,7 +125,11 @@
 void TupScreen::resetPhotograms(int sceneIndex)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::resetPhotograms()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (sceneIndex > -1) {
@@ -139,7 +146,11 @@
 void TupScreen::initPhotogramsArray()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::initPhotogramsArray()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     k->renderControl.clear();
@@ -154,95 +165,124 @@
 void TupScreen::setFPS(int fps)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::setFPS()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
-   k->fps = fps;
+    k->fps = fps;
 
-   if (k->timer->isActive()) {
-       k->timer->stop();
-       play();
-   }
+    if (k->timer->isActive()) {
+        k->timer->stop();
+        play();
+    }
 
-   if (k->playBackTimer->isActive()) {
-       k->playBackTimer->stop();
-       playBack();
-   }
+    if (k->playBackTimer->isActive()) {
+        k->playBackTimer->stop();
+        playBack();
+    }
 }
 
 void TupScreen::paintEvent(QPaintEvent *)
 {
-   /*
-   #ifdef K_DEBUG
-          T_FUNCINFO;
-   #endif
-   */
-
-   if (!k->firstShoot) {
-       if (k->currentFramePosition > -1 && k->currentFramePosition < k->photograms.count())
-           k->renderCamera = k->photograms[k->currentFramePosition];
-   } else {
-       k->firstShoot = false;
-   }
+    /*
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::paintEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+    */
 
-   QPainter painter;
-   painter.begin(this);
+    if (k->isPlaying)
+        playLipSyncAt(k->currentFramePosition);
 
-   int x = (frameSize().width() - k->renderCamera.size().width()) / 2;
-   int y = (frameSize().height() - k->renderCamera.size().height()) / 2;
-   painter.drawImage(QPoint(x, y), k->renderCamera);
-
-   // SQA: Border for the player. Useful for some tests
-   // painter.setPen(QPen(Qt::gray, 0.5, Qt::SolidLine));
-   // painter.drawRect(x, y, k->renderCamera.size().width()-1, k->renderCamera.size().height()-1);
+    if (!k->firstShoot) {
+        if (k->currentFramePosition > -1 && k->currentFramePosition < k->photograms.count())
+            k->renderCamera = k->photograms[k->currentFramePosition];
+    } else {
+        k->firstShoot = false;
+    }
+
+    QPainter painter;
+    painter.begin(this);
+
+    painter.drawImage(k->imagePos, k->renderCamera);
+
+    // SQA: Border for the player. Useful for some tests
+    // painter.setPen(QPen(Qt::gray, 0.5, Qt::SolidLine));
+    // painter.drawRect(x, y, k->renderCamera.size().width()-1, k->renderCamera.size().height()-1);
 }
 
 void TupScreen::play()
 {
-   #ifdef K_DEBUG
-          tWarning("camera") << "TupScreen::play() - Playing at " << k->fps << " FPS";
-   #endif
-
-   if (k->playBackTimer->isActive()) 
-       stop();
-
-   k->currentFramePosition = 0;
-
-   if (!k->timer->isActive()) {
-       if (!k->renderControl.at(k->currentSceneIndex)) {
-           QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-           render();
-           QApplication::restoreOverrideCursor();
-       }
+    #ifdef K_DEBUG
+        QString msg = "TupScreen::play() - Playing at " + QString::number(k->fps) + " FPS";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning("camera") << msg;
+        #endif
+    #endif
 
-       if (k->renderControl.at(k->currentSceneIndex))
-           k->timer->start(1000 / k->fps);
-   }
+    k->isPlaying = true;
+
+    if (k->playBackTimer->isActive()) 
+        stop();
+
+    k->currentFramePosition = 0;
+
+    if (!k->timer->isActive()) {
+        if (!k->renderControl.at(k->currentSceneIndex)) {
+            QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+            render();
+            QApplication::restoreOverrideCursor();
+        }
+
+        if (k->renderControl.at(k->currentSceneIndex))
+            k->timer->start(1000 / k->fps);
+    }
 }
 
 void TupScreen::playBack()
 {
-   #ifdef K_DEBUG
-          tWarning("camera") << "TupScreen::playBack() - Starting procedure...";
-   #endif
-
-   if (k->timer->isActive())
-       stop();
-
-   k->currentFramePosition = k->photograms.count() - 1;
-
-   if (!k->playBackTimer->isActive()) {
-       if (!k->renderControl.at(k->currentSceneIndex))
-           render();
-       k->playBackTimer->start(1000 / k->fps);
-   }
+    #ifdef K_DEBUG
+        QString msg = "TupScreen::playBack() - Starting procedure...";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning("camera") << msg;
+        #endif
+    #endif
+
+    if (k->timer->isActive())
+        stop();
+
+    k->currentFramePosition = k->photograms.count() - 1;
+
+    if (!k->playBackTimer->isActive()) {
+        if (!k->renderControl.at(k->currentSceneIndex))
+            render();
+        k->playBackTimer->start(1000 / k->fps);
+    }
 }
 
 void TupScreen::stop()
 {
     #ifdef K_DEBUG
-           tWarning("camera") << "TupScreen::stop() - Stopping player!";
+        QString msg = "TupScreen::stop() - Stopping player!";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning("camera") << msg;
+        #endif
     #endif
+
+    k->isPlaying = false;
+    k->soundPlayer->stop();
    
     if (k->timer->isActive())
         k->timer->stop();
@@ -260,26 +300,44 @@
 void TupScreen::nextFrame()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::nextFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (!k->renderControl.at(k->currentSceneIndex))
         render();
 
     k->currentFramePosition += 1;
+
+    if (k->currentFramePosition == k->photograms.count())
+        k->currentFramePosition = 0;
+
     repaint();
 }
 
 void TupScreen::previousFrame()
 {
+    /* 
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::previousFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
+    */
 
     if (!k->renderControl.at(k->currentSceneIndex))
         render();
 
     k->currentFramePosition -= 1;
+
+    if (k->currentFramePosition < 0)
+        k->currentFramePosition = k->photograms.count() - 1;
+
     repaint();
 }
 
@@ -287,7 +345,11 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::advance()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -310,7 +372,11 @@
 void TupScreen::back()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::back()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->cyclicAnimation && k->currentFramePosition < 0)
@@ -335,7 +401,11 @@
 void TupScreen::sceneResponse(TupSceneResponse *event)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::sceneResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     int index = event->sceneIndex();
@@ -393,40 +463,43 @@
 void TupScreen::render()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::render()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
+    emit isRendering(0);
+
     TupScene *scene = k->project->scene(k->currentSceneIndex);
 
     if (!scene) {
         #ifdef K_DEBUG
-               tError() << "TupScreen::render() - [ Fatal Error ] - Scene is NULL! -> index: " << k->currentSceneIndex;
+            QString msg = "TupScreen::render() - [ Fatal Error ] - Scene is NULL! -> index: " + QString::number(k->currentSceneIndex);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return;
     }
 
     k->sounds.clear();
 
-    foreach (TupSoundLayer *layer, scene->soundLayers().values())
-             k->sounds << layer;
+    int soundLayersTotal = scene->soundLayers().size();
+    for (int i = 0; i < soundLayersTotal; i++) {
+         TupSoundLayer *layer = scene->soundLayers().at(i);
+         k->sounds << layer;
+    }
 
-    TupAnimationRenderer renderer(k->project->bgColor());
+    TupAnimationRenderer renderer(k->project->bgColor(), k->library);
     renderer.setScene(scene, k->project->dimension());
 
     QFont font = this->font();
     font.setPointSize(8);
 
-    QProgressDialog progressDialog(this, Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::Dialog);
-    progressDialog.setFont(font);
-    progressDialog.setLabelText(tr("Rendering...")); 
-    progressDialog.setCancelButton(0);
-    progressDialog.setRange(1, renderer.totalPhotograms());
-
-    QDesktopWidget desktop;
-    progressDialog.move((int) (desktop.screenGeometry().width() - progressDialog.width())/2, 
-                        (int) (desktop.screenGeometry().height() - progressDialog.height())/2);
-    progressDialog.show();
-
     QList<QImage> photogramList;
     int i = 1;
 
@@ -444,19 +517,25 @@
                photogramList << renderized;
            }
 
-           progressDialog.setValue(i);
+           emit isRendering(i); 
            i++;
     }
 
     k->photograms = photogramList;
     k->animationList.replace(k->currentSceneIndex, photogramList);
     k->renderControl.replace(k->currentSceneIndex, true);
+
+    emit isRendering(0); 
 }
 
 QSize TupScreen::sizeHint() const
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::sizeHint()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     return k->renderCamera.size();
@@ -465,7 +544,11 @@
 void TupScreen::resizeEvent(QResizeEvent *event)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::resizeEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     QFrame::resizeEvent(event);
@@ -478,7 +561,12 @@
         update();
     } else {
         #ifdef K_DEBUG
-               tError() << "TupScreen::resizeEvent() - [ Error ] - Current index is invalid -> " << k->currentSceneIndex;
+            QString msg = "TupScreen::resizeEvent() - [ Error ] - Current index is invalid -> " + QString::number(k->currentSceneIndex);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -486,7 +574,11 @@
 void TupScreen::setLoop(bool loop)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::setLoop()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     k->cyclicAnimation = loop;
@@ -495,7 +587,11 @@
 void TupScreen::updateSceneIndex(int index)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::updateSceneIndex()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     k->currentSceneIndex = index;
@@ -504,7 +600,12 @@
         k->photograms = k->animationList.at(k->currentSceneIndex);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupScreen::updateSceneIndex() - [ Error ] - Can't set current photogram array -> " << k->currentSceneIndex;
+            QString msg = "TupScreen::updateSceneIndex() - [ Error ] - Can't set current photogram array -> " + QString::number(k->currentSceneIndex);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -517,7 +618,11 @@
 TupScene *TupScreen::currentScene() const
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::currentScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->currentSceneIndex > -1) {
@@ -539,7 +644,11 @@
 void TupScreen::updateAnimationArea()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::updateAnimationArea()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->currentSceneIndex > -1 && k->currentSceneIndex < k->animationList.count()) {
@@ -549,7 +658,12 @@
         update();
     } else {
         #ifdef K_DEBUG
-               tError() << "TupScreen::updateAnimationArea() - [ Fatal Error ] - Can't access to scene index: " << k->currentSceneIndex;
+            QString msg = "TupScreen::updateAnimationArea() - [ Fatal Error ] - Can't access to scene index: " + QString::number(k->currentSceneIndex);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -561,13 +675,19 @@
 void TupScreen::updateFirstFrame()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::updateFirstFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->currentSceneIndex > -1 && k->currentSceneIndex < k->animationList.count()) {
         TupScene *scene = k->project->scene(k->currentSceneIndex);
         if (scene) { 
-            TupAnimationRenderer renderer(k->project->bgColor());
+            setLipSyncSettings();
+
+            TupAnimationRenderer renderer(k->project->bgColor(), k->library);
             renderer.setScene(scene, k->project->dimension());
             renderer.renderPhotogram(0);
 
@@ -584,15 +704,29 @@
                 k->renderCamera = firstFrame;
             }
 
+            int x = (frameSize().width() - k->renderCamera.size().width()) / 2;
+            int y = (frameSize().height() - k->renderCamera.size().height()) / 2;
+            k->imagePos = QPoint(x, y);
+
             k->firstShoot = true;
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupScreen::updateFirstFrame() - [ Fatal Error ] - Null scene at index: " << k->currentSceneIndex;
+                QString msg = "TupScreen::updateFirstFrame() - [ Fatal Error ] - Null scene at index: " + QString::number(k->currentSceneIndex);
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
         }
     } else {
         #ifdef K_DEBUG
-               tError() << "TupScreen::updateFirstFrame() - [ Fatal Error ] - Can't access to scene index: " << k->currentSceneIndex;
+            QString msg = "TupScreen::updateFirstFrame() - [ Fatal Error ] - Can't access to scene index: " + QString::number(k->currentSceneIndex);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -600,7 +734,11 @@
 void TupScreen::addPhotogramsArray(int sceneIndex)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScreen::addPhotogramsArray()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (sceneIndex > -1) {
@@ -609,3 +747,40 @@
         k->animationList.insert(sceneIndex, photograms);
     }
 }
+
+void TupScreen::setLipSyncSettings()
+{
+    TupScene *scene = k->project->scene(k->currentSceneIndex);
+    if (scene) {
+        if (scene->lipSyncTotal() > 0) {
+            k->lipSyncRecords.clear();
+            Mouths mouths = scene->getLipSyncList();
+            foreach(TupLipSync *lipsync, mouths) {
+                    TupLibraryFolder *folder = k->library->getFolder(lipsync->name());
+                    if (folder) {
+                        TupLibraryObject *sound = folder->getObject(lipsync->soundFile());
+                        if (sound) {
+                            QPair<int, QString> soundRecord;
+                            soundRecord.first = lipsync->initFrame();
+                            soundRecord.second = sound->dataPath();
+                            k->lipSyncRecords << soundRecord;
+                        }
+                    }
+            }
+        }
+    }
+}
+
+void TupScreen::playLipSyncAt(int frame)
+{
+    int size = k->lipSyncRecords.count();
+    for(int i=0; i<size; i++) {
+             QPair<int, QString> soundRecord = k->lipSyncRecords.at(i);
+             if (frame == soundRecord.first) {
+                 QString path = soundRecord.second;
+                 k->soundPlayer->setMedia(QUrl::fromLocalFile(soundRecord.second));
+                 k->soundPlayer->play();
+             }
+    }
+}
+
diff -Nru tupi-0.2+git04/src/components/animation/tupscreen.h tupi-0.2+git05/src/components/animation/tupscreen.h
--- tupi-0.2+git04/src/components/animation/tupscreen.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupscreen.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,27 @@
 #ifndef TUPSCREEN_H
 #define TUPSCREEN_H
 
+#include "tglobal.h"
 #include "tupscene.h"
-#include "tupglobal.h"
 #include "tupabstractprojectresponsehandler.h"
+#include "tupprojectresponse.h"
+#include "tupgraphicobject.h"
+#include "tupgraphicsscene.h"
+#include "tupanimationrenderer.h"
+#include "tupsoundlayer.h"
+#include "tuplibrary.h"
 
 #include <QImage>
 #include <QPainter>
 #include <QPaintEvent>
 #include <QFrame>
+#include <QGraphicsItem>
+#include <QApplication>
+#include <QMessageBox>
+#include <QDesktopWidget>
+#include <QTimer>
+#include <QMediaPlayer>
+#include <QUrl>
 
 /**
  * @author David Cuadrado
@@ -54,7 +67,7 @@
     Q_OBJECT
 
     public:
-        TupScreen(const TupProject *project, const QSize viewSize = QSize(), bool isScaled = false, QWidget *parent = 0);
+        TupScreen(TupProject *project, const QSize viewSize = QSize(), bool isScaled = false, QWidget *parent = 0);
         ~TupScreen();
 
         QSize sizeHint() const;
@@ -92,6 +105,7 @@
         void toStatusBar(const QString &, int);
         void sceneChanged(const TupScene *newScene);
         void requestTriggered(const TupProjectRequest *event);
+        void isRendering(int advance);
 
     protected:
         void paintEvent(QPaintEvent *event);
@@ -101,6 +115,9 @@
         void initPhotogramsArray();
         void addPhotogramsArray(int index);
         void updateFirstFrame();
+        void setLipSyncSettings();
+        void playLipSyncAt(int frame);
+
         struct Private;
         Private *const k;
 };
diff -Nru tupi-0.2+git04/src/components/colorpalette/colorpalette.pri tupi-0.2+git05/src/components/colorpalette/colorpalette.pri
--- tupi-0.2+git04/src/components/colorpalette/colorpalette.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/colorpalette.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$COLORPALETTE_DIR
-LIBS += -L$$COLORPALETTE_DIR -ltupicolorpalette
+
+unix {
+    LIBS += -L$$COLORPALETTE_DIR -ltupicolorpalette
+}
+
+win32 {
+    LIBS += -L$$COLORPALETTE_DIR/release -ltupicolorpalette
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$COLORPALETTE_DIR/libtupicolorpalette.so
diff -Nru tupi-0.2+git04/src/components/colorpalette/colorpalette.pro tupi-0.2+git05/src/components/colorpalette/colorpalette.pro
--- tupi-0.2+git04/src/components/colorpalette/colorpalette.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/colorpalette.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/colorpalette
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += tpal 
 
@@ -35,10 +32,43 @@
 *:!macx{
     CONFIG += dll warn_on
 }
+
 TEMPLATE = lib
 TARGET = tupicolorpalette
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
 
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/colorpalette/palettes/Default.tpal tupi-0.2+git05/src/components/colorpalette/palettes/Default.tpal
--- tupi-0.2+git04/src/components/colorpalette/palettes/Default.tpal	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/palettes/Default.tpal	2014-12-15 14:21:32.000000000 +0000
@@ -1,26 +1,211 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Default" >
- <Color colorName="#ff0000" alpha="255" />
- <Color colorName="#ff00ff" alpha="255" />
- <Color colorName="#0000ff" alpha="255" />
- <Color colorName="#00ffff" alpha="255" />
- <Color colorName="#00ff00" alpha="255" />
- <Color colorName="#ffff00" alpha="255" />
- <Color colorName="#7f0000" alpha="255" />
- <Color colorName="#7f007f" alpha="255" />
- <Color colorName="#00007f" alpha="255" />
- <Color colorName="#007f7f" alpha="255" />
- <Color colorName="#007f00" alpha="255" />
- <Color colorName="#827f00" alpha="255" />
- <Color colorName="#000000" alpha="255" />
- <Color colorName="#191919" alpha="255" />
- <Color colorName="#333333" alpha="255" />
- <Color colorName="#4c4c4c" alpha="255" />
- <Color colorName="#666666" alpha="255" />
- <Color colorName="#7f7f7f" alpha="255" />
- <Color colorName="#999999" alpha="255" />
- <Color colorName="#b2b2b2" alpha="255" />
- <Color colorName="#cccccc" alpha="255" />
- <Color colorName="#e5e5e5" alpha="255" />
- <Color colorName="#ffffff" alpha="255" />
-</Palette>
+<Palette editable="false" name="Default Palette">
+ <Color colorName="#791179" alpha="255"/>
+ <Color colorName="#2e0c50" alpha="255"/>
+ <Color colorName="#1c061c" alpha="255"/>
+ <Color colorName="#060632" alpha="255"/>
+ <Color colorName="#0c2e50" alpha="255"/>
+ <Color colorName="#061c1c" alpha="255"/>
+ <Color colorName="#117979" alpha="255"/>
+ <Color colorName="#0c502e" alpha="255"/>
+ <Color colorName="#063206" alpha="255"/>
+ <Color colorName="#2e500c" alpha="255"/>
+ <Color colorName="#797911" alpha="255"/>
+ <Color colorName="#502e0c" alpha="255"/>
+ <Color colorName="#320606" alpha="255"/>
+ <Color colorName="#500c2e" alpha="255"/>
+ <Color colorName="#100b07" alpha="255"/>
+ <Color colorName="#020202" alpha="255"/>
+ <Color colorName="#b01ab0" alpha="255"/>
+ <Color colorName="#52158f" alpha="255"/>
+ <Color colorName="#401040" alpha="255"/>
+ <Color colorName="#101071" alpha="255"/>
+ <Color colorName="#15528f" alpha="255"/>
+ <Color colorName="#104040" alpha="255"/>
+ <Color colorName="#1ab0b0" alpha="255"/>
+ <Color colorName="#158f52" alpha="255"/>
+ <Color colorName="#107110" alpha="255"/>
+ <Color colorName="#528f15" alpha="255"/>
+ <Color colorName="#b0b01a" alpha="255"/>
+ <Color colorName="#8f5215" alpha="255"/>
+ <Color colorName="#711010" alpha="255"/>
+ <Color colorName="#8f1552" alpha="255"/>
+ <Color colorName="#2c2014" alpha="255"/>
+ <Color colorName="#090909" alpha="255"/>
+ <Color colorName="#d41fd4" alpha="255"/>
+ <Color colorName="#6d1cbf" alpha="255"/>
+ <Color colorName="#611961" alpha="255"/>
+ <Color colorName="#1919aa" alpha="255"/>
+ <Color colorName="#1c6dbf" alpha="255"/>
+ <Color colorName="#196161" alpha="255"/>
+ <Color colorName="#1fd4d4" alpha="255"/>
+ <Color colorName="#1cbf6d" alpha="255"/>
+ <Color colorName="#19aa19" alpha="255"/>
+ <Color colorName="#6dbf1c" alpha="255"/>
+ <Color colorName="#d4d41f" alpha="255"/>
+ <Color colorName="#bf6d1c" alpha="255"/>
+ <Color colorName="#aa1919" alpha="255"/>
+ <Color colorName="#bf1c6d" alpha="255"/>
+ <Color colorName="#493421" alpha="255"/>
+ <Color colorName="#131313" alpha="255"/>
+ <Color colorName="#ff00ff" alpha="255"/>
+ <Color colorName="#8000ff" alpha="255"/>
+ <Color colorName="#800080" alpha="255"/>
+ <Color colorName="#0000ff" alpha="255"/>
+ <Color colorName="#0080ff" alpha="255"/>
+ <Color colorName="#008080" alpha="255"/>
+ <Color colorName="#00ffff" alpha="255"/>
+ <Color colorName="#00ff80" alpha="255"/>
+ <Color colorName="#00ff00" alpha="255"/>
+ <Color colorName="#80ff00" alpha="255"/>
+ <Color colorName="#ffff00" alpha="255"/>
+ <Color colorName="#ff8000" alpha="255"/>
+ <Color colorName="#ff0000" alpha="255"/>
+ <Color colorName="#ff0080" alpha="255"/>
+ <Color colorName="#603913" alpha="255"/>
+ <Color colorName="#000000" alpha="255"/>
+ <Color colorName="#ff26ff" alpha="255"/>
+ <Color colorName="#9226ff" alpha="255"/>
+ <Color colorName="#922692" alpha="255"/>
+ <Color colorName="#2626ff" alpha="255"/>
+ <Color colorName="#2692ff" alpha="255"/>
+ <Color colorName="#269292" alpha="255"/>
+ <Color colorName="#26ffff" alpha="255"/>
+ <Color colorName="#26ff92" alpha="255"/>
+ <Color colorName="#26ff26" alpha="255"/>
+ <Color colorName="#92ff26" alpha="255"/>
+ <Color colorName="#ffff26" alpha="255"/>
+ <Color colorName="#ff9226" alpha="255"/>
+ <Color colorName="#ff2626" alpha="255"/>
+ <Color colorName="#ff2692" alpha="255"/>
+ <Color colorName="#775636" alpha="255"/>
+ <Color colorName="#262626" alpha="255"/>
+ <Color colorName="#ff40ff" alpha="255"/>
+ <Color colorName="#9f40ff" alpha="255"/>
+ <Color colorName="#9e539e" alpha="255"/>
+ <Color colorName="#4040ff" alpha="255"/>
+ <Color colorName="#409fff" alpha="255"/>
+ <Color colorName="#529e9e" alpha="255"/>
+ <Color colorName="#40ffff" alpha="255"/>
+ <Color colorName="#40ff9f" alpha="255"/>
+ <Color colorName="#40ff40" alpha="255"/>
+ <Color colorName="#9fff40" alpha="255"/>
+ <Color colorName="#ffff40" alpha="255"/>
+ <Color colorName="#ff9f40" alpha="255"/>
+ <Color colorName="#ff4040" alpha="255"/>
+ <Color colorName="#ff409f" alpha="255"/>
+ <Color colorName="#876a4e" alpha="255"/>
+ <Color colorName="#404040" alpha="255"/>
+ <Color colorName="#ff59ff" alpha="255"/>
+ <Color colorName="#ac59ff" alpha="255"/>
+ <Color colorName="#ac59ac" alpha="255"/>
+ <Color colorName="#5959ff" alpha="255"/>
+ <Color colorName="#59acff" alpha="255"/>
+ <Color colorName="#59acac" alpha="255"/>
+ <Color colorName="#59ffff" alpha="255"/>
+ <Color colorName="#59ffac" alpha="255"/>
+ <Color colorName="#59ff59" alpha="255"/>
+ <Color colorName="#acff59" alpha="255"/>
+ <Color colorName="#ffff59" alpha="255"/>
+ <Color colorName="#ffac59" alpha="255"/>
+ <Color colorName="#ff5959" alpha="255"/>
+ <Color colorName="#ff59ac" alpha="255"/>
+ <Color colorName="#977e65" alpha="255"/>
+ <Color colorName="#595959" alpha="255"/>
+ <Color colorName="#ff73ff" alpha="255"/>
+ <Color colorName="#b973ff" alpha="255"/>
+ <Color colorName="#b973b9" alpha="255"/>
+ <Color colorName="#7373ff" alpha="255"/>
+ <Color colorName="#73b9ff" alpha="255"/>
+ <Color colorName="#73b9b9" alpha="255"/>
+ <Color colorName="#73ffff" alpha="255"/>
+ <Color colorName="#73ffb9" alpha="255"/>
+ <Color colorName="#73ff73" alpha="255"/>
+ <Color colorName="#b9ff73" alpha="255"/>
+ <Color colorName="#ffff73" alpha="255"/>
+ <Color colorName="#ffb973" alpha="255"/>
+ <Color colorName="#ff7373" alpha="255"/>
+ <Color colorName="#ff73b9" alpha="255"/>
+ <Color colorName="#b7a594" alpha="255"/>
+ <Color colorName="#737373" alpha="255"/>
+ <Color colorName="#ff8cff" alpha="255"/>
+ <Color colorName="#c58cff" alpha="255"/>
+ <Color colorName="#c58cc5" alpha="255"/>
+ <Color colorName="#8c8cff" alpha="255"/>
+ <Color colorName="#8cc5ff" alpha="255"/>
+ <Color colorName="#8cc5c5" alpha="255"/>
+ <Color colorName="#8cffff" alpha="255"/>
+ <Color colorName="#8cffc5" alpha="255"/>
+ <Color colorName="#8cff8c" alpha="255"/>
+ <Color colorName="#c5ff8c" alpha="255"/>
+ <Color colorName="#ffff8c" alpha="255"/>
+ <Color colorName="#ffc58c" alpha="255"/>
+ <Color colorName="#ff8c8c" alpha="255"/>
+ <Color colorName="#ff8cc5" alpha="255"/>
+ <Color colorName="#b7a594" alpha="255"/>
+ <Color colorName="#8c8c8c" alpha="255"/>
+ <Color colorName="#ffa6ff" alpha="255"/>
+ <Color colorName="#d2a6ff" alpha="255"/>
+ <Color colorName="#d2a6d2" alpha="255"/>
+ <Color colorName="#a6a6ff" alpha="255"/>
+ <Color colorName="#a6d2ff" alpha="255"/>
+ <Color colorName="#a6d2d2" alpha="255"/>
+ <Color colorName="#a6ffff" alpha="255"/>
+ <Color colorName="#a6ffd2" alpha="255"/>
+ <Color colorName="#a6ffa6" alpha="255"/>
+ <Color colorName="#d2ffa6" alpha="255"/>
+ <Color colorName="#ffffa6" alpha="255"/>
+ <Color colorName="#ffd2a6" alpha="255"/>
+ <Color colorName="#ffa6a6" alpha="255"/>
+ <Color colorName="#ffa6d2" alpha="255"/>
+ <Color colorName="#c7b9ac" alpha="255"/>
+ <Color colorName="#a6a6a6" alpha="255"/>
+ <Color colorName="#ffc0ff" alpha="255"/>
+ <Color colorName="#dfc0ff" alpha="255"/>
+ <Color colorName="#dfc0df" alpha="255"/>
+ <Color colorName="#c0c0ff" alpha="255"/>
+ <Color colorName="#c0dfff" alpha="255"/>
+ <Color colorName="#c0dfdf" alpha="255"/>
+ <Color colorName="#c0ffff" alpha="255"/>
+ <Color colorName="#c0ffdf" alpha="255"/>
+ <Color colorName="#c0ffc0" alpha="255"/>
+ <Color colorName="#dfffc0" alpha="255"/>
+ <Color colorName="#ffffc0" alpha="255"/>
+ <Color colorName="#ffdfc0" alpha="255"/>
+ <Color colorName="#ffc0c0" alpha="255"/>
+ <Color colorName="#ffc0df" alpha="255"/>
+ <Color colorName="#d7cec4" alpha="255"/>
+ <Color colorName="#c0c0c0" alpha="255"/>
+ <Color colorName="#ffd9ff" alpha="255"/>
+ <Color colorName="#ecd9ff" alpha="255"/>
+ <Color colorName="#ecd9ec" alpha="255"/>
+ <Color colorName="#d9d9ff" alpha="255"/>
+ <Color colorName="#d9ecff" alpha="255"/>
+ <Color colorName="#d9ecec" alpha="255"/>
+ <Color colorName="#d9ffff" alpha="255"/>
+ <Color colorName="#d9ffec" alpha="255"/>
+ <Color colorName="#d9ffd9" alpha="255"/>
+ <Color colorName="#ecffd9" alpha="255"/>
+ <Color colorName="#ffffd9" alpha="255"/>
+ <Color colorName="#ffecd9" alpha="255"/>
+ <Color colorName="#ffd9d9" alpha="255"/>
+ <Color colorName="#ffd9ec" alpha="255"/>
+ <Color colorName="#e7e1db" alpha="255"/>
+ <Color colorName="#d9d9d9" alpha="255"/>
+ <Color colorName="#ffeeff" alpha="255"/>
+ <Color colorName="#f6eeff" alpha="255"/>
+ <Color colorName="#f6eef6" alpha="255"/>
+ <Color colorName="#eeeeff" alpha="255"/>
+ <Color colorName="#eef6ff" alpha="255"/>
+ <Color colorName="#eef6f6" alpha="255"/>
+ <Color colorName="#eeffff" alpha="255"/>
+ <Color colorName="#eefff6" alpha="255"/>
+ <Color colorName="#eeffee" alpha="255"/>
+ <Color colorName="#f6ffee" alpha="255"/>
+ <Color colorName="#ffffee" alpha="255"/>
+ <Color colorName="#fff6ee" alpha="255"/>
+ <Color colorName="#ffeeee" alpha="255"/>
+ <Color colorName="#ffeef6" alpha="255"/>
+ <Color colorName="#f4f1ef" alpha="255"/>
+ <Color colorName="#eeeeee" alpha="255"/>
+ </Palette>
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcellscolor.cpp tupi-0.2+git05/src/components/colorpalette/tupcellscolor.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupcellscolor.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcellscolor.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,15 +34,6 @@
  ***************************************************************************/
 
 #include "tupcellscolor.h"
-#include "tdebug.h"
-#include "tuppalettedocument.h"
-
-#include <QFile>
-#include <QDragEnterEvent>
-#include <QMouseEvent>
-#include <QDrag>
-#include <QApplication>
-#include <QPainter>
 
 struct TupCellsColor::Private
 {
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcellscolor.h tupi-0.2+git05/src/components/colorpalette/tupcellscolor.h
--- tupi-0.2+git04/src/components/colorpalette/tupcellscolor.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcellscolor.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,24 @@
 #ifndef TUPCELLSCOLOR_H
 #define TUPCELLSCOLOR_H
 
+#include "tglobal.h"
 #include "tcellview.h"
+#include "tuppalettedocument.h"
+
+#include <QFile>
+#include <QDragEnterEvent>
+#include <QMouseEvent>
+#include <QDrag>
+#include <QApplication>
+#include <QPainter>
+#include <QMimeData>
+#include <QTextStream>
 
 /**
  * @author Jorge Cuadrado
 **/
 
-class TupCellsColor : public TCellView
+class TUPI_EXPORT TupCellsColor : public TCellView
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorpalette.cpp tupi-0.2+git05/src/components/colorpalette/tupcolorpalette.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupcolorpalette.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorpalette.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,28 +34,6 @@
  ***************************************************************************/
 
 #include "tupcolorpalette.h"
-#include "tdebug.h"
-#include "timagebutton.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "tuppaintareaevent.h"
-#include "tupcolorvalue.h"
-#include "tupviewcolorcells.h"
-#include "tupcolorpicker.h"
-#include "tupluminancepicker.h"
-#include "tupgradientcreator.h"
-#include "tvhbox.h"
-
-#include <QBoxLayout>
-#include <QPushButton>
-#include <QLineEdit>
-#include <QFrame>
-#include <QToolTip>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QSplitter>
-#include <QMenu>
-#include <QTabWidget>
 
 struct TupColorPalette::Private
 {
@@ -84,7 +62,11 @@
 TupColorPalette::TupColorPalette(QWidget *parent) : TupModuleWidgetBase(parent), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupColorPalette()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     k->currentOutlineColor = Qt::black;
@@ -96,6 +78,7 @@
     setWindowIcon(QPixmap(THEME_DIR + "icons/color_palette.png"));
 
     k->splitter = new QSplitter(Qt::Vertical, this);
+
     k->tab = new QTabWidget;
     connect(k->tab, SIGNAL(currentChanged(int)), this, SLOT(updateColorType(int)));
 
@@ -108,8 +91,11 @@
     setupGradientManager();
 
     k->tab->setPalette(palette());
+    k->tab->setMinimumHeight(300);
     k->splitter->addWidget(k->tab);
 
+    setMinimumWidth(316);
+
     TCONFIG->beginGroup("ColorPalette");
     // QColor foreground = QColor(TCONFIG->value("LastForegroundColor", Qt::black).toString());
     // QColor background = QColor(TCONFIG->value("LastBackgroundColor", Qt::transparent).toString());
@@ -118,8 +104,12 @@
 TupColorPalette::~TupColorPalette()
 {
     #ifdef K_DEBUG
-           TEND;
-    #endif	
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupColorPalette()]";
+        #else
+            TEND;
+        #endif
+    #endif
 
     TCONFIG->beginGroup("ColorPalette");
     TCONFIG->setValue("LastForegroundColor", color().first);
@@ -159,8 +149,11 @@
 
     QBoxLayout *layoutName = new QBoxLayout(QBoxLayout::TopToBottom);
     layoutName->setMargin(0);
+    layoutName->setSpacing(1);
 
-    layoutName->addWidget(new QLabel("<b>HTML</b>", viewColor));
+    QLabel *html = new QLabel(tr("HTML"), viewColor);
+    html->setAlignment(Qt::AlignHCenter);
+    layoutName->addWidget(html);
     k->htmlNameColor = new QLineEdit(viewColor);
     k->htmlNameColor->setMaximumWidth(70);
     k->htmlNameColor->setMaxLength(7);
@@ -267,12 +260,12 @@
                */
     }
 
-    tFatal() << "TupColorPalette::setColor() - Updating background color!";
+    // tFatal() << "TupColorPalette::setColor() - Updating background color!";
     // TupPaintAreaEvent event(TupPaintAreaEvent::ChangeBrush, k->outlineAndFillColors->background().color());
     TupPaintAreaEvent event(TupPaintAreaEvent::ChangeBrush, brush);
     emit paintAreaEventTriggered(&event);
 
-    tFatal() << "TupColorPalette::setColor() - Updating foreground color!";
+    // tFatal() << "TupColorPalette::setColor() - Updating foreground color!";
     TupPaintAreaEvent event2(TupPaintAreaEvent::ChangeColorPen, k->outlineAndFillColors->foreground().color());
     emit paintAreaEventTriggered(&event2);
 }
@@ -309,7 +302,7 @@
 
 void TupColorPalette::updateColorFromDisplay(const QBrush &brush)
 {
-    tFatal() << "TupColorPalette::updateColorFromDisplay() - Just tracing color: " << brush.color().name();
+    // tFatal() << "TupColorPalette::updateColorFromDisplay() - Just tracing color: " << brush.color().name();
     setGlobalColors(brush);
 
     QColor color = brush.color();
@@ -330,9 +323,9 @@
 
     k->labelType->setCurrentIndex(k->currentSpace);
 
-    tFatal() << "TupColorPalette::updateColorSpace() - Picking button #" << space;
-    tFatal() << "TupColorPalette::updateColorSpace() - Color: " << color.name();
-    tFatal() << "TupColorPalette::updateColorSpace() - Alpha: " << color.alpha();
+    // tFatal() << "TupColorPalette::updateColorSpace() - Picking button #" << space;
+    // tFatal() << "TupColorPalette::updateColorSpace() - Color: " << color.name();
+    // tFatal() << "TupColorPalette::updateColorSpace() - Alpha: " << color.alpha();
 
     k->htmlNameColor->setText(color.name());
     k->luminancePicker->setColor(color.hue(), color.saturation(), color.value());
@@ -341,7 +334,7 @@
 
 void TupColorPalette::updateGradientColor(const QBrush &brush)
 {
-    tFatal() << "TupColorPalette::updateGradientColor() - Just tracing!";
+    // tFatal() << "TupColorPalette::updateGradientColor() - Just tracing!";
     setGlobalColors(brush);
 }
 
@@ -357,8 +350,8 @@
 
 void TupColorPalette::setHS(int hue, int saturation)
 {
-    tFatal() << "TupColorPalette::setHS() - H: " << hue;
-    tFatal() << "TupColorPalette::setHS() - S: " << saturation;
+    // tFatal() << "TupColorPalette::setHS() - H: " << hue;
+    // tFatal() << "TupColorPalette::setHS() - S: " << saturation;
 
     int luminance = 255;
     if (hue == 0 && saturation == 0)
@@ -369,8 +362,8 @@
     k->luminancePicker->setColor(color.hue(), color.saturation(), color.value());
     k->displayColorForms->setColor(color);
 
-    tFatal() << "TupColorPalette::setHS() - Color: " << color.name();
-    tDebug() << "";
+    // tFatal() << "TupColorPalette::setHS() - Color: " << color.name();
+    // tDebug() << "";
 
     setGlobalColors(QBrush(color));
 }
@@ -455,7 +448,7 @@
     k->displayColorForms->setColor(color);
     k->gradientManager->setCurrentColor(Qt::white);
 
-    TupPaintAreaEvent event(TupPaintAreaEvent::ChangeColorPen, Qt::black);
+    TupPaintAreaEvent event(TupPaintAreaEvent::ChangeColorPen, QColor(Qt::black));
     emit paintAreaEventTriggered(&event);
 
     event = TupPaintAreaEvent(TupPaintAreaEvent::ChangeBrush, brush);
@@ -549,13 +542,13 @@
 void TupColorPalette::updateColorType(int index)
 {
     if (index == TupColorPalette::Solid) {
-        tFatal() << "TupColorPalette::updateColorType() - Solid Color!";
+        // tFatal() << "TupColorPalette::updateColorType() - Solid Color!";
         if (k->currentSpace == TDualColorButton::Foreground)
             k->fgType = Solid; 
         else
             k->bgType = Solid;
     } else {
-        tFatal() << "TupColorPalette::updateColorType() - Gradient Color!";
+        // tFatal() << "TupColorPalette::updateColorType() - Gradient Color!";
         if (k->currentSpace == TDualColorButton::Foreground) 
             k->fgType = Gradient;
         else
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorpalette.h tupi-0.2+git05/src/components/colorpalette/tupcolorpalette.h
--- tupi-0.2+git04/src/components/colorpalette/tupcolorpalette.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorpalette.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,9 +36,30 @@
 #ifndef TUPCOLORPALETTE_H
 #define TUPCOLORPALETTE_H
 
+#include "tglobal.h"
 #include "tupmodulewidgetbase.h"
 #include "tdualcolorbutton.h"
 #include "ticon.h"
+#include "timagebutton.h"
+#include "tconfig.h"
+#include "tuppaintareaevent.h"
+#include "tupcolorvalue.h"
+#include "tupviewcolorcells.h"
+#include "tupcolorpicker.h"
+#include "tupluminancepicker.h"
+#include "tupgradientcreator.h"
+#include "tvhbox.h"
+
+#include <QBoxLayout>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QFrame>
+#include <QToolTip>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QSplitter>
+#include <QMenu>
+#include <QTabWidget>
 
 class TupColorPalette;
 
@@ -46,7 +67,7 @@
  * @author Jorge Cuadrado
 */
 
-class TupColorPalette : public TupModuleWidgetBase
+class TUPI_EXPORT TupColorPalette : public TupModuleWidgetBase
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorpicker.cpp tupi-0.2+git05/src/components/colorpalette/tupcolorpicker.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupcolorpicker.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorpicker.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,17 +34,6 @@
  ***************************************************************************/
 
 #include "tupcolorpicker.h"
-#include "tdebug.h"
-
-#include <QPoint>
-#include <QColor>
-#include <QImage>
-#include <QSizePolicy>
-#include <QPixmap>
-#include <QSize>
-#include <QRect>
-#include <QPainter>
-#include <QMouseEvent>
 
 static int pWidth = 100;
 static int pHeight = 80;
@@ -81,8 +70,13 @@
 TupColorPicker::~TupColorPicker()
 {
     delete k;
+
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupColorPicker()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
@@ -125,7 +119,7 @@
     QRect rect(colorPoint(), QSize(20,20));
     k->hue = nhue; 
     k->saturation = nsat;
-    rect = rect.unite(QRect(colorPoint(), QSize(20,20)));
+    rect = rect.united(QRect(colorPoint(), QSize(20,20)));
     rect.translate(contentsRect().x()-9, contentsRect().y()-9);
 
     repaint(rect);
@@ -139,7 +133,7 @@
 
     QRect rect(colorPoint(), QSize(20, 20));
     k->hue = newHue;
-    rect = rect.unite(QRect(colorPoint(), QSize(20, 20)));
+    rect = rect.united(QRect(colorPoint(), QSize(20, 20)));
     rect.translate(contentsRect().x()-9, contentsRect().y()-9);
 
     repaint(rect);
@@ -153,7 +147,7 @@
 
     QRect rect(colorPoint(), QSize(20,20));
     k->saturation = newSat;
-    rect = rect.unite(QRect(colorPoint(), QSize(20,20)));
+    rect = rect.united(QRect(colorPoint(), QSize(20,20)));
     rect.translate(contentsRect().x()-9, contentsRect().y()-9);
 
     repaint(rect);
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorpicker.h tupi-0.2+git05/src/components/colorpalette/tupcolorpicker.h
--- tupi-0.2+git04/src/components/colorpalette/tupcolorpicker.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorpicker.h	2014-12-15 14:21:32.000000000 +0000
@@ -33,12 +33,23 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#include <QFrame>
-
 #ifndef TUPCOLORPICKER_H
 #define TUPCOLORPICKER_H
 
-class TupColorPicker : public QFrame
+#include "tglobal.h"
+
+#include <QFrame>
+#include <QPoint>
+#include <QColor>
+#include <QImage>
+#include <QSizePolicy>
+#include <QPixmap>
+#include <QSize>
+#include <QRect>
+#include <QPainter>
+#include <QMouseEvent>
+
+class TUPI_EXPORT TupColorPicker : public QFrame
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorvalue.cpp tupi-0.2+git05/src/components/colorpalette/tupcolorvalue.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupcolorvalue.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorvalue.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,18 +34,6 @@
  ***************************************************************************/
 
 #include "tupcolorvalue.h"
-#include "tdebug.h"
-#include "tdoublecombobox.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QCheckBox>
-#include <QDoubleSpinBox>
-#include <QGridLayout>
-#include <QSpinBox>
-#include <QLineEdit>
-
-#include <cmath>
 
 struct TupItemColorValue::Private
 {
@@ -125,7 +113,11 @@
 TupColorValue::TupColorValue(QWidget *parent) : QFrame(parent), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupColorValue()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     k->ok = true;
@@ -137,7 +129,11 @@
 TupColorValue::~TupColorValue()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupColorValue()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorvalue.h tupi-0.2+git05/src/components/colorpalette/tupcolorvalue.h
--- tupi-0.2+git04/src/components/colorpalette/tupcolorvalue.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorvalue.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,24 @@
 #ifndef TUPVALUECOLOR_H
 #define TUPVALUECOLOR_H
 
+#include "tglobal.h"
+#include "tdoublecombobox.h"
+
 #include <QFrame>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+#include <QSpinBox>
+#include <QLineEdit>
+#include <cmath>
 
 /**
  * @author Jorge Cuadrado
 **/
 
-class TupItemColorValue : public QFrame
+class TUPI_EXPORT TupItemColorValue : public QFrame
 {
     Q_OBJECT
 
@@ -67,7 +78,7 @@
         void editingFinished();
 };
 
-class TupColorValue : public QFrame
+class TUPI_EXPORT TupColorValue : public QFrame
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupluminancepicker.cpp tupi-0.2+git05/src/components/colorpalette/tupluminancepicker.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupluminancepicker.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupluminancepicker.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "tupluminancepicker.h"
-#include "tdebug.h"
-
-#include <QPainter>
-#include <qdrawutil.h>
 
 struct TupLuminancePicker::Private
 {
@@ -75,9 +71,14 @@
 TupLuminancePicker::~TupLuminancePicker()
 {
     delete k;
+
     #ifdef K_DEBUG
-           TEND;
-    #endif
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupLuminancePicker()]";
+        #else
+            TEND;
+        #endif
+    #endif 	
 }
 
 void TupLuminancePicker::mouseMoveEvent(QMouseEvent *event)
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupluminancepicker.h tupi-0.2+git05/src/components/colorpalette/tupluminancepicker.h
--- tupi-0.2+git04/src/components/colorpalette/tupluminancepicker.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupluminancepicker.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,12 +36,16 @@
 #ifndef TUPLUMINACEPICKER_H
 #define TUPLUMINACEPICKER_H
 
+#include "tglobal.h"
+
+#include <QPainter>
+#include <qdrawutil.h>
 #include <QPaintEvent>
 #include <QPixmap>
 #include <QMouseEvent>
 #include <QWidget>
 
-class TupLuminancePicker : public QWidget
+class TUPI_EXPORT TupLuminancePicker : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/colorpalette/tuppaletteparser.cpp tupi-0.2+git05/src/components/colorpalette/tuppaletteparser.cpp
--- tupi-0.2+git04/src/components/colorpalette/tuppaletteparser.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tuppaletteparser.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tuppaletteparser.h"
-#include "tdebug.h"
 
 struct TupPaletteParser::Private
 {
@@ -54,17 +53,14 @@
 
 TupPaletteParser::TupPaletteParser(): TXmlParserBase(), k(new Private)
 {
-     // TINIT;
      k->paletteName = "";
      k->isEditable = false;
      k->gradient = 0;
 }
 
-
 TupPaletteParser::~TupPaletteParser()
 {
      delete k;
-     //	TEND;
 }
 
 bool TupPaletteParser::startTag(const QString &tag, const QXmlAttributes &atts)
@@ -83,9 +79,14 @@
                    if (c.isValid()) {
                        k->brushes << c;
                    } else {
-                    #ifdef K_DEBUG
-		           tError() << "Invalid Color";
-                    #endif
+                   #ifdef K_DEBUG
+                       QString msg = "TupPaletteParser::startTag() - Error: Invalid color!";
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
+                   #endif 					
                    }
         } else if (tag == "Gradient") {
                    if (k->gradient) 
@@ -121,7 +122,12 @@
                            default:
                              {
                                #ifdef K_DEBUG
-                                      tFatal() << "No gradient type: " << type;
+                                   QString msg = "TupPaletteParser::startTag() - No gradient type: " + QString::number(type);
+                                   #ifdef Q_OS_WIN32
+                                       qDebug() << msg;
+                                   #else
+                                       tFatal() << msg;
+                                   #endif
                                #endif
                              }
                            break;
diff -Nru tupi-0.2+git04/src/components/colorpalette/tuppaletteparser.h tupi-0.2+git05/src/components/colorpalette/tuppaletteparser.h
--- tupi-0.2+git04/src/components/colorpalette/tuppaletteparser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tuppaletteparser.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,6 +36,7 @@
 #ifndef TUPPALETTEPARSER_H
 #define TUPPALETTEPARSER_H
 
+#include "tglobal.h"
 #include "txmlparserbase.h"
 
 #include <QXmlDefaultHandler>
@@ -50,7 +51,7 @@
 
 //TODO TupPaletteParser: portar a TXmlParserBase
 
-class TupPaletteParser : public TXmlParserBase
+class TUPI_EXPORT TupPaletteParser : public TXmlParserBase
 {
      public:
          TupPaletteParser();
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupviewcolorcells.cpp tupi-0.2+git05/src/components/colorpalette/tupviewcolorcells.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupviewcolorcells.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupviewcolorcells.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,13 +34,6 @@
  ***************************************************************************/
 
 #include "tupviewcolorcells.h"
-#include "tdebug.h"
-#include "tglobal.h"
-#include "timagebutton.h"
-#include "tconfig.h"
-
-#include <QScrollArea>
-#include <QGroupBox>
 
 struct TupViewColorCells::Private
 {
@@ -70,7 +63,7 @@
 TupViewColorCells::~TupViewColorCells()
 {
     TCONFIG->beginGroup("ColorPalette");
-    TCONFIG->setValue("LastPalette", k->chooserPalette->currentIndex());;
+    TCONFIG->setValue("LastPalette", k->chooserPalette->currentIndex());
 
     QDir brushesDir(CONFIG_DIR + "palettes");
 
@@ -78,21 +71,30 @@
         brushesDir.mkdir(brushesDir.path());
 
     #ifdef K_DEBUG
-           tWarning("palette") << "TupViewColorCells::~TupViewColorCells() - Saving color palettes in: " << brushesDir.path();
+        QString msg = "TupViewColorCells::~TupViewColorCells() - Saving color palettes in: " + brushesDir.path();
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning("palette") << msg;
+        #endif
     #endif
 
     for (int i = 0; i < k->containerPalette->count(); i++) {
          TupCellsColor *palette = qobject_cast<TupCellsColor *>(k->containerPalette->widget(i));
          if (palette) {
              if (!palette->isReadOnly())
-                 palette->save(CONFIG_DIR + "palettes/" + palette->name() + ".tpal");
+                 palette->save(CONFIG_DIR + "palettes" + QDir::separator() + palette->name() + ".tpal");
          }
     }
 
     delete k;
 	
     #ifdef K_DEBUG
-          TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupViewColorCells()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
@@ -107,52 +109,66 @@
     // Default Palette
     k->defaultPalette = new TupCellsColor(k->containerPalette);
     k->defaultPalette->setName(tr("Default Palette"));
-    k->defaultPalette->setReadOnly( true);
-
-    fillDefaultColors();
+    k->defaultPalette->setReadOnly(true);
+    // fillDefaultColors();
     addPalette(k->defaultPalette);
 
     //Named Colors
     k->qtColorPalette = new TupCellsColor(k->containerPalette);
     k->qtColorPalette->setReadOnly(true);
     k->qtColorPalette->setName(tr("Named Colors"));
-    addPalette(k->qtColorPalette);
-
     fillNamedColor();
+    addPalette(k->qtColorPalette);
 
     //Custom Color Palette
+    // SQA: This palette must be implemented
     k->customColorPalette = new TupCellsColor(k->containerPalette);
     k->customColorPalette->setName(tr("Custom Color Palette"));
     addPalette(k->customColorPalette);
 
     //Custom Gradient Palette
+    // SQA: This palette must be implemented
     k->customGradientPalette = new TupCellsColor(k->containerPalette);
     k->customGradientPalette->setName(tr("Custom Gradient Palette"));
     k->customGradientPalette->setType(TupCellsColor::Gradient);
     addPalette(k->customGradientPalette);
 
-    connect(k->chooserPalette, SIGNAL(activated(int )), k->containerPalette, SLOT(setCurrentIndex(int )));
+#ifdef Q_OS_WIN32
+    QString palettesPath = SHARE_DIR + "palettes";
+#else
+    QString palettesPath = SHARE_DIR + "data" + QDir::separator() + "palettes";
+#endif
+    readPalettes(palettesPath); // Pre-installed
+    readPalettes(CONFIG_DIR + "palettes"); // Locals
+
+    // fillDefaultColors(palettesPath);
+
+    connect(k->chooserPalette, SIGNAL(activated(int)), k->containerPalette, SLOT(setCurrentIndex(int)));
 
     TCONFIG->beginGroup("ColorPalette");
     int lastIndex = TCONFIG->value("LastPalette").toInt();
 
-    if (lastIndex > 0) {
-        k->chooserPalette->setCurrentIndex(lastIndex);
-        k->containerPalette->setCurrentIndex(lastIndex);
-    }
-	
-    readPalettes(SHARE_DIR + "data/palettes"); // Pre-installed
-    readPalettes(CONFIG_DIR + "palettes"); // Locals
+    if (lastIndex < 0)
+        lastIndex = 0;
+
+    k->chooserPalette->setCurrentIndex(lastIndex);
+    k->containerPalette->setCurrentIndex(lastIndex);
 }
 
 void TupViewColorCells::readPalettes(const QString &paletteDir)
 {
     #ifdef K_DEBUG
-           tDebug("palette") << "Reading palettes from: " << paletteDir;
+        QString msg = "TupViewColorCells::readPalettes() - Reading palettes from: " + paletteDir;
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning("palette") << msg;
+        #endif
     #endif
+
     QDir dir(paletteDir);
 
-    if (dir.exists ()) {
+    if (dir.exists()) {
         QStringList files = dir.entryList(QStringList() << "*.tpal");
         QStringList::ConstIterator it = files.begin();
 
@@ -160,7 +176,16 @@
                readPaletteFile(dir.path() + "/" + *it);
                ++it;
         }
-    }
+    } else {
+        #ifdef K_DEBUG
+            QString msg = "TupViewColorCells::readPalettes() - Error: Invalid path -> " + paletteDir;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError("palette") << msg;
+            #endif
+        #endif	
+	}
 }
 
 void TupViewColorCells::readPaletteFile(const QString &file)
@@ -171,21 +196,33 @@
         QList<QBrush> brushes = parser.brushes();
         QString name = parser.paletteName();
         bool editable = parser.paletteIsEditable();
-        addPalette(name,brushes,editable );
+        addPalette(name, brushes, editable);
     } else {
         #ifdef K_DEBUG
-               tError() << "Error while parse palette file: " << file;
+            QString msg = "TupViewColorCells::readPaletteFile() - Error while parse palette file: " + file;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
 
-void TupViewColorCells::addPalette(const QString & name, const QList<QBrush> & brushes, bool editable )
+void TupViewColorCells::addPalette(const QString & name, const QList<QBrush> & brushes, bool editable)
 {
-    if (name == k->customColorPalette->name()) {
+    if (name == "Default Palette") {
         QList<QBrush>::ConstIterator it = brushes.begin();
 
         while (it != brushes.end()) {
-               k->customColorPalette->addItem( *it);
+               k->defaultPalette->addItem(*it);
+               ++it;
+        }
+    } else if (name == k->customColorPalette->name()) {
+        QList<QBrush>::ConstIterator it = brushes.begin();
+
+        while (it != brushes.end()) {
+               k->customColorPalette->addItem(*it);
                ++it;
         }
     } else if (name == k->customGradientPalette->name()) {
@@ -222,13 +259,18 @@
 void TupViewColorCells::changeColor(QTableWidgetItem* item)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupViewColorCells::changeColor()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (item)
         emit selectColor(item->background());
 }
 
+/*
 void TupViewColorCells::fillDefaultColors()
 {
     int i;
@@ -282,6 +324,7 @@
               k->defaultPalette->addItem(QColor(255, (j - 13) * 51, (i - 6) * 51));
     }
 }
+*/
 
 void TupViewColorCells::fillNamedColor()
 {
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupviewcolorcells.h tupi-0.2+git05/src/components/colorpalette/tupviewcolorcells.h
--- tupi-0.2+git04/src/components/colorpalette/tupviewcolorcells.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupviewcolorcells.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,21 +36,26 @@
 #ifndef TUPVIEWCOLORCELLS_H
 #define TUPVIEWCOLORCELLS_H
 
+#include "tglobal.h"
+#include "tconfig.h"
+#include "timagebutton.h"
+#include "tupcellscolor.h"
+#include "tuppaletteparser.h"
+#include "tapplicationproperties.h"
+
 #include <QFrame>
 #include <QComboBox>
 #include <QStackedWidget>
 #include <QVBoxLayout>
 #include <QBrush>
-
-#include "tupcellscolor.h"
-#include "tuppaletteparser.h"
-#include "tapplicationproperties.h"
+#include <QScrollArea>
+#include <QGroupBox>
 
 /**
     @author Jorge Cuadrado
 **/
 
-class TupViewColorCells : public QFrame
+class TUPI_EXPORT TupViewColorCells : public QFrame
 {
     Q_OBJECT
 
@@ -67,13 +72,14 @@
     private:
         void setupForm();
         void setupButtons();
-        void fillDefaultColors();
+        // void fillDefaultColors();
         void addDefaultColor(int i, int j, const QColor &);
         void fillNamedColor();
         void readPalettes(const QString &paletteDir);
         void addPalette(TupCellsColor *palette);
 
-    protected:
+    // protected:
+    //     QSize sizeHint() const;
 
     signals:
         void selectColor(const QBrush &);
diff -Nru tupi-0.2+git04/src/components/components_config.pri tupi-0.2+git05/src/components/components_config.pri
--- tupi-0.2+git04/src/components/components_config.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/components_config.pri	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-
-STORE_DIR = ../../store 
-LIBTUPI_DIR = ../../libtupi
-LIBBASE_DIR = ../../libbase
-
-include($$STORE_DIR/store.pri)
-include($$LIBTUPI_DIR/libtupi.pri)
-include($$LIBBASE_DIR/libbase.pri)
-
-include(../../../tupiglobal.pri)
-
-INCLUDEPATH += ../../shell
-
-QT += xml
diff -Nru tupi-0.2+git04/src/components/components.pro tupi-0.2+git05/src/components/components.pro
--- tupi-0.2+git04/src/components/components.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/components.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components
-# Target is a subdirs project 
+# QT += xml opengl network
 
 SUBDIRS += scenes \
            colorpalette \
@@ -11,16 +8,15 @@
            export \
            import \
            help \
-           kinas \
+           # kinas \
            pen \
            paintarea \
            twitter \
-           animation \
-           debug
+           animation
+
+unix {
+    SUBDIRS += debug
+}
 
 CONFIG += ordered warn_on
 TEMPLATE = subdirs
-
-QT += xml opengl network
-
-#QT += qt3support xml opengl network
diff -Nru tupi-0.2+git04/src/components/debug/debug.pri tupi-0.2+git05/src/components/debug/debug.pri
--- tupi-0.2+git04/src/components/debug/debug.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/debug.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$DEBUG_DIR
-LIBS += -L$$DEBUG_DIR -ltupidebug
+
+unix {
+    LIBS += -L$$DEBUG_DIR -ltupidebug
+}
+
+win32 {
+    LIBS += -L$$DEBUG_DIR/release/ -ltupidebug
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$DEBUG_DIR/libtupidebug.so
diff -Nru tupi-0.2+git04/src/components/debug/debug.pro tupi-0.2+git05/src/components/debug/debug.pro
--- tupi-0.2+git04/src/components/debug/debug.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/debug.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/debug
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += target
 target.path = /lib/
@@ -24,5 +21,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
 
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/debug/tupdebugterm.cpp tupi-0.2+git05/src/components/debug/tupdebugterm.cpp
--- tupi-0.2+git04/src/components/debug/tupdebugterm.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/tupdebugterm.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,26 +34,26 @@
  ***************************************************************************/
 
 #include "tupdebugterm.h"
-#include "tdebug.h"
 
-#include <QIcon>
-#include <QBoxLayout>
-#include <QTextBrowser>
+#ifdef K_DEBUG
 
 TupDebugTerm::TupDebugTerm(QWidget *parent, int width) : QWidget(parent)
 {
-    #ifdef K_DEBUG
-           TINIT;
-           QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this); 
-           mainLayout->setSizeConstraint(QLayout::SetMaximumSize);
-           debugBrowser = TDebug::browser(this, width);
-           mainLayout->addWidget(debugBrowser);
-    #endif
+    TINIT;
+    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this); 
+    mainLayout->setSizeConstraint(QLayout::SetMaximumSize);
+    debugBrowser = TDebug::browser(this, width);
+    mainLayout->addWidget(debugBrowser);
 }
 
 TupDebugTerm::~TupDebugTerm()
 {
-    #ifdef K_DEBUG
-           TEND;
-    #endif
+    TEND;
 }
+
+void TupDebugTerm::setProjectStatus(bool status)
+{
+    TDebug::setProjectStatus(status);     
+}
+
+#endif
diff -Nru tupi-0.2+git04/src/components/debug/tupdebugterm.h tupi-0.2+git05/src/components/debug/tupdebugterm.h
--- tupi-0.2+git04/src/components/debug/tupdebugterm.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/tupdebugterm.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,23 +36,32 @@
 #ifndef TUPDEBUGTERM_H
 #define TUPDEBUGTERM_H
 
+#ifdef K_DEBUG
+
+#include "tglobal.h"
+
 #include <QWidget>
 #include <QTextEdit>
+#include <QIcon>
+#include <QBoxLayout>
+#include <QTextBrowser>
 
 /**
  * @author Gustav Gonzalez <info@maefloresta.com>
 */
 
-class TupDebugTerm : public QWidget 
+class TUPI_EXPORT TupDebugTerm : public QWidget 
 {
     Q_OBJECT
 
     public:
         TupDebugTerm(QWidget *parent = 0, int width = 0);
         ~TupDebugTerm();
+        void setProjectStatus(bool status);
 
     private:
         QTextEdit *debugBrowser;
 };
 
 #endif
+#endif
diff -Nru tupi-0.2+git04/src/components/debug/tupdebugwidget.cpp tupi-0.2+git05/src/components/debug/tupdebugwidget.cpp
--- tupi-0.2+git04/src/components/debug/tupdebugwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/tupdebugwidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,16 +34,12 @@
  ***************************************************************************/
 
 #include "tupdebugwidget.h"
-#include "tupdebugterm.h"
-#include "tdebug.h"
 
-#include <QIcon>
+#ifdef K_DEBUG
 
 TupDebugWidget::TupDebugWidget(QWidget *parent, int width) : TupModuleWidgetBase(parent, "Debug Terminal")
 {
-    #ifdef K_DEBUG
-           TINIT;
-    #endif
+    TINIT;
   
     setWindowTitle(tr("Debug Console"));
     setWindowIcon(QIcon(THEME_DIR + "icons/debug.png"));
@@ -53,13 +49,18 @@
 
     setFixedHeight(120);
 
-    TupDebugTerm *term = new TupDebugTerm(this, width);
+    term = new TupDebugTerm(this, width);
     addChild(term);
 }
 
 TupDebugWidget::~TupDebugWidget()
 {
-    #ifdef K_DEBUG
-           TEND;
-    #endif
+    TEND;
 }
+
+void TupDebugWidget::setProjectStatus(bool status)
+{
+    term->setProjectStatus(status);
+}
+
+#endif
diff -Nru tupi-0.2+git04/src/components/debug/tupdebugwidget.h tupi-0.2+git05/src/components/debug/tupdebugwidget.h
--- tupi-0.2+git04/src/components/debug/tupdebugwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/tupdebugwidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,17 +36,30 @@
 #ifndef TUPDEBUGWIDGET_H
 #define TUPDEBUGWIDGET_H
 
-#include <tupmodulewidgetbase.h>
+#ifdef K_DEBUG
+
+#include "tglobal.h"
+#include "tupmodulewidgetbase.h"
+#include "tupdebugterm.h"
+
+#include <QIcon>
 
 /**
  * @author Gustav Gonzalez <info@maefloresta.com>
 */
-class TupDebugWidget : public TupModuleWidgetBase
+
+class TUPI_EXPORT TupDebugWidget : public TupModuleWidgetBase
 {
     Q_OBJECT
+
     public:
         TupDebugWidget(QWidget *parent = 0, int width = 0);
         ~TupDebugWidget();
+        void setProjectStatus(bool status);
+
+    private:
+        TupDebugTerm *term;
 };
 
 #endif
+#endif
diff -Nru tupi-0.2+git04/src/components/export/export.pri tupi-0.2+git05/src/components/export/export.pri
--- tupi-0.2+git04/src/components/export/export.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/export.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$EXPORT_DIR
-LIBS += -L$$EXPORT_DIR -ltupiexport
+
+unix {
+    LIBS += -L$$EXPORT_DIR -ltupiexport
+}
+
+win32 {
+    LIBS += -L$$EXPORT_DIR/release/ -ltupiexport
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$EXPORT_DIR/libtupiexport.so
diff -Nru tupi-0.2+git04/src/components/export/export.pro tupi-0.2+git05/src/components/export/export.pro
--- tupi-0.2+git04/src/components/export/export.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/export.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/export
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += target
 target.path = /lib/
@@ -25,4 +22,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/export/tupexportwidget.cpp tupi-0.2+git05/src/components/export/tupexportwidget.cpp
--- tupi-0.2+git04/src/components/export/tupexportwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/tupexportwidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,30 +34,6 @@
  ***************************************************************************/
 
 #include "tupexportwidget.h"
-#include "tuppluginmanager.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "titemselector.h"
-#include "txyspinbox.h"
-
-// Qt
-#include <QApplication>
-#include <QPluginLoader>
-#include <QRadioButton>
-#include <QButtonGroup>
-#include <QGroupBox>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QPushButton>
-#include <QLabel>
-#include <QIntValidator>
-#include <QToolButton>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QCheckBox>
-#include <QtDebug>
-#include <QLocale>
-#include <QDir>
 
 /**
  * This class handles the whole process to export a project into a movie format.
@@ -65,7 +41,7 @@
  * @author David Cuadrado
 */
 
-class SelectPlugin : public TupExportWizardPage
+class TUPI_EXPORT SelectPlugin : public TupExportWizardPage
 {
     Q_OBJECT
 
@@ -136,7 +112,17 @@
 
 void SelectPlugin::addPlugin(const QString &plugin)
 {
-    new QListWidgetItem(plugin, m_exporterList);
+    qDebug() << "SelectPlugin::addPlugin() - plugin: " << plugin;
+    #ifdef Q_OS_WIN32
+       if (QSysInfo::windowsVersion() != QSysInfo::WV_XP) {
+           new QListWidgetItem(plugin, m_exporterList);
+       } else {
+	       if (plugin.compare(tr("Video Formats")) != 0)
+		       new QListWidgetItem(plugin, m_exporterList);
+	   }
+    #else
+       new QListWidgetItem(plugin, m_exporterList);
+    #endif
 }
 
 void SelectPlugin::selectedPluginItem(QListWidgetItem *item)
@@ -167,10 +153,12 @@
         format->setData(3124, TupExportInterface::WEBM);
     }
 
+#ifdef Q_OS_UNIX
     if (formats & TupExportInterface::OGV) {
         QListWidgetItem *format = new QListWidgetItem(tr("OGV Video"), m_formatList);
         format->setData(3124, TupExportInterface::OGV);
     }
+#endif
 
     if (formats & TupExportInterface::MPEG) {
         QListWidgetItem *format = new QListWidgetItem(tr("MPEG Video"), m_formatList);
@@ -197,7 +185,7 @@
         format->setData(3124, TupExportInterface::MOV);
     }
 
-    // SQA: The ffmpeg procedure to export animated GIF files must be implemented
+    // SQA: The libav procedure to export animated GIF files must be implemented
     /*
     if (formats & TupExportInterface::GIF) {
         QListWidgetItem *format = new QListWidgetItem(tr("Gif Image"), m_formatList);
@@ -232,8 +220,10 @@
     if (format.compare(tr("WEBM Video")) == 0)
         return ".webm";
 
+#ifdef Q_OS_UNIX		
     if (format.compare(tr("OGV Video")) == 0)
         return ".ogv";
+#endif
 
     if (format.compare(tr("MPEG Video")) == 0)
         return ".mpg";
@@ -299,7 +289,7 @@
     return extension;
 }
 
-class SelectScenes : public TupExportWizardPage
+class TUPI_EXPORT SelectScenes : public TupExportWizardPage
 {
     Q_OBJECT
 
@@ -352,7 +342,11 @@
 void SelectScenes::setScenes(const QList<TupScene *> &scenes)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[SelectScenes::setScenes()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     m_selector->clear();
@@ -360,14 +354,25 @@
 
     foreach (TupScene *scene, scenes) {
              #ifdef K_DEBUG
-                    tDebug("export") << "SelectScenes::setScenes() - Adding " << scene->sceneName();
+                 QString msg = "SelectScenes::setScenes() - Adding " + scene->sceneName();
+                 #ifdef Q_OS_WIN32
+                     qWarning() << msg;
+                 #else
+                     tWarning("export") << msg;
+                 #endif
              #endif
+
              m_selector->addItem(QString("%1: ").arg(pos) + scene->sceneName());
              pos++;
     }
 
     #ifdef K_DEBUG
-           tWarning("export") << "SelectScenes::setScenes() - Available Scenes: " << pos - 1;
+        QString msg = "SelectScenes::setScenes() - Available Scenes: " + QString::number(pos - 1);
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
     #endif
 
     m_selector->selectFirstItem();
@@ -388,12 +393,12 @@
     // SQA: Pending code right over here
 }
 
-class ExportTo : public TupExportWizardPage
+class TUPI_EXPORT ExportTo : public TupExportWizardPage
 {
     Q_OBJECT
 
     public:
-        ExportTo(const TupProject *project, TupExportWidget::OutputFormat output, QString title, const TupExportWidget *widget);
+        ExportTo(TupProject *project, TupExportWidget::OutputFormat output, QString title, const TupExportWidget *widget);
         ~ExportTo();
 
         bool isComplete() const;
@@ -431,7 +436,8 @@
         TupExportInterface::Format m_currentFormat;
         TupExportWidget::OutputFormat output;
 
-        const TupProject *m_project;
+        // const TupProject *m_project;
+        TupProject *m_project;
         QLineEdit *m_filePath;
         QLineEdit *m_prefix;
         QSpinBox *m_fps;
@@ -443,9 +449,17 @@
         bool transparency;
 };
 
-ExportTo::ExportTo(const TupProject *project, TupExportWidget::OutputFormat outputFormat, QString title, const TupExportWidget *widget) : TupExportWizardPage(title), m_currentExporter(0), 
+ExportTo::ExportTo(TupProject *project, TupExportWidget::OutputFormat outputFormat, QString title, const TupExportWidget *widget) : TupExportWizardPage(title), m_currentExporter(0), 
                    m_currentFormat(TupExportInterface::NONE), m_project(project)
 {
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[ExportTo::ExportTo()]";
+        #else
+            TINIT;
+        #endif
+    #endif
+
     output = outputFormat;
     transparency = false;
 
@@ -461,7 +475,8 @@
 
     QWidget *container = new QWidget;
     QVBoxLayout *layout = new QVBoxLayout(container);
-    path = getenv("HOME");
+    // path = getenv("HOME");
+	path = QDir::homePath();
 
     ////////////////
 
@@ -504,11 +519,10 @@
     QToolButton *button = new QToolButton;
     button->setIcon(QIcon(THEME_DIR + "icons" + QDir::separator() + "open.png"));
 
-    if (output == TupExportWidget::ImagesArray) {
+    if (output == TupExportWidget::ImagesArray)
         connect(button, SIGNAL(clicked()), this, SLOT(chooseDirectory()));
-    } else {
+    else
         connect(button, SIGNAL(clicked()), this, SLOT(chooseFile()));
-    }
 
     filePathLayout->addWidget(button);
 
@@ -600,16 +614,18 @@
     extension = value;
     filename = path;
 
-#if defined(Q_OS_UNIX)
-
     if (m_currentFormat == TupExportInterface::APNG || (m_currentFormat != TupExportInterface::PNG && m_currentFormat != TupExportInterface::JPEG)) { // Animated Image or Animation
         if (!filename.endsWith(QDir::separator()))
             filename += QDir::separator();
 
         filename += m_project->projectName();
         filename += extension;
+		
+		qDebug() << "ExportTo::setCurrentFormat() - Tracing name: " << filename;
+		
     } else { // Images Array
-        filename = getenv("HOME");
+        // filename = getenv("HOME");
+		filename = QDir::homePath();
 
         if (m_currentFormat == TupExportInterface::JPEG) {
             if (bgTransparency->isEnabled())
@@ -618,18 +634,21 @@
             if (!bgTransparency->isEnabled())
                 bgTransparency->setEnabled(true);
         }
+		
+		qDebug() << "ExportTo::setCurrentFormat() - Tracing name: " << filename;
     } 
 
+	#ifdef Q_OS_WIN32
+	    filename.replace(QString("/"), QString("\\"));
+	#endif
+	
     m_filePath->setText(filename);
-
-#endif
 }
 
 void ExportTo::updateNameField()
 {
-   if (filename.length() > 0) {
+   if (filename.length() > 0) 
        m_filePath->setText(filename);
-   } 
 }
 
 void ExportTo::enableTransparency(bool flag)
@@ -654,7 +673,8 @@
 
 void ExportTo::chooseDirectory()
 {
-    QString dir = getenv("HOME");
+    // QString dir = getenv("HOME");
+	QString dir = QDir::homePath();
     filename = QFileDialog::getExistingDirectory(this, tr("Choose a directory..."), dir,
                                                  QFileDialog::ShowDirsOnly
                                                  | QFileDialog::DontResolveSymlinks);
@@ -675,7 +695,11 @@
 void ExportTo::exportIt()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[ExportTo::exportIt()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     bool done = false; 
@@ -691,7 +715,8 @@
         }
 
         if (path.length() == 0)
-            path = getenv("HOME");
+		    path = QDir::homePath();
+            // path = getenv("HOME");
 
         filename = path + QDir::separator() + name;
     } else { // Animation or Animated Image
@@ -699,9 +724,15 @@
 
         if (filename.length() == 0) {
             TOsd::self()->display(tr("Error"), tr("Directory doesn't exist! Please, choose another path."), TOsd::Error);
+
             #ifdef K_DEBUG
-                   QString file = path.toLocal8Bit();
-                   tError() << "ExportTo::exportIt() - Fatal Error: Directory doesn't exist! -> " << file;
+                QString file = path.toLocal8Bit();
+                QString msg = "ExportTo::exportIt() - Fatal Error: Directory doesn't exist! -> " + file;
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
             return;
         }
@@ -715,7 +746,8 @@
             name += extension;
 
         if (path.length() == 0) {
-            path = getenv("HOME");
+            //path = getenv("HOME");
+			path = QDir::homePath();
             filename = path + QDir::separator() + name;
         }
 
@@ -734,8 +766,13 @@
     if (!directory.exists()) {
         TOsd::self()->display(tr("Error"), tr("Directory doesn't exist! Please, choose another path."), TOsd::Error);
         #ifdef K_DEBUG
-               QString file = path.toLocal8Bit();
-               tError() << "ExportTo::exportIt() - Fatal Error: Directory doesn't exist! -> " << file;
+            QString file = path.toLocal8Bit();
+            QString msg = "ExportTo::exportIt() - Fatal Error: Directory doesn't exist! -> " + file;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return;
     } else {
@@ -752,19 +789,30 @@
 
     if (m_currentExporter) {
         #ifdef K_DEBUG
-               tWarning() << "ExportTo::exportIt() - Exporting to file: " << filename;
+            QString file = path.toLocal8Bit();
+            QString msg = "ExportTo::exportIt() -  Exporting to file: " + file;
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
 
         QList<TupScene *> scenes = scenesToExport();
 
         #ifdef K_DEBUG
-               tWarning() << "ExportTo::exportIt() - Exporting " << scenes.count() << " scenes";
+            QString msg1 = "ExportTo::exportIt() - Exporting " + QString::number(scenes.count()) + " scenes";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg1;
+            #else
+                tWarning() << msg1;
+            #endif
         #endif
 
         if (scenes.count() > 0) { 
             int width = (int) m_size->x();
             int height = (int) m_size->y();
-            /* ffmpeg requirement: resolution must be a multiple of two */
+            /* libav requirement: resolution must be a multiple of two */
             if (width%2 != 0)
                 width++;
             if (height%2 != 0)
@@ -779,7 +827,7 @@
             }
 
             done = m_currentExporter->exportToFormat(color, filename, scenes, m_currentFormat, 
-                                                     QSize(width, height), m_fps->value());
+                                                     QSize(width, height), m_fps->value(), m_project->library());
         }
     } else {
         TOsd::self()->display(tr("Error"), tr("Format problem. Tupi Internal error."), TOsd::Error);
@@ -806,7 +854,7 @@
     return scenes;
 }
 
-class VideoProperties : public TupExportWizardPage
+class TUPI_EXPORT VideoProperties : public TupExportWizardPage
 {
     Q_OBJECT
 
@@ -983,10 +1031,14 @@
 }
 */
 
-TupExportWidget::TupExportWidget(const TupProject *project, QWidget *parent, bool isLocal) : TupExportWizard(parent), m_project(project)
+TupExportWidget::TupExportWidget(TupProject *project, QWidget *parent, bool isLocal) : TupExportWizard(parent), m_project(project)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExportWidget()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     if (isLocal) {
@@ -997,7 +1049,8 @@
         addPage(m_pluginSelectionPage);
 
         m_scenesSelectionPage = new SelectScenes(this);
-        m_scenesSelectionPage->setScenes(project->scenes().values());
+        // m_scenesSelectionPage->setScenes(project->scenes().values());
+        m_scenesSelectionPage->setScenes(project->scenes());
         addPage(m_scenesSelectionPage);
 
         m_exportAnimation = new ExportTo(project, TupExportWidget::Animation, tr("Export to Video File"), this);
@@ -1026,7 +1079,8 @@
         setWindowIcon(QIcon(THEME_DIR + "icons" + QDir::separator() + "net_document.png"));
 
         m_scenesSelectionPage = new SelectScenes(this);
-        m_scenesSelectionPage->setScenes(project->scenes().values());
+        // m_scenesSelectionPage->setScenes(project->scenes().values());
+        m_scenesSelectionPage->setScenes(project->scenes());
         addPage(m_scenesSelectionPage);
 
         videoProperties = new VideoProperties(this);
@@ -1039,7 +1093,11 @@
 TupExportWidget::~TupExportWidget()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupExportWidget()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
@@ -1063,7 +1121,12 @@
                      pluginList.insert(index, exporter);
                  } else {
                      #ifdef K_DEBUG
-                            tError() << "TupExportWidget::loadPlugins() - [ Fatal Error ] - Can't load export plugin";
+                         QString msg = "TupExportWidget::loadPlugins() - [ Fatal Error ] - Can't load export plugin";
+                         #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                         #else
+                            tError() << msg;
+                         #endif
                      #endif
                  }
              }
@@ -1088,7 +1151,12 @@
         m_exportImagesArray->setCurrentExporter(currentExporter);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupExportWidget::setExporter() - [ Fatal Error ] - Can't load export plugin";
+            QString msg = "TupExportWidget::setExporter() - [ Fatal Error ] - Can't load export plugin -> " + plugin;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
diff -Nru tupi-0.2+git04/src/components/export/tupexportwidget.h tupi-0.2+git05/src/components/export/tupexportwidget.h
--- tupi-0.2+git04/src/components/export/tupexportwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/tupexportwidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,16 +36,39 @@
 #ifndef TUPEXPORTWIDGET_H
 #define TUPEXPORTWIDGET_H
 
+#include "tglobal.h"
 #include "tupmodulewidgetbase.h"
 #include "tupproject.h"
 #include "tupexportpluginobject.h"
 #include "tupexportwizard.h"
+#include "titemselector.h"
+#include "txyspinbox.h"
+#include "tuppluginmanager.h"
 
 #include <QListWidget>
 #include <QHash>
+#include <QApplication>
+#include <QPluginLoader>
+#include <QRadioButton>
+#include <QButtonGroup>
+#include <QGroupBox>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QPushButton>
+#include <QLabel>
+#include <QIntValidator>
+#include <QToolButton>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QCheckBox>
+#include <QtDebug>
+#include <QLocale>
+#include <QDir>
+#include <QSpinBox>
+#include <QTextEdit>
 
-class QButtonGroup;
-class QLineEdit;
+// class QButtonGroup;
+// class QLineEdit;
 class SelectPlugin;
 class SelectScenes;
 class ExportTo;
@@ -55,13 +78,13 @@
  * @author David Cuadrado
 */
 
-class TupExportWidget : public TupExportWizard
+class TUPI_EXPORT TupExportWidget : public TupExportWizard
 {
     Q_OBJECT
 
     public:
         enum OutputFormat { Animation = 0, ImagesArray, AnimatedImage };
-        TupExportWidget(const TupProject *project, QWidget *parent = 0, bool isLocal = true);
+        TupExportWidget(TupProject *project, QWidget *parent = 0, bool isLocal = true);
         ~TupExportWidget();
         QString videoTitle() const;
         QString videoTopics() const;
diff -Nru tupi-0.2+git04/src/components/export/tupexportwizard.cpp tupi-0.2+git05/src/components/export/tupexportwizard.cpp
--- tupi-0.2+git04/src/components/export/tupexportwizard.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/tupexportwizard.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,14 +34,6 @@
  ***************************************************************************/
 
 #include "tupexportwizard.h"
-#include "tvhbox.h"
-#include "tseparator.h"
-#include "tdebug.h"
-
-// Qt
-#include <QLabel>
-#include <QBitmap>
-#include <QDebug>
 
 struct TupExportWizard::Private
 {
@@ -265,9 +257,9 @@
     hide();
 }
 
-void TupExportWizardPage::setPixmap(const QPixmap &px)
+void TupExportWizardPage::setPixmap(const QPixmap &pixmap)
 {
-    k->image->setPixmap(px);
+    k->image->setPixmap(pixmap);
     k->image->show();
 }
 
@@ -286,4 +278,6 @@
     return k->tag;
 }
 
-TupExportWizardPage::~TupExportWizardPage() {};
+TupExportWizardPage::~TupExportWizardPage() 
+{
+}
diff -Nru tupi-0.2+git04/src/components/export/tupexportwizard.h tupi-0.2+git05/src/components/export/tupexportwizard.h
--- tupi-0.2+git04/src/components/export/tupexportwizard.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/tupexportwizard.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,15 +36,18 @@
 #ifndef TUPEXPORTWIZARD_H
 #define TUPEXPORTWIZARD_H
 
-#include "tvhbox.h"
 #include "tglobal.h"
+#include "tvhbox.h"
 #include "toolview.h"
+#include "tseparator.h"
 
 #include <QDialog>
 #include <QPushButton>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QStackedWidget>
+#include <QLabel>
+#include <QBitmap>
 
 class TupExportWizardPage;
 
@@ -52,7 +55,7 @@
  * @author David Cuadrado
 */
 
-class TupExportWizard : public QDialog
+class TUPI_EXPORT TupExportWizard : public QDialog
 {
     Q_OBJECT
 
@@ -94,7 +97,7 @@
 #include <QGridLayout>
 #include <QLabel>
 
-class TupExportWizardPage : public TVHBox
+class TUPI_EXPORT TupExportWizardPage : public TVHBox
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/exposure/exposure.pri tupi-0.2+git05/src/components/exposure/exposure.pri
--- tupi-0.2+git04/src/components/exposure/exposure.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/exposure.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$EXPOSURE_DIR
-LIBS += -L$$EXPOSURE_DIR -ltupiexposure
+
+unix {
+    LIBS += -L$$EXPOSURE_DIR -ltupiexposure
+}
+
+win32 {
+    LIBS += -L$$EXPOSURE_DIR/release/ -ltupiexposure
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$EXPOSURE_DIR/libtupiexposure.so
diff -Nru tupi-0.2+git04/src/components/exposure/exposure.pro tupi-0.2+git05/src/components/exposure/exposure.pro
--- tupi-0.2+git04/src/components/exposure/exposure.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/exposure.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/exposure
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += target
 target.path = /lib/
@@ -28,4 +25,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/exposure/tupexposureheader.cpp tupi-0.2+git05/src/components/exposure/tupexposureheader.cpp
--- tupi-0.2+git04/src/components/exposure/tupexposureheader.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/tupexposureheader.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -35,46 +35,21 @@
 
 #include "tupexposureheader.h"
 
-#include <QHeaderView>
-#include <QPainter>
-#include <QStyleOptionButton>
-#include <QMap>
-#include <QVector>
-#include <QItemDelegate>
-#include <QLineEdit>
-#include <QMouseEvent>
-#include <QMenu>
-
-#include "tdebug.h"
-
-/*
-struct LayerItem
-{
-    QString title;
-    int lastFrame;
-    bool isVisible;
-    bool isLocked;
-};
-*/
-
 /**
  * @author Jorge Cuadrado
  */
 
-TupExposureHeader::TupExposureHeader(QWidget * parent) : QHeaderView(Qt::Horizontal, parent), m_sectionEdited(-1),
-                                                       m_blockSectionMoved(false)
+TupExposureHeader::TupExposureHeader(QWidget * parent) : QHeaderView(Qt::Horizontal, parent), m_editedSection(-1), m_sectionOnMotion(false)
 {
-    setClickable(true);
-
-    //SQA: Disabled while layers movability is enhanced 
-    //setMovable(true);
+    setSectionsClickable(true);
+    setSectionsMovable(true);
 
-    connect(this, SIGNAL(sectionDoubleClicked(int)), this, SLOT(showEditorName(int)));
+    connect(this, SIGNAL(sectionDoubleClicked(int)), this, SLOT(showTitleEditor(int)));
 
     m_editor = new QLineEdit(this);
     m_editor->setFocusPolicy(Qt::ClickFocus);
     m_editor->setInputMask("");
-    connect(m_editor, SIGNAL(editingFinished()), this, SLOT(hideEditorName()));
+    connect(m_editor, SIGNAL(editingFinished()), this, SLOT(hideTitleEditor()));
     m_editor->hide();
 }
 
@@ -82,22 +57,22 @@
 {
 }
 
-void TupExposureHeader::emitVisibilityChanged(int section)
+void TupExposureHeader::notifyVisibilityChange(int section)
 {
-   emit visibilityChanged(visualIndex(section), !m_layers[section].isVisible);
+   emit visibilityChanged(visualIndex(section), !m_sections[section].isVisible);
 }
 
-void TupExposureHeader::setVisibilityChanged(int layerIndex, bool visibility)
+void TupExposureHeader::setSectionVisibility(int section, bool visibility)
 {
     // Q_UNUSED(visibility);
-    // FIXME: in tupexpousertable.cpp visibility or !m_layers[logicalndex].isVisible
-    // m_layers[logicalndex].isVisible = !m_layers[logicalndex].isVisible;
+    // FIXME: in tupexpousertable.cpp visibility or !m_sections[logicalndex].isVisible
+    // m_sections[logicalndex].isVisible = !m_sections[logicalndex].isVisible;
 
-    m_layers[layerIndex].isVisible = visibility;
-    updateSection(layerIndex);
+    m_sections[section].isVisible = visibility;
+    updateSection(section);
 }
 
-void TupExposureHeader::showEditorName(int section)
+void TupExposureHeader::showTitleEditor(int section)
 {
     if (section >= 0) {
         QFont font("Arial", 8, QFont::Normal, false);
@@ -105,70 +80,75 @@
 
         int x = sectionViewportPosition(section);
         m_editor->setGeometry(x, 0, sectionSize(section), height());
-        m_sectionEdited = section;
-        m_editor->setText(m_layers[section].title);
+        m_editedSection = section;
+        m_editor->setText(m_sections[section].title);
         m_editor->show();
         m_editor->setFocus();
     }
 }
 
-void TupExposureHeader::hideEditorName()
+void TupExposureHeader::hideTitleEditor()
 {
     m_editor->hide();
 
-    if (m_sectionEdited != -1 && m_editor->isModified())
-        emit changedName(m_sectionEdited, m_editor->text());
+    if (m_editedSection != -1 && m_editor->isModified())
+        emit nameChanged(m_editedSection, m_editor->text());
 
-    m_sectionEdited = -1;
+    m_editedSection = -1;
 }
 
-void TupExposureHeader::insertLayer(int layerIndex, const QString &text)
+void TupExposureHeader::insertSection(int section, const QString &text)
 {
-    LayerItem layer;
+    ExposureLayerItem layer;
     layer.title = text;
     layer.lastFrame = 0;
     layer.isVisible = true;
     layer.isLocked = false;
-    m_layers.insert(layerIndex, layer);
+    m_sections.insert(section, layer);
 }
 
-void TupExposureHeader::setLayerName(int layerIndex, const QString &text)
+void TupExposureHeader::setSectionTitle(int section, const QString &text)
 {
-    m_layers[layerIndex].title = text;
-    updateSection(layerIndex);
+    m_sections[section].title = text;
+    updateSection(section);
 }
 
-bool TupExposureHeader::signalMovedBlocked()
+bool TupExposureHeader::sectionIsMoving()
 {
-    return m_blockSectionMoved;
+    return m_sectionOnMotion;
 }
 
-void TupExposureHeader::setLockLayer(int logicalndex, bool lock)
+void TupExposureHeader::setLockFlag(int logicalndex, bool lock)
 {
-    m_layers[logicalndex].isLocked = lock;
+    m_sections[logicalndex].isLocked = lock;
     updateSection(logicalndex);
 }
 
-void TupExposureHeader::moveLayer(int position, int newPosition)
+void TupExposureHeader::moveHeaderSection(int position, int newPosition, bool isLocalRequest)
 {
-    m_blockSectionMoved = true;
-    moveSection(position, newPosition);
-    m_blockSectionMoved = false;
+    if (isLocalRequest) {
+        m_sectionOnMotion = true;
+        moveSection(visualIndex(position), visualIndex(newPosition));
+        m_sections.swap(position, newPosition);
+        m_sectionOnMotion = false;
+    } else {
+        m_sections.swap(position, newPosition);
+    }
 }
 
-int TupExposureHeader::lastFrame(int layerIndex)
+int TupExposureHeader::lastFrame(int section)
 {
-    return m_layers[layerIndex].lastFrame;
+    return m_sections[section].lastFrame;
 }
 
-void TupExposureHeader::removeLayer(int layerIndex)
+void TupExposureHeader::removeSection(int section)
 {
-    m_layers.remove(layerIndex);
+    m_sections.removeAt(section);
 }
 
-void TupExposureHeader::setLastFrame(int layerIndex, int num)
+void TupExposureHeader::setLastFrame(int section, int num)
 {
-    m_layers[layerIndex].lastFrame = num;
+    m_sections[section].lastFrame = num;
 }
 
 void TupExposureHeader::mousePressEvent(QMouseEvent * event)
@@ -176,17 +156,24 @@
     int section = logicalIndexAt(event->pos());
     int x = sectionViewportPosition(section) + 3;
 
-    QRect rect(x+3, 3, height()-3, height()-3);
+    QFont font("Arial", 8, QFont::Normal, false);
+    QFontMetrics fm(font);
+    QString text = m_sections[section].title;
+    int w = fm.width(text);
+    int limit = sectionSize(section)/2 - w/2;
+
+    QRect rect(x + limit - 12, 3, 12, height()-3);
     if (rect.contains(event->pos())) {
-        emitVisibilityChanged(section);
+        notifyVisibilityChange(section);
     } else {
-        if (currentCol != section)
+        if (m_currentSection != section)
             emit selectionChanged(section);
+
         QHeaderView::mousePressEvent(event);
     }
 }
 
-void TupExposureHeader::paintSection(QPainter * painter, const QRect & rect, int layerIndex) const
+void TupExposureHeader::paintSection(QPainter *painter, const QRect & rect, int section) const
 {
     if (!rect.isValid()) 
         return;
@@ -207,31 +194,24 @@
 
     style()->drawControl(QStyle::CE_HeaderSection, &headerOption, painter);
 
-    QString text = m_layers[layerIndex].title;
+    QString text = m_sections[section].title;
     QFont font("Arial", 8, QFont::Normal, false);
     QFontMetrics fm(font);
 
+    if (((section == m_currentSection) || (m_sections.size() == 1)) && m_sections[section].isVisible) { // Header selected
+        QColor color(0, 136, 0, 40);
+        painter->fillRect(rect.normalized().adjusted(0, 0, 0, -1), color);
+    }
+
     QStyleOptionButton buttonOption;
 
-    if (m_layers[layerIndex].isVisible) {
-        buttonOption.palette.setBrush(QPalette::Button, Qt::green);
+    if (m_sections[section].isVisible) {
+        buttonOption.palette.setBrush(QPalette::Button, QColor(0, 136, 0, 255));
     } else {
         buttonOption.palette.setBrush(QPalette::Button, Qt::red);
         buttonOption.state |= QStyle::State_Sunken;
         QColor color(255, 0, 0, 40);
-        painter->fillRect(rect.normalized().adjusted(0, 1, 0, -1), color);
-    }
-
-    if ((layerIndex == currentCol) || (m_layers.size() == 1)) {
-        QColor color(250, 209, 132, 80);
-        painter->fillRect(rect.normalized().adjusted(0, 1, 0, -1), color);
-        if (m_layers[layerIndex].isVisible) {
-            painter->setPen(QPen(QColor(250, 209, 132, 255), 2, Qt::SolidLine)); // Header selected
-            painter->drawRect(rect.normalized().adjusted(0, 1, 0, -1));
-        } else { 
-            painter->setPen(QPen(QColor(255, 0, 0, 70), 2, Qt::SolidLine)); // Header locked
-            painter->drawRect(rect.normalized().adjusted(0, 1, 0, -1));
-        }
+        painter->fillRect(rect.normalized().adjusted(0, 0, 0, -1), color);
     }
 
     int buttonWidth = 12;
@@ -244,24 +224,24 @@
     painter->drawText(x, y, text);
 
     buttonOption.rect = QRect(rect.x() + width - 4, rect.y() + ((rect.normalized().height()-buttonWidth)/2) + 1, buttonWidth, buttonWidth);
-  
+
     style()->drawControl(QStyle::CE_PushButton, &buttonOption, painter);
 }
 
-void TupExposureHeader::updateSelection(int col)
+void TupExposureHeader::updateSelection(int section)
 {
-    currentCol = col;
-    updateSection(col);
+    m_currentSection = section;
+    updateSection(section);
 }
 
-int TupExposureHeader::layersTotal()
+int TupExposureHeader::sectionsTotal()
 {
-    return m_layers.size();
+    return m_sections.size();
 }
 
-int TupExposureHeader::currentLayerIndex()
+int TupExposureHeader::currentSectionIndex()
 {
-    return currentCol;
+    return m_currentSection;
 }
 
 //#include "tupexposuretable.moc"
diff -Nru tupi-0.2+git04/src/components/exposure/tupexposureheader.h tupi-0.2+git05/src/components/exposure/tupexposureheader.h
--- tupi-0.2+git04/src/components/exposure/tupexposureheader.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/tupexposureheader.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,19 @@
 #ifndef TUPEXPOSUREHEADER_H
 #define TUPEXPOSUREHEADER_H
 
+#include "tglobal.h"
+
 #include <QHeaderView>
 #include <QPainter>
 #include <QStyleOptionButton>
-#include <QVector>
+#include <QMap>
+#include <QList>
+#include <QItemDelegate>
 #include <QLineEdit>
 #include <QMouseEvent>
+#include <QMenu>
 
-struct LayerItem
+struct ExposureLayerItem
 {
     QString title;
     int lastFrame;
@@ -54,48 +59,50 @@
 /**
  * @author Jorge Cuadrado
  */
-class TupExposureHeader: public QHeaderView
+
+class TUPI_EXPORT TupExposureHeader: public QHeaderView
 {
     Q_OBJECT
 
     public:
         TupExposureHeader(QWidget * parent = 0);
         ~TupExposureHeader();
-        void paintSection(QPainter *painter, const QRect & rect, int layerIndex) const;
-        void insertLayer(int layerIndex, const QString &text);
-        void setLayerName(int layerIndex, const QString &text);
-        void setLastFrame(int layerIndex, int num);
-        int lastFrame(int layerIndex);
-        void removeLayer(int layerIndex);
-        void moveLayer(int index, int newIndex);
-        void setLockLayer(int logicalndex, bool lock);
-        bool signalMovedBlocked();
-        void setVisibilityChanged(int logicalndex, bool visibility);
-        int layersTotal();
-        int currentLayerIndex();
+        void paintSection(QPainter *painter, const QRect & rect, int section) const;
+        void insertSection(int section, const QString &text);
+        void setSectionTitle(int section, const QString &text);
+        void removeSection(int section);
+        void moveHeaderSection(int index, int newIndex, bool isLocalRequest);
+        void setLockFlag(int section, bool lock);
+        bool sectionIsMoving();
+        void setSectionVisibility(int section, bool visibility);
+        int sectionsTotal();
+        int currentSectionIndex();
+
+        void setLastFrame(int section, int num);
+        int lastFrame(int section);
+
+    protected:
+        virtual void mousePressEvent(QMouseEvent * event);
 
     public slots:
-        void updateSelection(int col);
+        void updateSelection(int section);
 
     private slots:
-        void emitVisibilityChanged(int section);
-        void showEditorName(int section);
-        void hideEditorName();
+        void notifyVisibilityChange(int section);
+        void showTitleEditor(int section);
+        void hideTitleEditor();
 
-    protected:
-        virtual void mousePressEvent(QMouseEvent * event);
+    signals:
+        void nameChanged(int section, const QString & name);
+        void visibilityChanged(int section, bool visibility);
+        void selectionChanged(int section);
 
     private:
-        QVector<LayerItem> m_layers;
+        QList<ExposureLayerItem> m_sections;
         QLineEdit *m_editor;
-        int m_sectionEdited;
-        int m_blockSectionMoved;
-        int currentCol;
-
-    signals:
-        void changedName(int indexLayer, const QString & name);
-        void visibilityChanged(int indexLayer, bool visibility);
-        void selectionChanged(int indexLayer);
+        int m_editedSection;
+        bool m_sectionOnMotion;
+        int m_currentSection;
 };
 
 #endif
diff -Nru tupi-0.2+git04/src/components/exposure/tupexposuresheet.cpp tupi-0.2+git05/src/components/exposure/tupexposuresheet.cpp
--- tupi-0.2+git04/src/components/exposure/tupexposuresheet.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/tupexposuresheet.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,21 +34,6 @@
  ***************************************************************************/
 
 #include "tupexposuresheet.h"
-#include "tapplication.h"
-#include "tdebug.h"
-#include "tglobal.h"
-#include "toptionaldialog.h"
-#include "tupprojectrequest.h"
-#include "tuprequestbuilder.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-#include "tupframe.h"
-
-#include <QToolTip>
-#include <QPixmap>
-#include <QHBoxLayout>
-#include <QList>
-#include <QMenu>
 
 struct TupExposureSheet::Private
 {
@@ -58,16 +43,22 @@
     QMenu *menu;
     QString nameCopyFrame;
     bool fromMenu;
+    bool localRequest;
 };
 
 TupExposureSheet::TupExposureSheet(QWidget *parent) : TupModuleWidgetBase(parent, "Exposure Sheet"), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     k->currentTable = 0;
     k->fromMenu = false;
+    k->localRequest = false;
     setWindowTitle(tr("Exposure Sheet"));
     setWindowIcon(QPixmap(kAppProp->themeDir() + "icons/exposure_sheet.png"));
 
@@ -76,8 +67,8 @@
                         TupProjectActionBar::Separator |
                         TupProjectActionBar::InsertFrame |
                         TupProjectActionBar::RemoveFrame |
-                        TupProjectActionBar::MoveFrameUp |
-                        TupProjectActionBar::MoveFrameDown | 
+                        TupProjectActionBar::MoveFrameBackward |
+                        TupProjectActionBar::MoveFrameForward | 
                         TupProjectActionBar::LockFrame);
 
     connect(k->actionBar, SIGNAL(actionSelected(int)), this, SLOT(applyAction(int)));
@@ -92,48 +83,47 @@
 TupExposureSheet::~TupExposureSheet()
 {
     delete k;
+
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupExposureSheet()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
 void TupExposureSheet::createMenu()
 {
     k->menu = new QMenu(tr("actions"));
-    //k->menu->addAction(tr("Insert layer"))->setData(TupProjectActionBar::InsertLayer);
-    //k->menu->addAction(tr("Remove layer"))->setData(TupProjectActionBar::RemoveLayer);
 
     QMenu *insertMenu = new QMenu(tr("Insert"));
 
     QAction *insertOne = new QAction(QIcon(THEME_DIR + "icons/add_frame.png"), tr("1 frame"), this); 
     insertOne->setIconVisibleInMenu(true);
     insertMenu->addAction(insertOne);
-    connect(insertOne, SIGNAL(triggered()), this, SLOT(insertOneFrame()));
 
     QAction *insertFive = new QAction(QIcon(THEME_DIR + "icons/add_frame.png"), tr("5 frames"), this);                        
     insertFive->setIconVisibleInMenu(true);
     insertMenu->addAction(insertFive);
-    connect(insertFive, SIGNAL(triggered()), this, SLOT(insertFiveFrames()));
 
     QAction *insertTen = new QAction(QIcon(THEME_DIR + "icons/add_frame.png"), tr("10 frames"), this);
     insertTen->setIconVisibleInMenu(true);
     insertMenu->addAction(insertTen);
-    connect(insertTen, SIGNAL(triggered()), this, SLOT(insertTenFrames()));
 
     QAction *insertTwenty = new QAction(QIcon(THEME_DIR + "icons/add_frame.png"), tr("20 frames"), this);
     insertTwenty->setIconVisibleInMenu(true);
     insertMenu->addAction(insertTwenty);
-    connect(insertTwenty, SIGNAL(triggered()), this, SLOT(insertTwentyFrames()));
 
     QAction *insertFifty = new QAction(QIcon(THEME_DIR + "icons/add_frame.png"), tr("50 frames"), this);
     insertFifty->setIconVisibleInMenu(true);
     insertMenu->addAction(insertFifty);
-    connect(insertFifty, SIGNAL(triggered()), this, SLOT(insertFiftyFrames()));
 
     QAction *insertHundred = new QAction(QIcon(THEME_DIR + "icons/add_frame.png"), tr("100 frames"), this);
     insertHundred->setIconVisibleInMenu(true);
     insertMenu->addAction(insertHundred);
-    connect(insertHundred, SIGNAL(triggered()), this, SLOT(insertHundredFrames()));
+
+    connect(insertMenu, SIGNAL(triggered(QAction *)), this, SLOT(insertFramesFromMenu(QAction*)));
 
     k->menu->addMenu(insertMenu);
 
@@ -162,51 +152,60 @@
     k->menu->addAction(pasteAction);
     connect(pasteAction, SIGNAL(triggered()), this, SLOT(emitRequestPasteInCurrentFrame()));
 
-    QMenu *expandMenu = new QMenu(tr("Expand"));
-    expandMenu->addAction(tr("1 frame"), this, SLOT(expandCurrentFrameOnce()));
-    expandMenu->addAction(tr("5 frames"), this, SLOT(expandCurrentFrameFive()));
-    expandMenu->addAction(tr("10 frames"), this, SLOT(expandCurrentFrameTen()));
-    expandMenu->setDisabled(true);
-    k->menu->addMenu(expandMenu);
-    //connect(expandMenu, SIGNAL(triggered(QAction *)), this, SLOT(actionTriggered(QAction*)));
-
     QMenu *timeLineMenu = new QMenu(tr("Copy TL forward"));
-    timeLineMenu->addAction(QIcon(THEME_DIR + "icons/copy.png"), tr("1 time"), this, SLOT(copyTimeLineOnce()));
-    timeLineMenu->addAction(QIcon(THEME_DIR + "icons/copy.png"), tr("2 times"), this, SLOT(copyTimeLineTwoTimes()));
-    timeLineMenu->addAction(QIcon(THEME_DIR + "icons/copy.png"), tr("3 times"), this, SLOT(copyTimeLineThreeTimes()));
-    timeLineMenu->addAction(QIcon(THEME_DIR + "icons/copy.png"), tr("4 times"), this, SLOT(copyTimeLineFourTimes()));
-    timeLineMenu->addAction(QIcon(THEME_DIR + "icons/copy.png"), tr("5 times"), this, SLOT(copyTimeLineFiveTimes()));
-    k->menu->addMenu(timeLineMenu);
 
+    QAction *copyTLOnce = new QAction(QIcon(THEME_DIR + "icons/copy.png"), tr("1 time"), this);
+    copyTLOnce->setIconVisibleInMenu(true);
+    timeLineMenu->addAction(copyTLOnce);
+
+    QAction *copyTLTwice = new QAction(QIcon(THEME_DIR + "icons/copy.png"), tr("2 times"), this);
+    copyTLTwice->setIconVisibleInMenu(true);
+    timeLineMenu->addAction(copyTLTwice);
+
+    QAction *copyTLThird = new QAction(QIcon(THEME_DIR + "icons/copy.png"), tr("3 times"), this);
+    copyTLThird->setIconVisibleInMenu(true);
+    timeLineMenu->addAction(copyTLThird);
+
+    QAction *copyTLFourth = new QAction(QIcon(THEME_DIR + "icons/copy.png"), tr("4 times"), this);
+    copyTLFourth->setIconVisibleInMenu(true);
+    timeLineMenu->addAction(copyTLFourth);
+
+    QAction *copyTLFifth = new QAction(QIcon(THEME_DIR + "icons/copy.png"), tr("5 times"), this);
+    copyTLFifth->setIconVisibleInMenu(true);
+    timeLineMenu->addAction(copyTLFifth);
+
+    connect(timeLineMenu, SIGNAL(triggered(QAction *)), this, SLOT(copyTimeLineFromMenu(QAction*)));
+
+    k->menu->addMenu(timeLineMenu);
     connect(k->menu, SIGNAL(triggered(QAction *)), this, SLOT(actionTriggered(QAction*)));
 }
 
 void TupExposureSheet::addScene(int index, const QString &name)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO << " index: " << index << " name: " << name;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet::addScene()] - index: " << QString::number(index) << " name: " << name;
+        #else
+            T_FUNCINFO << " index: " << index << " name: " << name;
+        #endif
     #endif
 
-    TupExposureTable *newScene = new TupExposureTable;
-    newScene->setMenu(k->menu);
+    TupExposureTable *scene = new TupExposureTable;
+    scene->setMenu(k->menu);
 
-    connect(newScene, SIGNAL(requestSetUsedFrame(int, int)), 
-                             this, SLOT(insertFrame(int, int)));
+    connect(scene, SIGNAL(frameUsed(int, int)), this, SLOT(insertFrame(int, int)));
 
-    connect(newScene, SIGNAL(requestRenameFrame(int, int,const QString &)), 
-                             this, SLOT(renameFrame(int, int, const QString &)));
+    connect(scene, SIGNAL(frameRenamed(int, int, const QString &)), this, SLOT(renameFrame(int, int, const QString &)));
 
-    connect(newScene, SIGNAL(requestSelectFrame(int, int)), SLOT(selectFrame(int, int)));
+    connect(scene, SIGNAL(frameSelected(int, int)), SLOT(selectFrame(int, int)));
 
-    connect(newScene, SIGNAL(requestRenameLayer(int, const QString &)), 
-                             this, SLOT(renameLayer(int, const QString &)));
+    connect(scene, SIGNAL(layerNameChanged(int, const QString &)), this, SLOT(requestRenameLayer(int, const QString &)));
 
-    connect(newScene, SIGNAL(requestMoveLayer(int,int)), this, SLOT(moveLayer(int, int)));
+    connect(scene, SIGNAL(layerMoved(int, int)), this, SLOT(moveLayer(int, int)));
 
-    connect(newScene, SIGNAL(requestChangeVisibilityLayer(int , bool)),
-                             this, SLOT(changeVisibilityLayer(int, bool)));
+    connect(scene, SIGNAL(layerVisibilityChanged(int, bool)), this, SLOT(changeVisibilityLayer(int, bool)));
 
-    k->scenesContainer->addScene(index, name, newScene);
+    k->scenesContainer->addScene(index, name, scene);
 }
 
 void TupExposureSheet::renameScene(int index, const QString &name)
@@ -217,14 +216,23 @@
 void TupExposureSheet::applyAction(int action)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO << "TupExposureSheet::applyAction() - action: " << action;
+        #ifdef Q_OS_WIN32
+            qDebug() << "TupExposureSheet::applyAction() - action: " << QString::number(action);
+        #else
+            T_FUNCINFO << "TupExposureSheet::applyAction() - action: " << action;
+        #endif
     #endif
 
     k->currentTable = k->scenesContainer->getCurrentTable();
 
     if (k->currentTable == 0) {
         #ifdef K_DEBUG
-               tFatal() << "TupExposureSheet::applyAction: No layer view!!" << endl;
+            QString msg = "TupExposureSheet::applyAction: No layer view!!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
         return;
     }
@@ -261,10 +269,8 @@
             case TupProjectActionBar::InsertFrame:
                {
                  int usedFrames = k->currentTable->usedFrames(k->currentTable->currentColumn());
-                 //int target = k->currentTable->currentRow();
 
                  if (k->currentTable->currentRow() >= usedFrames) {
-                     
                      for (int layer=0; layer < k->currentTable->layersTotal(); layer++) { 
                           if (usedFrames >= k->currentTable->usedFrames(layer)) {
                               int finish = k->currentTable->currentFrame() + 1;
@@ -272,17 +278,16 @@
                                    insertFrame(layer, frame);
                           }
                      }
-                     // selectFrame(k->currentTable->currentLayer(), target);
-
                  } else {
                      insertFrames(1);
                  }
-
                }
                break;
 
             case TupProjectActionBar::RemoveFrame:
                {
+                 k->localRequest = true;
+
                  int scene = k->scenesContainer->currentIndex();
                  int layer = k->currentTable->currentLayer();
                  int lastFrame = k->currentTable->framesTotalAtCurrentLayer() - 1;
@@ -291,12 +296,12 @@
                  if (k->currentTable->currentRow() > lastFrame)
                      return;
 
+                 // SQA: Check if this condition is really working
                  if (k->currentTable->frameIsLocked(layer, target))
                      k->actionBar->emitActionSelected(TupProjectActionBar::LockFrame);
 
                  if (k->currentTable->framesTotalAtCurrentLayer() == 1) {
-                     TupProjectRequest request = TupRequestBuilder::createFrameRequest(scene, layer, target, 
-                                                                                     TupProjectRequest::Reset);
+                     TupProjectRequest request = TupRequestBuilder::createFrameRequest(scene, layer, target, TupProjectRequest::Reset);
                      emit requestTriggered(&request);
                      k->fromMenu = false; 
                      return;
@@ -304,8 +309,7 @@
 
                  // SQA: Take care about the first frame case and paint a message on the workspace 
                  if (target == lastFrame) {
-                     TupProjectRequest request = TupRequestBuilder::createFrameRequest(scene, layer, target, 
-                                                                                     TupProjectRequest::Remove);
+                     TupProjectRequest request = TupRequestBuilder::createFrameRequest(scene, layer, target, TupProjectRequest::Remove);
                      emit requestTriggered(&request);
 
                      if (target > 0)
@@ -323,8 +327,7 @@
                           QString label = k->currentTable->frameName(layer, index);
                           renameFrame(layer, index - 1, label);
 
-                          TupProjectRequest request = TupRequestBuilder::createFrameRequest(scene, layer, index, 
-                                                                                          TupProjectRequest::Move, index - 1);
+                          TupProjectRequest request = TupRequestBuilder::createFrameRequest(scene, layer, index, TupProjectRequest::Move, index - 1);
                           emit requestTriggered(&request);
                      }
 
@@ -338,7 +341,7 @@
                }
                break;
 
-            case TupProjectActionBar::MoveFrameUp:
+            case TupProjectActionBar::MoveFrameBackward:
                {
                  TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scenesContainer->currentIndex(), 
                                             k->currentTable->currentLayer(), k->currentTable->currentFrame(),
@@ -347,7 +350,7 @@
                }
                break;
 
-            case TupProjectActionBar::MoveFrameDown:
+            case TupProjectActionBar::MoveFrameForward:
                {
                  if (k->currentTable->currentFrame()+1 == k->currentTable->framesTotalAtCurrentLayer())
                      insertFrames(1);
@@ -361,8 +364,7 @@
 
             case TupProjectActionBar::LockFrame:
                {
-                 bool locked = k->currentTable->frameIsLocked(k->currentTable->currentColumn(), 
-                               k->currentTable->currentFrame());
+                 bool locked = k->currentTable->frameIsLocked(k->currentTable->currentColumn(), k->currentTable->currentFrame());
 
                  TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scenesContainer->currentIndex(), 
                                             k->currentTable->currentLayer(), k->currentTable->currentFrame(),
@@ -376,19 +378,29 @@
 void TupExposureSheet::setScene(int index)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet::setScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->scenesContainer->count() >= index) {
         k->scenesContainer->blockSignals(true);
         k->scenesContainer->setCurrentIndex(index);		
         k->currentTable = k->scenesContainer->getTable(index);
-        // k->currentTable = k->scenesContainer->getCurrentTable();
         k->scenesContainer->blockSignals(false);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupExposureSheet::setScene() - Invalid scene index -> " << index;
-               tError() << "TupExposureSheet::setScene() - Scenes total -> " << k->scenesContainer->count(); 
+            QString msg1 = "TupExposureSheet::setScene() - Invalid scene index -> " + QString::number(index);
+            QString msg2 = "TupExposureSheet::setScene() - Scenes total -> " + QString::number(k->scenesContainer->count());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg1;
+                qDebug() << msg2;
+            #else
+                tError() << msg1;
+                tError() << msg2;
+            #endif
         #endif
     }
 }
@@ -414,9 +426,13 @@
 {
     if (k->nameCopyFrame.isEmpty()) {
         #ifdef K_DEBUG
-               tError() << "TupExposureSheet::emitRequestPasteInCurrentFrame() - The copied frame name is empty!";
+            QString msg = "TupExposureSheet::emitRequestPasteInCurrentFrame() - The copied frame name is empty!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
-
         return;
     }
 
@@ -448,26 +464,14 @@
     emit requestTriggered(&request);
 }
 
-void TupExposureSheet::expandCurrentFrameOnce()
-{
-    emitRequestExpandCurrentFrame(1);
-}
-
-void TupExposureSheet::expandCurrentFrameFive()
-{
-    emitRequestExpandCurrentFrame(5);
-}
-
-void TupExposureSheet::expandCurrentFrameTen()
-{
-    emitRequestExpandCurrentFrame(10);
-}
-
-
 void TupExposureSheet::insertFrame(int indexLayer, int indexFrame)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet::insertFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scenesContainer->currentIndex(), 
@@ -485,34 +489,36 @@
 void TupExposureSheet::selectFrame(int indexLayer, int indexFrame)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif 
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet::selectFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
 
     TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scenesContainer->currentIndex(), indexLayer, 
-                                                 indexFrame, TupProjectRequest::Select, "1");
+                                                   indexFrame, TupProjectRequest::Select, "1");
     emit localRequestTriggered(&request);
-    // emit requestTriggered(&request);
 }
 
 void TupExposureSheet::changeVisibilityLayer(int visualIndexLayer, bool visibility)
 {
     TupProjectRequest request = TupRequestBuilder::createLayerRequest(k->scenesContainer->currentIndex(), visualIndexLayer,
-                                                  TupProjectRequest::View, visibility);
+                                                   TupProjectRequest::View, visibility);
     emit localRequestTriggered(&request);
-    // emit requestTriggered(&event);
 }
 
-void TupExposureSheet::renameLayer(int indexLayer, const QString & name)
+void TupExposureSheet::requestRenameLayer(int indexLayer, const QString & name)
 {
     TupProjectRequest request = TupRequestBuilder::createLayerRequest(k->scenesContainer->currentIndex(), indexLayer,
-                                                 TupProjectRequest::Rename, name);
+                                                   TupProjectRequest::Rename, name);
     emit requestTriggered(&request);
 }
 
 void TupExposureSheet::moveLayer(int oldIndex, int newIndex)
 {
     TupProjectRequest request = TupRequestBuilder::createLayerRequest(k->scenesContainer->currentIndex(), oldIndex,
-                                                 TupProjectRequest::Move, newIndex);
+                                                   TupProjectRequest::Move, newIndex);
     emit requestTriggered(&request);
 }
 
@@ -528,7 +534,11 @@
 void TupExposureSheet::closeAllScenes()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet::closeAllScenes()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     k->scenesContainer->blockSignals(true);
@@ -543,7 +553,11 @@
 void TupExposureSheet::sceneResponse(TupSceneResponse *e)
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("exposure");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet::sceneResponse()]";
+        #else
+            T_FUNCINFOX("exposure");
+        #endif
     #endif
 
     switch(e->action()) {
@@ -555,24 +569,6 @@
            case TupProjectRequest::Remove:
             {
                 k->scenesContainer->removeScene(e->sceneIndex());
-
-                /*
-                k->currentTable = k->scenesContainer->getCurrentTable();
-                int layer = k->currentTable->currentLayer();
-                int frame = k->currentTable->currentFrame() + 1;
-              
-                if (e->sceneIndex() == 0 && k->scenesContainer->count() == 1) {
-                    TupProjectRequest request = TupRequestBuilder::createFrameRequest(0, layer,
-                                               frame, TupProjectRequest::Select, "1");
-                    emit requestTriggered(&request);
-                } else {
-                    if (e->sceneIndex() > 0) {
-                        TupProjectRequest request = TupRequestBuilder::createFrameRequest(e->sceneIndex() - 1, layer,
-                                                   frame, TupProjectRequest::Select, "1");
-                        emit requestTriggered(&request);
-                    }
-                }
-                */
             }
            break;
            case TupProjectRequest::Reset:
@@ -580,8 +576,7 @@
                 setScene(e->sceneIndex());
                 renameScene(e->sceneIndex(), e->arg().toString());
 
-                TupProjectRequest request = TupRequestBuilder::createFrameRequest(e->sceneIndex(), 0,
-                                            0, TupProjectRequest::Select, "1");
+                TupProjectRequest request = TupRequestBuilder::createFrameRequest(e->sceneIndex(), 0, 0, TupProjectRequest::Select, "1");
                 emit requestTriggered(&request);
 
                 k->currentTable->reset();
@@ -627,14 +622,6 @@
                 case TupProjectRequest::Remove:
                  {
                      table->removeLayer(e->layerIndex());
-
-                     if (table->layersTotal() == 0) {
-                         TupProjectRequest request = TupRequestBuilder::createLayerRequest(0, 0, TupProjectRequest::Add, tr("Layer %1").arg(1));
-                         emit requestTriggered(&request);
-
-                         request = TupRequestBuilder::createFrameRequest(0, 0, 0, TupProjectRequest::Add, tr("Frame %1").arg(1));
-                         emit requestTriggered(&request);
-                     }
                  }
                 break;
                 case TupProjectRequest::Move:
@@ -661,18 +648,28 @@
                  }
                 case TupProjectRequest::View:
                  {
-                     table->setVisibilityChanged(e->layerIndex(), e->arg().toBool());
+                     table->setLayerVisibility(e->layerIndex(), e->arg().toBool());
                  }
                 break;
                 default:
                      #ifdef K_DEBUG
-                            tFatal() << "TupExposureSheet::layerResponse - Layer option undefined! -> " << e->action();
+                         QString msg = "TupExposureSheet::layerResponse - Layer option undefined! -> " + QString::number(e->action());
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tFatal() << msg;
+                         #endif
                      #endif
                 break;
         }
     } else {
         #ifdef K_DEBUG
-               tFatal() << "TupExposureSheet::layerResponse -> Scene index invalid: " << e->sceneIndex();
+            QString msg = "TupExposureSheet::layerResponse -> Scene index invalid: " + QString::number(e->sceneIndex());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
     }
 }
@@ -680,7 +677,11 @@
 void TupExposureSheet::frameResponse(TupFrameResponse *e)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet::frameResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TupExposureTable *table = k->scenesContainer->getTable(e->sceneIndex());
@@ -699,7 +700,34 @@
                 break;
                 case TupProjectRequest::Remove:
                  {
-                     table->removeFrame(e->layerIndex(), e->frameIndex(), k->fromMenu);
+                     if (k->localRequest) {
+                         k->localRequest = false;
+                         table->removeFrame(e->layerIndex(), e->frameIndex(), k->fromMenu);
+                     } else {
+                         int layer = k->currentTable->currentLayer();
+                         int lastFrame = k->currentTable->framesTotalAtCurrentLayer() - 1;
+                         int target = e->frameIndex();
+
+                         if (target == lastFrame) {
+                             table->removeFrame(e->layerIndex(), target, k->fromMenu);
+                             if (target <= 0)
+                                 k->currentTable->clearSelection();
+                         } else {
+                             // When the item deleted is not the last one
+                             for (int index=target+1; index <= lastFrame; index++) {
+                                  TupExposureTable::FrameType type;
+                                  type = k->currentTable->frameState(layer, index);
+                                  k->currentTable->updateFrameState(layer, index - 1, type);
+
+                                  QString label = k->currentTable->frameName(layer, index);
+                                  renameFrame(layer, index - 1, label);
+                             }
+
+                             table->removeFrame(e->layerIndex(), lastFrame, k->fromMenu);
+                         }
+                     }
+
+                     k->fromMenu = false;
                  }
                 break;
                 case TupProjectRequest::Reset:
@@ -710,15 +738,7 @@
                 break;
                 case TupProjectRequest::Exchange:
                  {
-                     if (e->arg().toInt() < table->framesTotalAtCurrentLayer()) {
-                         table->exchangeFrame(e->layerIndex(), e->frameIndex(), e->layerIndex(), e->arg().toInt(),
-                                              e->external());
-                     } else {
-                         // insertFrame(e->layerIndex(), e->arg().toInt());
-                         //insertFrames(1);
-                         table->exchangeFrame(e->layerIndex(), e->frameIndex(), e->layerIndex(), e->arg().toInt(),
-                                              e->external());
-                     }
+                     table->exchangeFrame(e->layerIndex(), e->frameIndex(), e->layerIndex(), e->arg().toInt(), e->external());
                  }
                 break;
                 case TupProjectRequest::Move:
@@ -746,11 +766,7 @@
                 break;
                 case TupProjectRequest::Expand:
                  {
-                     /*
-                     tFatal() << "TupExposureSheet::frameResponse - Expand! -> Just Tracing!";
-                     tFatal() << "TupExposureSheet::frameResponse - Starting point: -> " << e->frameIndex();
-                     tFatal() << "TupExposureSheet::frameResponse - Range: -> " << e->arg().toInt();
-                     */
+                     // SQA: It's very possible this feature will be deprecated. Please confirm!
                      for(int i = 0; i < e->arg().toInt(); i++)
                          table->insertFrame(e->layerIndex(), e->frameIndex()+i+1, 
                                             table->frameName(e->layerIndex(), e->frameIndex()), 
@@ -783,7 +799,12 @@
         }
     } else {
         #ifdef K_DEBUG
-               tError() << "TupExposureSheet::frameResponse - [ Fatal Error ] - Scene index is invalid -> " << e->sceneIndex();
+            QString msg = "TupExposureSheet::frameResponse() - [ Fatal Error ] - Scene index is invalid -> " + QString::number(e->sceneIndex());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -805,7 +826,7 @@
                  break;
             case TupProjectRequest::SetTween:
                  {
-                     // tError() << "TupExposureSheet::itemResponse() - Tracing!";
+                     // SQA: Check if this case has relevance for this context
                  }
                  break;
             default:
@@ -835,40 +856,14 @@
     }
 }
 
-void TupExposureSheet::insertOneFrame()
-{
-    insertFrames(1);
-}
-
-void TupExposureSheet::insertFiveFrames()
-{
-    insertFrames(5);
-}
-
-void TupExposureSheet::insertTenFrames()
-{
-    insertFrames(10);
-}
-
-void TupExposureSheet::insertTwentyFrames()
-{
-    insertFrames(20);
-}
-
-void TupExposureSheet::insertFiftyFrames()
-{
-    insertFrames(50);
-}
-
-void TupExposureSheet::insertHundredFrames()
-{
-    insertFrames(100);
-}
-
 void TupExposureSheet::insertFrames(int n)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet::insertFrames()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     int scene = k->scenesContainer->currentIndex();
@@ -876,16 +871,31 @@
     int target = k->currentTable->currentFrame() + 1;
     int lastFrame = k->currentTable->framesTotalAtCurrentLayer() - 1;
 
-    for (int i=0; i<n; i++)
-         insertFrame(layer, k->currentTable->framesTotalAtCurrentLayer());
+    if (target > lastFrame) {
+        for (int i=0; i<n; i++)
+             insertFrame(layer, k->currentTable->framesTotalAtCurrentLayer());
+
+        selectFrame(layer, k->currentTable->currentFrame());
+    } else {
+        int frame = k->currentTable->currentFrame() + 1; 
+
+        for (int i=0; i<n; i++)
+             insertFrame(layer, k->currentTable->framesTotalAtCurrentLayer());
+
+        for (int index=lastFrame; index >= target; index--) {
+             TupProjectRequest event = TupRequestBuilder::createFrameRequest(scene, layer, index, TupProjectRequest::Exchange, index + n);
+             emit requestTriggered(&event);
+        }
+
+        lastFrame = k->currentTable->framesTotalAtCurrentLayer() - 1;
+        for (int index=target; index <= lastFrame; index++) {
+             target++;
+             TupProjectRequest event = TupRequestBuilder::createFrameRequest(scene, layer, index, TupProjectRequest::Rename, tr("Frame %1").arg(target));
+             emit requestTriggered(&event);
+        }
 
-    for (int index=lastFrame; index >= target; index--) {
-         TupProjectRequest event = TupRequestBuilder::createFrameRequest(scene,
-                                  layer, index, TupProjectRequest::Move, index + n);
-         emit requestTriggered(&event);
+        selectFrame(layer, frame);
     }
-   
-    selectFrame(layer, k->currentTable->currentFrame());
 }
 
 void TupExposureSheet::removeOne()
@@ -897,7 +907,11 @@
 void TupExposureSheet::clearFrame()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureSheet::clearFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     int scene = k->scenesContainer->currentIndex();
@@ -933,32 +947,6 @@
     }
 }
 
-
-void TupExposureSheet::copyTimeLineOnce()
-{
-    copyTimeLine(1);
-}
-
-void TupExposureSheet::copyTimeLineTwoTimes()
-{
-    copyTimeLine(2);
-}
-
-void TupExposureSheet::copyTimeLineThreeTimes()
-{
-    copyTimeLine(3);
-}
-
-void TupExposureSheet::copyTimeLineFourTimes()
-{
-    copyTimeLine(4);
-}
-
-void TupExposureSheet::copyTimeLineFiveTimes()
-{
-    copyTimeLine(5);
-}
-
 void TupExposureSheet::copyTimeLine(int times) 
 {
     int currentScene = k->scenesContainer->currentIndex();
@@ -990,3 +978,65 @@
     emit requestTriggered(&request);
 }
 
+void TupExposureSheet::insertFramesFromMenu(QAction *action)
+{
+    QString actionName = action->text();
+
+    if (actionName.compare(tr("1 frame")) == 0) {
+        insertFrames(1);
+        return;
+    }
+
+    if (actionName.compare(tr("5 frames")) == 0) {
+        insertFrames(5);
+        return;
+    }
+
+    if (actionName.compare(tr("10 frames")) == 0) {
+        insertFrames(10);
+        return;
+    }
+
+    if (actionName.compare(tr("20 frames")) == 0) {
+        insertFrames(20);
+        return;
+    }
+
+    if (actionName.compare(tr("50 frames")) == 0) {
+        insertFrames(50);
+        return;
+    }
+
+    if (actionName.compare(tr("100 frames")) == 0)
+        insertFrames(100);
+}
+
+void TupExposureSheet::copyTimeLineFromMenu(QAction *action)
+{
+    QString actionName = action->text();
+
+    if (actionName.compare(tr("1 time")) == 0) {
+        copyTimeLine(1);
+        return;
+    }
+
+    if (actionName.compare(tr("2 times")) == 0) {
+        copyTimeLine(2);
+        return;
+    }
+
+    if (actionName.compare(tr("3 times")) == 0) {
+        copyTimeLine(3);
+        return;
+    }
+
+    if (actionName.compare(tr("4 times")) == 0) {
+        copyTimeLine(4);
+        return;
+    }
+
+    if (actionName.compare(tr("5 times")) == 0) {
+        copyTimeLine(5);
+        return;
+    }
+}
diff -Nru tupi-0.2+git04/src/components/exposure/tupexposuresheet.h tupi-0.2+git05/src/components/exposure/tupexposuresheet.h
--- tupi-0.2+git04/src/components/exposure/tupexposuresheet.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/tupexposuresheet.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,26 +36,38 @@
 #ifndef TUPEXPOSURESHEET_H
 #define TUPEXPOSURESHEET_H
 
+#include "tglobal.h"
 #include "tupmodulewidgetbase.h"
 #include "tupexposuretable.h"
 #include "tupscenetabwidget.h"
 #include "timagebutton.h"
 #include "tupprojectactionbar.h"
 #include "tupproject.h"
+#include "tapplication.h"
+#include "toptionaldialog.h"
+#include "tupprojectrequest.h"
+#include "tuprequestbuilder.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+#include "tupframe.h"
 
-// Qt
 #include <QButtonGroup>
 #include <QGroupBox>
 #include <QPushButton>
 #include <QListWidget>
 #include <QList>
 #include <QActionGroup>
+#include <QToolTip>
+#include <QPixmap>
+#include <QHBoxLayout>
+#include <QList>
+#include <QMenu>
  
 /**
 * @author Jorge Cuadrado
 */
 
-class TupExposureSheet : public TupModuleWidgetBase
+class TUPI_EXPORT TupExposureSheet : public TupModuleWidgetBase
 {
     Q_OBJECT
 
@@ -91,28 +103,18 @@
         void emitRequestChangeScene(int index);
         void emitRequestCopyCurrentFrame();
         void emitRequestPasteInCurrentFrame();
-        void expandCurrentFrameOnce();
-        void expandCurrentFrameFive();
-        void expandCurrentFrameTen();
-        void insertOneFrame();
-        void insertFiveFrames();
-        void insertTenFrames();
-        void insertTwentyFrames();
-        void insertFiftyFrames();
-        void insertHundredFrames();
+
+        void insertFramesFromMenu(QAction *action);
+        void copyTimeLineFromMenu(QAction *action);
+
         void removeOne();
         void clearFrame();
         void lockFrame();
-        void copyTimeLineOnce();
-        void copyTimeLineTwoTimes();
-        void copyTimeLineThreeTimes();
-        void copyTimeLineFourTimes();
-        void copyTimeLineFiveTimes();
-		
+
         void insertFrame(int indexLayer, int indexFrame);
-        void renameFrame(int indexLayer, int indexFrame, const QString & name);
+        void renameFrame(int indexLayer, int indexFrame, const QString &name);
         void selectFrame(int indexLayer, int indexFrame);
-        void renameLayer(int indexLayer, const QString & name);
+        void requestRenameLayer(int indexLayer, const QString &name);
         void moveLayer(int oldIndex, int newIndex);
         void actionTriggered(QAction *action);
 };
diff -Nru tupi-0.2+git04/src/components/exposure/tupexposuretable.cpp tupi-0.2+git05/src/components/exposure/tupexposuretable.cpp
--- tupi-0.2+git04/src/components/exposure/tupexposuretable.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/tupexposuretable.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,26 +34,14 @@
  ***************************************************************************/
 
 #include "tupexposuretable.h"
-#include "tupexposureheader.h"
-#include "tdebug.h"
-#include "tupglobal.h"
-
-#include <QPainter>
-#include <QItemDelegate>
-#include <QLineEdit>
-#include <QMouseEvent>
-#include <QMenu>
-#include <QHeaderView>
 
 /**
  * @author Jorge Cuadrado
  */
 
 /////////////////
-class TupExposureVerticalHeader : public QHeaderView
+class TUPI_EXPORT TupExposureVerticalHeader : public QHeaderView
 {
-    //Q_OBJECT
-
     public:
         TupExposureVerticalHeader(QWidget * parent = 0);
         ~TupExposureVerticalHeader();
@@ -62,7 +50,6 @@
 
 TupExposureVerticalHeader::TupExposureVerticalHeader(QWidget * parent) : QHeaderView(Qt::Vertical, parent)
 {
-    //setClickable(true);
     setFixedWidth(25);
 }
 
@@ -127,14 +114,11 @@
 void TupExposureItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
     QItemDelegate::paint(painter, option, index);
-
     TupExposureTable *table = qobject_cast<TupExposureTable *>(index.model()->parent());
-
     QTableWidgetItem *item = table->itemFromIndex(index);
 
     if (item) {
-
-        /* Useful code
+        /* SQA: Useful code
         if (item->data(TupExposureTable::IsLocked).toBool()) {
              QPixmap pixmap(THEME_DIR + "icons/padlock.png");
              painter->drawPixmap(1, 5, pixmap);
@@ -146,11 +130,6 @@
         int w = option.rect.bottomRight().x() - x - 2;
         int h = option.rect.bottomRight().y() - y - 2;
 
-        if (item->data(TupExposureTable::IsLocked).toBool()) {
-            painter->setPen(QColor(255, 255, 255, 200));
-            painter->drawRect(x, y, w, h);
-        }
-
         if ((item->data(TupExposureTable::IsEmpty).toInt() == TupExposureTable::Empty) && !item->data(TupExposureTable::IsLocked).toBool()) {
             QPen pen(QColor(100, 100, 100, 30));
             pen.setStyle(Qt::DashLine);
@@ -179,10 +158,13 @@
     QMenu *menu;
     bool removingLayer;
     bool removingFrame;
+    bool isLocalRequest;
 };
 
 TupExposureTable::TupExposureTable(QWidget * parent) : QTableWidget(parent), k(new Private)
 {
+    k->isLocalRequest = false;
+
     TupExposureVerticalHeader *verticalHeader = new TupExposureVerticalHeader(this);
     setVerticalHeader(verticalHeader);
 
@@ -204,16 +186,15 @@
 
     k->header = new TupExposureHeader(this);
 
-    connect(k->header, SIGNAL(visibilityChanged(int, bool)), this, SIGNAL(requestChangeVisibilityLayer(int, bool)));
-    connect(k->header, SIGNAL(changedName(int, const QString &)), this, SIGNAL(requestRenameLayer(int, 
-                              const QString & )));
-    connect(k->header, SIGNAL(sectionMoved(int, int, int)), this, SLOT(emitRequestMoveLayer(int, int, int)));
+    connect(k->header, SIGNAL(visibilityChanged(int, bool)), this, SIGNAL(layerVisibilityChanged(int, bool)));
+    connect(k->header, SIGNAL(nameChanged(int, const QString &)), this, SIGNAL(layerNameChanged(int, const QString & )));
+    connect(k->header, SIGNAL(sectionMoved(int, int, int)), this, SLOT(requestLayerMove(int, int, int)));
     connect(k->header, SIGNAL(selectionChanged(int)), this, SLOT(updateLayerSelection(int)));
 
     setHorizontalHeader(k->header);
 
-    connect(this, SIGNAL(cellClicked(int, int)), this, SLOT(emitRequestSetUsedFrame(int, int)));
-    connect(this, SIGNAL(currentCellChanged(int, int, int, int)), this, SLOT(emitRequestSelectFrame(int, int, int, int)));
+    connect(this, SIGNAL(cellClicked(int, int)), this, SLOT(markUsedFrames(int, int)));
+    connect(this, SIGNAL(currentCellChanged(int, int, int, int)), this, SLOT(requestFrameSelection(int, int, int, int)));
 
     setSelectionBehavior(QAbstractItemView::SelectItems);
     setSelectionMode(QAbstractItemView::SingleSelection);
@@ -221,23 +202,23 @@
     k->menu = 0;
 }
 
-void TupExposureTable::emitRequestRenameFrame(QTableWidgetItem * item)
+void TupExposureTable::requestFrameRenaming(QTableWidgetItem * item)
 {
     QModelIndex  index = indexFromItem(item);
-    emit requestRenameFrame(index.column(), index.row(), item->text());
+    emit frameRenamed(index.column(), index.row(), item->text());
 }
 
-void TupExposureTable::emitRequestSelectFrame(int currentSelectedRow, int currentColumn, int previousRow, int previousColumn)
+void TupExposureTable::requestFrameSelection(int currentSelectedRow, int currentColumn, int previousRow, int previousColumn)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureTable::requestFrameSelection()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
-    // tError() << "TupExposureTable::emitRequestSelectFrame() - Current frame: " << currentSelectedRow;
-    // tError() << "TupExposureTable::emitRequestSelectFrame() - Previous frame: " << previousRow;
-
     if (!k->removingLayer) { 
-
         if (k->removingFrame) {
             k->removingFrame = false;
 
@@ -245,17 +226,19 @@
                  k->header->updateSelection(currentColumn);
 
             if (previousRow != currentSelectedRow) 
-                emit requestSelectFrame(currentLayer(), currentRow());
+                emit frameSelected(currentLayer(), currentRow());
 
             return;
+        } else {
+            QTableWidgetItem *frame = item(currentSelectedRow, currentColumn);
+            if (frame) {
+                if (previousColumn != currentColumn || previousRow != currentSelectedRow)
+                    emit frameSelected(currentLayer(), currentRow());
+
+                if ((previousColumn != currentColumn) || (columnCount() == 1))
+                    k->header->updateSelection(currentColumn);
+            } 
         }
-
-        if (previousColumn != currentColumn || previousRow != currentSelectedRow)
-            emit requestSelectFrame(currentLayer(), currentRow());
-
-        if ((previousColumn != currentColumn) || (columnCount() == 1))
-             k->header->updateSelection(currentColumn);
-
     } else { // A layer is being removed
         k->removingLayer = false;
         selectFrame(currentColumn, currentSelectedRow);
@@ -267,13 +250,23 @@
     }
 }
 
-void TupExposureTable::emitRequestMoveLayer(int logicalIndex, int oldVisualIndex, int newVisualIndex)
+void TupExposureTable::requestLayerMove(int logicalIndex, int oldVisualIndex, int newVisualIndex)
 {
     Q_UNUSED(logicalIndex);
 
-    if (! k->header->signalMovedBlocked()) {
-        k->header->moveLayer(newVisualIndex, oldVisualIndex);
-        emit requestMoveLayer(oldVisualIndex, newVisualIndex);
+    if (!k->header->sectionIsMoving()) {
+        int distance = newVisualIndex - oldVisualIndex;
+        if (distance > 0) {
+            if (distance > 1)
+                newVisualIndex = oldVisualIndex + 1;
+        } else {
+            distance = abs(distance);
+            if (distance > 1)
+                newVisualIndex = oldVisualIndex - 1;
+        }
+
+        k->isLocalRequest = true;
+        emit layerMoved(oldVisualIndex, newVisualIndex);
     }
 }
 
@@ -298,7 +291,7 @@
 
 void TupExposureTable::setFrameName(int layerIndex, int frameIndex, const QString &name)
 {
-    QTableWidgetItem *frame = item(frameIndex , layerIndex);
+    QTableWidgetItem *frame = item(frameIndex, layerIndex);
     frame->setFont(QFont("Arial", 7, QFont::Normal, false));
 
     if (frame) {
@@ -309,7 +302,7 @@
 
 void TupExposureTable::setLayerName(int layerIndex, const QString & name)
 {
-    k->header->setLayerName(k->header->logicalIndex(layerIndex), name);
+    k->header->setSectionTitle(k->header->logicalIndex(layerIndex), name);
 }
 
 bool TupExposureTable::frameIsLocked(int layerIndex, int frameIndex)
@@ -319,7 +312,12 @@
         return frame->data(IsLocked).toBool();
     } else {
         #ifdef K_DEBUG
-               tWarning() << "TupExposureTable::frameIsLocked() - Layer: " << layerIndex << ", Frame: " << frameIndex << " doesn't exist";
+            QString msg = "TupExposureTable::frameIsLocked() - Layer: " + QString::number(layerIndex) + QString(", Frame: ") + QString::number(frameIndex) + QString(" doesn't exist");
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
     return false;
@@ -342,7 +340,12 @@
         frame->setData(IsEmpty, value);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupExposureTable::updateFrameState() - Error: No frame at [" << layerIndex << ", " << frameIndex << "]";
+            QString msg = "TupExposureTable::updateFrameState() - Error: No frame at [" + QString::number(layerIndex) + ", " + QString::number(frameIndex) + "]";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -350,12 +353,17 @@
 void TupExposureTable::selectFrame(int layerIndex, int frameIndex)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureTable::selectFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
-    if (k->header->currentLayerIndex() != layerIndex)
+    if (k->header->currentSectionIndex() != layerIndex)
         k->header->updateSelection(layerIndex);
-    setCurrentCell(frameIndex, k->header->logicalIndex(layerIndex));
+
+    setCurrentCell(frameIndex, layerIndex);
 }
 
 void TupExposureTable::setMenu(QMenu *menu)
@@ -371,7 +379,11 @@
 int TupExposureTable::currentFrame() const
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureTable::currentFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     QTableWidgetItem *frame = currentItem();
@@ -388,7 +400,7 @@
 {
     insertColumn(index);
     setColumnWidth(index, 70);
-    k->header->insertLayer(index, name);
+    k->header->insertSection(index, name);
 }
 
 void TupExposureTable::insertFrame(int layerIndex, int frameIndex, const QString & name, bool external)
@@ -425,9 +437,9 @@
     if (frame) {
         if (frame->data(TupExposureTable::IsEmpty).toInt() != Unset) {
             if (locked)
-                frame->setBackgroundColor(QColor(250, 71, 53));
+                frame->setBackgroundColor(QColor(255, 0, 0, 90));
             else
-                frame->setBackgroundColor(QColor(0xe6e6e6));
+                frame->setBackgroundColor(QColor(255, 255, 255));
 
             frame->setData(IsLocked, locked);
         }
@@ -436,12 +448,12 @@
 
 void TupExposureTable::setLockLayer(int layerIndex, bool locked)
 {
-    k->header->setLockLayer(layerIndex, locked);
+    k->header->setLockFlag(layerIndex, locked);
 }
 
-void TupExposureTable::setVisibilityChanged(int visualIndex, bool visibility)
+void TupExposureTable::setLayerVisibility(int visualIndex, bool visibility)
 {
-    k->header->setVisibilityChanged(k->header->logicalIndex(visualIndex), visibility);
+    k->header->setSectionVisibility(k->header->logicalIndex(visualIndex), visibility);
 }
 
 void TupExposureTable::removeLayer(int layerIndex)
@@ -449,7 +461,7 @@
     setUpdatesEnabled(false);
     k->removingLayer = true;
 
-    k->header->removeLayer(layerIndex);
+    k->header->removeSection(layerIndex);
     removeColumn(layerIndex);
 
     setUpdatesEnabled(true);
@@ -457,34 +469,28 @@
 
 void TupExposureTable::removeFrame(int layerIndex, int frameIndex, bool fromMenu)
 {
-    blockSignals(true);
-
     k->removingFrame = fromMenu;
 
     QTableWidgetItem *item = takeItem(frameIndex, layerIndex);
 
     if (item) {
-        /*
-        for (int index = frameIndex + 1; index < k->header->lastFrame(layerIndex); index++) {
-             QTableWidgetItem *idx = takeItem(index, layerIndex);
-             if (idx)
-                 setItem(index - 1, layerIndex, idx);
-        }
-        */
         k->header->setLastFrame(layerIndex, k->header->lastFrame(layerIndex)-1);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupExposureTable::removeFrame() - No item available at [" << layerIndex << ", " << frameIndex << "]";
+            QString msg = "TupExposureTable::removeFrame() - No item available at [" + QString::number(layerIndex) + ", " + QString::number(frameIndex) + "]";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
-
-    //setUpdatesEnabled(true);
 }
 
 void TupExposureTable::exchangeFrame(int oldPosLayer, int oldPosFrame, int newPosLayer, int newPosFrame, bool external)
 {
-    QTableWidgetItem * oldItem  = takeItem(oldPosFrame, oldPosLayer);
-    QTableWidgetItem * newItem  = takeItem(newPosFrame, newPosLayer);
+    QTableWidgetItem *oldItem = takeItem(oldPosFrame, oldPosLayer);
+    QTableWidgetItem *newItem = takeItem(newPosFrame, newPosLayer);
 
     setItem(newPosFrame, newPosLayer, oldItem);
     setItem(oldPosFrame, oldPosLayer, newItem);
@@ -495,13 +501,26 @@
 
 void TupExposureTable::moveLayer(int oldPosLayer, int newPosLayer)
 {
-    k->header->moveLayer(oldPosLayer, newPosLayer);
+    k->header->moveHeaderSection(oldPosLayer, newPosLayer, k->isLocalRequest);
+    if (k->isLocalRequest)
+        k->isLocalRequest = false;
+
+    for (int frameIndex = 0; frameIndex < k->header->lastFrame(oldPosLayer); frameIndex++)
+         exchangeFrame(oldPosLayer, frameIndex, newPosLayer, frameIndex, true);
+
+    blockSignals(true);
+    selectFrame(newPosLayer, currentRow());
+    blockSignals(false);
 }
 
-void TupExposureTable::emitRequestSetUsedFrame(int frameIndex, int layerIndex)
+void TupExposureTable::markUsedFrames(int frameIndex, int layerIndex)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureTable::markUsedFrames()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     int layer = k->header->visualIndex(layerIndex);
@@ -512,11 +531,11 @@
              int used = usedFrames(column); 
              if (lastFrame >= used) {
                  for (int frame=used; frame <= frameIndex; frame++)
-                      emit requestSetUsedFrame(column, frame);
+                      emit frameUsed(column, frame);
              }
         }
 
-        emit requestSelectFrame(layer, frameIndex);
+        emit frameSelected(layer, frameIndex);
     } 
 }
 
@@ -562,12 +581,12 @@
     QTableWidget::commitData(0); // Don't rename
 
     if (lineEdit)
-        emit requestRenameFrame(currentLayer(), currentFrame(), lineEdit->text());
+        emit frameRenamed(currentLayer(), currentFrame(), lineEdit->text());
 }
 
 int TupExposureTable::layersTotal()
 {
-    return k->header->layersTotal();
+    return k->header->sectionsTotal();
 }
 
 int TupExposureTable::framesTotal()
@@ -588,7 +607,12 @@
             setCurrentCell(row, currentColumn());
         } else {
             #ifdef K_DEBUG
-                   tWarning() << "TupExposureTable::keyPressEvent() - Warning: wrong frame index [ " << row << " ]";
+                QString msg = "TupExposureTable::keyPressEvent() - Warning: wrong frame index [ " + QString::number(row) + " ]";
+                #ifdef Q_OS_WIN32
+                    qWarning() << msg;
+                #else
+                    tWarning() << msg;
+                #endif
             #endif
         }
 
@@ -596,15 +620,12 @@
     }
 
     if (event->key() == Qt::Key_Down) {
-        int limit = rowCount()-1;
+        int framesTotal = k->header->lastFrame(currentLayer());
         int next = currentRow()+1;
-        if (next <= limit) {
+        if (next >= framesTotal)
+            markUsedFrames(next, currentColumn());
+        else
             setCurrentCell(next, currentColumn());
-        } else {
-            #ifdef K_DEBUG
-                   tWarning() << "TupExposureTable::keyPressEvent() - Warning: wrong frame index [ " << next << " ]";
-            #endif
-        }
 
         return;
     }
@@ -623,14 +644,10 @@
             setCurrentCell(currentRow(), column);
         return;
     }   
-
-    if (event->key() == Qt::Key_Return) {
-        emitRequestSetUsedFrame(currentRow(), currentColumn());
-        return;
-    }
 }
 
-void TupExposureTable::emitCellClicked(int frame, int layer) 
+// SQA : Verify if this method is required
+void TupExposureTable::notifyCellClicked(int frame, int layer) 
 {
     emit cellClicked(frame, layer);
 }
@@ -660,10 +677,8 @@
     }
 
     int rows = rowCount();
-    for (int i=1; i < rows;  i++) {
+    for (int i=1; i < rows;  i++)
          takeItem(i, 0);
-         // QTableWidgetItem *item = takeItem(i, 0);
-    }
 
     k->header->setLastFrame(0, 1);
 }
diff -Nru tupi-0.2+git04/src/components/exposure/tupexposuretable.h tupi-0.2+git05/src/components/exposure/tupexposuretable.h
--- tupi-0.2+git04/src/components/exposure/tupexposuretable.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/tupexposuretable.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,16 +36,29 @@
 #ifndef TUPEXPOSURETABLE_H
 #define TUPEXPOSURETABLE_H
 
+#include "tglobal.h"
+#include "tupexposureheader.h"
+
 #include <QTableWidget>
+#include <QPainter>
+#include <QItemDelegate>
+#include <QLineEdit>
+#include <QMouseEvent>
+#include <QMenu>
+#include <QHeaderView>
+#include <QItemDelegate>
+#include <QLineEdit>
+
+#include <cmath>
 
 class TupExposureVerticalHeader;
-class QMenu;
+// class QMenu;
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupExposureTable : public QTableWidget
+class TUPI_EXPORT TupExposureTable : public QTableWidget
 {
     Q_OBJECT
 
@@ -67,13 +80,13 @@
           UsedWithTween
         };
 
-        TupExposureTable(QWidget * parent = 0);
+        TupExposureTable(QWidget *parent = 0);
         ~TupExposureTable();
 
         int currentLayer() const;
         int currentFrame() const;
-        void insertLayer(int index, const QString & name);
-        void insertFrame(int layerIndex, int frameIndex, const QString & name, bool external);
+        void insertLayer(int index, const QString &name);
+        void insertFrame(int layerIndex, int frameIndex, const QString &name, bool external);
         void removeLayer(int layerIndex);
         void removeFrame(int layerIndex, int frameIndex, bool fromMenu);
         void exchangeFrame(int oldPosLayer, int oldPosFrame, int newPosLayer, int newPosFrame, bool external);
@@ -81,7 +94,7 @@
 
         void setLockFrame(int layerIndex, int frameIndex, bool locked);
         void setLockLayer(int layerIndex,  bool locked);
-        void setVisibilityChanged(int visualIndex, bool visibility);
+        void setLayerVisibility(int visualIndex, bool visibility);
         int usedFrames(int column) const;
 
         QString frameName(int layerIndex, int frameIndex);
@@ -95,41 +108,41 @@
         int framesTotalAtCurrentLayer();
 
         void setMenu(QMenu *menu);
-        void emitCellClicked(int frame, int layer);
+        void notifyCellClicked(int frame, int layer);
         void reset();
 
         TupExposureTable::FrameType frameState(int layerIndex, int frameIndex);
         void updateFrameState(int layerIndex, int frameIndex, TupExposureTable::FrameType value);
 		
-    private:
-        struct Private;
-        Private *const k;
-
     private slots:
-        void emitRequestSetUsedFrame(int frameIndex,  int layerIndex);
-        void emitRequestRenameFrame(QTableWidgetItem * item);
-        void emitRequestSelectFrame(int currentRow, int currentColumn, int previousRow, int previousColumn);
-        void emitRequestMoveLayer(int logicalIndex, int oldVisualIndex, int newVisualIndex);
+        void markUsedFrames(int frameIndex,  int layerIndex);
+        void requestFrameRenaming(QTableWidgetItem *item);
+        void requestFrameSelection(int currentRow, int currentColumn, int previousRow, int previousColumn);
+        void requestLayerMove(int logicalIndex, int oldVisualIndex, int newVisualIndex);
         void updateLayerSelection(int layerIndex);
 
     protected:
-        bool edit(const QModelIndex & index, EditTrigger trigger, QEvent * event);
-        void mousePressEvent(QMouseEvent * event);
-        void keyPressEvent(QKeyEvent * event);
+        bool edit(const QModelIndex & index, EditTrigger trigger, QEvent *event);
+        void mousePressEvent(QMouseEvent *event);
+        void keyPressEvent(QKeyEvent *event);
         void enterEvent(QEvent *event);
         void leaveEvent(QEvent *event);
 
     protected slots:
-        void commitData(QWidget * editor);
+        void commitData(QWidget *editor);
 
     signals:
-        void requestSetUsedFrame(int layerIndex, int frameIndex);
-        void requestRenameFrame(int layerIndex, int frameIndex,const QString & name);
-        void requestSelectFrame(int layerIndex, int frameIndex);
-
-        void requestRenameLayer(int layerIndex, const QString & name);
-        void requestMoveLayer(int oldIndex, int newIndex);
-        void requestChangeVisibilityLayer(int visualIndexLayer, bool visibility);
+        void frameUsed(int layerIndex, int frameIndex);
+        void frameRenamed(int layerIndex, int frameIndex,const QString & name);
+        void frameSelected(int layerIndex, int frameIndex);
+
+        void layerNameChanged(int layerIndex, const QString & name);
+        void layerMoved(int oldIndex, int newIndex);
+        void layerVisibilityChanged(int visualIndexLayer, bool visibility);
+
+    private:
+        struct Private;
+        Private *const k;
 };
 
 #endif
diff -Nru tupi-0.2+git04/src/components/exposure/tupscenetabwidget.cpp tupi-0.2+git05/src/components/exposure/tupscenetabwidget.cpp
--- tupi-0.2+git04/src/components/exposure/tupscenetabwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/tupscenetabwidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,13 +34,6 @@
  ***************************************************************************/
 
 #include "tupscenetabwidget.h"
-#include "tdebug.h"
-
-#include <QWheelEvent>
-#include <QTabBar>
-#include <QVBoxLayout>
-#include <QFrame>
-#include <QLabel>
 
 struct TupSceneTabWidget::Private
 {
@@ -128,7 +121,12 @@
         return table;
     } else {
         #ifdef K_DEBUG
-               tError() << "TupSceneTabWidget::getTable() - [ Fatal Error ] - Invalid table index: " << index;
+            QString msg = "TupSceneTabWidget::getTable() - [ Fatal Error ] - Invalid table index: " + QString::number(index);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 
diff -Nru tupi-0.2+git04/src/components/exposure/tupscenetabwidget.h tupi-0.2+git05/src/components/exposure/tupscenetabwidget.h
--- tupi-0.2+git04/src/components/exposure/tupscenetabwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/exposure/tupscenetabwidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -44,6 +44,9 @@
 #include <QList>
 #include <QLabel>
 #include <QFrame>
+#include <QWheelEvent>
+#include <QTabBar>
+#include <QVBoxLayout>
 
 /**
  * @author Gustav Gonzalez 
diff -Nru tupi-0.2+git04/src/components/help/help/css/tupi.css tupi-0.2+git05/src/components/help/help/css/tupi.css
--- tupi-0.2+git04/src/components/help/help/css/tupi.css	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/help/css/tupi.css	2014-12-15 14:21:32.000000000 +0000
@@ -138,25 +138,25 @@
 
 a:link {
      text-decoration:underline;
-     color:#000000;
+     color:#004000;
      font-weight:bold;
 }
 
 a:visited {
      text-decoration:underline;
-     color:#000000;
+     color:#004000;
      font-weight:bold;
 }
 
 a:active {
      text-decoration:underline;
-     color:#000000;
+     color:#004000;
      font-weight:bold;
 }
 
 a:hover {
      text-decoration:underline;
-     color:#000000;
+     color:#004000;
      font-weight:bold;
 }
 
@@ -170,59 +170,37 @@
      font-weight:bold;
 }
 
-.status_table {
-     background-color:#ffffff;
-     color:#000000;
-     margin-left:10px;
-     margin-right:10px;
-     margin-top:10px;
-     margin-bottom:10px;
-}
-
-.twitter_status {
-     background-color:#ffffff;
-     color:#000000;
+.shortcut_table {
+     padding:10px;
+     border:2px solid #000000;
 }
 
-.desc_table {
-     margin-left:10px;
-     margin-right:10px;
-     margin-top:10px;
-
-     background-color:#ddeef6;
-
-     color:#000000;
-     text-align:left;
+.shortcut_subtitle {
+     padding:3px;
+     text-align:center;
      text-decoration:none;
-     font-family:"Times New Roman", Times, serif;
+     font-family:"Arial", Times, serif;
      font-style:normal;
-     font-size:13px;
-     font-weight:normal;
-}
-
-.twitter_desc {
-     background-color:#ddeef6;
-}
-
-.twitter_base {
-     margin-top:10px;
-     margin-bottom:10px;
-     margin-left:100px;
-     margin-right:100px;
+     font-size:12px;
+     font-weight:bold;
 }
 
-.date {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
+.shortcut_record {
+     padding:3px;
+     text-align:center;
      text-decoration:none;
-     font-family:"Times New Roman", Times, serif;
+     font-family:"Arial", Times, serif;
      font-style:normal;
-     font-size:11px;
+     font-size:10px;
      font-weight:normal;
 }
 
+.twitter_white {
+     background-color:#fff;
+}
+
 .twitter_headline {
+     background-image:url('file:bg1.png');
      color:#000000;
      text-align:left;
      text-decoration:none;
@@ -236,77 +214,64 @@
      vertical-align:middle;
 }
 
-.twitter_header {
-     border-style:solid;
-     border-width:5px;
-     border-color:#ff0000;
-}
-
-.twitter_slang { 
-     margin-left:5px;
-     margin-right:5px;
-     margin-top:5px;
-     margin-bottom:5px;
-     background-color:#edfeff;
-}
-
-.twitter_slang_td {
-     margin-left:5px;
-     margin-right:5px;
-     margin-top:5px;
-     margin-bottom:5px;
+.twitter_tupi_version {
+     background-color:#eee;
      color:#000000;
-     text-align:justify;
+     text-align:center;
      text-decoration:none;
      font-family:"Arial", Times, serif;
      font-style:normal;
-     font-size:10px;
+     font-size:12px;
      font-weight:normal;
 }
 
-.tupi_version {
-     background-color:#f3f3f3;
+.twitter_tupi_update {
+     background-color:#eee; 
      color:#000000;
      text-align:center;
      text-decoration:none;
      font-family:"Arial", Times, serif;
      font-style:normal;
-     font-size:11px;
+     font-size:12px;
      font-weight:normal;
 }
 
-.tupi_update {
-     background-color:#ff5d5d;
+.twitter_tupi_donation {
+     background-color:#ddd;
      color:#000000;
      text-align:center;
      text-decoration:none;
      font-family:"Arial", Times, serif;
      font-style:normal;
-     font-size:11px;
+     font-size:12px;
      font-weight:normal;
 }
 
-.shortcut_table {
-     padding:10px;
-     border:2px solid #000000;
-}
-
-.shortcut_subtitle {
-     padding:3px;
-     text-align:center;
+.twitter_tweet {
+     /* background-color:#fff; */
+     color:#000000;
+     text-align:justify;
      text-decoration:none;
      font-family:"Arial", Times, serif;
      font-style:normal;
      font-size:12px;
-     font-weight:bold;
+     font-weight:normal;
 }
 
-.shortcut_record {
-     padding:3px;
+.twitter_separator {
+     height:2px;     
+     font-size:5px;
+}
+
+.twitter_links {
+     color:#000000;
      text-align:center;
      text-decoration:none;
      font-family:"Arial", Times, serif;
      font-style:normal;
-     font-size:10px;
+     font-size:12px;
      font-weight:normal;
+     font-weight:bold;
 }
+
+
diff -Nru tupi-0.2+git04/src/components/help/help/en/shortcuts.html tupi-0.2+git05/src/components/help/help/en/shortcuts.html
--- tupi-0.2+git04/src/components/help/help/en/shortcuts.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/help/en/shortcuts.html	2014-12-15 14:21:32.000000000 +0000
@@ -194,7 +194,7 @@
     <td class="shortcut_record">Object selection</td>
   </tr>
   <tr>
-    <td class="shortcut_record">1</td>
+    <td class="shortcut_record">I</td>
     <td class="shortcut_record">Internal colour fill</td>
   </tr>
   <tr>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/components/help/help/examples/example.tup and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/components/help/help/examples/example.tup differ
diff -Nru tupi-0.2+git04/src/components/help/help/gl/shortcuts.html tupi-0.2+git05/src/components/help/help/gl/shortcuts.html
--- tupi-0.2+git04/src/components/help/help/gl/shortcuts.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/help/gl/shortcuts.html	2014-12-15 14:21:32.000000000 +0000
@@ -200,7 +200,7 @@
       <td class="shortcut_record">Selección de obxecto</td>
     </tr>
     <tr>
-      <td class="shortcut_record">1</td>
+      <td class="shortcut_record">I</td>
       <td class="shortcut_record">Cor do recheo interno</td>
     </tr>
     <tr>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/components/help/help/images/facebook.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/components/help/help/images/facebook.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/components/help/help/images/maefloresta.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/components/help/help/images/maefloresta.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/components/help/help/images/twitter01.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/components/help/help/images/twitter01.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/components/help/help/images/twitter.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/components/help/help/images/twitter.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/components/help/help/images/youtube.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/components/help/help/images/youtube.png differ
diff -Nru tupi-0.2+git04/src/components/help/help/README/HowToTranslate tupi-0.2+git05/src/components/help/help/README/HowToTranslate
--- tupi-0.2+git04/src/components/help/help/README/HowToTranslate	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/help/README/HowToTranslate	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-Translate it with your favorite CAT tool
-
-Save it with the "same_name.po"
-
-Not generate the file ".mo" if your CAT tool automatically generates it, delete it
-
-Generate the screenshots in the folder .. /en/images in your language and prepare them as they are. If you have no knowledge of the use of design tools, send the window screenshots unprocessed, making it evident a note in the mail.
-
-Make a compressed package tar.gz (or similar) with all the files and send to: <mbouzada [at] gmail [dot] com>, to integrate it into the help
-
-In the file "philosophy.html", see the notice in the third inning: "This is the content of our license:"
-
-TRANSLATRORS: IMPORTANT NOTICE!
-If there is "no official" translation of the license to your language, we recommend that you include the following notice after the sentence to be translated:
-
-You can see the original content License: <a href="http://fsf.org/">http://fsf.org/</a> 
-
-This is an unofficial translation of the GNU General Public License into YOUR_LANGUAGE. It was not published by the Free Software Foundation, and does not legally state the distribution terms for software that uses the GNU GPL only the original English text of the GNU GPL does that. However, we hope that this translation will help YOUR_LANGUAGE speakers understand the GNU GPL better.
-
-The above paragraph should be in their language and in English.
-
-FRENCH EXAMPLE:
-
-Ceci est le contenu de notre licence:
-
-Vous pouvez voir le contenu original de licence: <a href="http://fsf.org/">http://fsf.org/</a> 
-
-This is an unofficial translation of the GNU General Public License into French ... ... French speakers understand the GNU GPL better.
-
-Il s'agit d'une traduction officieuse de la Licence Publique Générale GNU en français ... ... francophones comprendre la GNU GPL mieux.
-
-#: en/philosophy.html+html.body.p:17
-msgid "This is the content of our license:"
-msgstr ""
diff -Nru tupi-0.2+git04/src/components/help/help/README/philosophy-notice tupi-0.2+git05/src/components/help/help/README/philosophy-notice
--- tupi-0.2+git04/src/components/help/help/README/philosophy-notice	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/help/README/philosophy-notice	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-
-
-#. TRANSLATRORS: IMPORTANT NOTICE!
-#. If there is "no official" translation of the license to your language, we recommend that you include the following notice after the sentence to be translated:
-#.
-#. You can see the original content License: <a href="http://fsf.org/">http://fsf.org/</a> 
-#.
-#. This is an unofficial translation of the GNU General Public License into YOUR_LANGUAGE. It was not published by the Free Software Foundation, and does not legally state the distribution terms for software that uses the GNU GPL only the original English text of the GNU GPL does that. However, we hope that this translation will help YOUR_LANGUAGE speakers understand the GNU GPL better.
-#.
-#. The above paragraph should be in their language and in English.
-#.
-#. FRENCH EXAMPLE:
-#.
-#. Ceci est le contenu de notre licence:
-#.
-#. Vous pouvez voir le contenu original de licence: <a href="http://fsf.org/">http://fsf.org/</a> 
-#.
-#. This is an unofficial translation of the GNU General Public License into French ... ... French speakers understand the GNU GPL better.
-#.
-#. Il s'agit d'une traduction officieuse de la Licence Publique Générale GNU en français ... ... francophones comprendre la GNU GPL mieux.
-#.
-#: en/philosophy.html+html.body.p:17
-msgid "This is the content of our license:"
-msgstr ""
-
-
diff -Nru tupi-0.2+git04/src/components/help/help.pri tupi-0.2+git05/src/components/help/help.pri
--- tupi-0.2+git04/src/components/help/help.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/help.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$HELP_DIR
-LIBS += -L$$HELP_DIR -ltupihelp
+
+unix {
+    LIBS += -L$$HELP_DIR -ltupihelp
+}
+
+win32 {
+    LIBS += -L$$HELP_DIR/release/ -ltupihelp
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$HELP_DIR/libtupihelp.so
diff -Nru tupi-0.2+git04/src/components/help/help.pro tupi-0.2+git05/src/components/help/help.pro
--- tupi-0.2+git04/src/components/help/help.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/help.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/help
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += help 
 help.files += help 
@@ -17,7 +14,8 @@
 HEADERS += tuphelpwidget.h \
            tuphelpbrowser.h 
 SOURCES += tuphelpwidget.cpp \
-           tuphelpbrowser.cpp 
+           tuphelpbrowser.cpp
+		   
 *:!macx{
     CONFIG += dll warn_on
 }
@@ -27,4 +25,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/help/tuphelpbrowser.cpp tupi-0.2+git05/src/components/help/tuphelpbrowser.cpp
--- tupi-0.2+git04/src/components/help/tuphelpbrowser.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/tuphelpbrowser.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,14 +34,6 @@
  ***************************************************************************/
 
 #include "tuphelpbrowser.h"
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QIcon>
-#include <QMouseEvent>
-#include <QDir>
 
 // Help Browser
 
@@ -70,12 +62,18 @@
         locale = "en";
 
     QStringList path;
-    QString resources = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator();
+	
+#ifdef Q_OS_WIN32
+    QString resources = SHARE_DIR + "help" + QDir::separator();
+#else
+	QString resources = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator();
+#endif	
+    // QString resources = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator();
     path << resources + "css";
     path << resources + "images";
     m_pageArea->setSearchPaths(path);
 
-    m_pageArea->setSource(filePath);
+    m_pageArea->setSource(QUrl::fromLocalFile(filePath));
 }
 
 // SQA: These methods are just temporary for developing reasons
diff -Nru tupi-0.2+git04/src/components/help/tuphelpbrowser.h tupi-0.2+git05/src/components/help/tuphelpbrowser.h
--- tupi-0.2+git04/src/components/help/tuphelpbrowser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/tuphelpbrowser.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,6 +36,7 @@
 #ifndef TUPHELPBROWSER_H
 #define TUPHELPBROWSER_H
 
+#include "tglobal.h"
 #include "tapplicationproperties.h"
 
 #include <QWidget>
@@ -43,12 +44,16 @@
 #include <QTextBrowser>
 #include <QTextDocument>
 #include <QKeyEvent> 
+#include <QBoxLayout>
+#include <QIcon>
+#include <QMouseEvent>
+#include <QDir>
 
 /**
  * @author David Cuadrado
 */
 
-class TupHelpBrowser : public QWidget
+class TUPI_EXPORT TupHelpBrowser : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/help/tuphelpwidget.cpp tupi-0.2+git05/src/components/help/tuphelpwidget.cpp
--- tupi-0.2+git04/src/components/help/tuphelpwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/tuphelpwidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,14 +34,6 @@
  ***************************************************************************/
 
 #include "tuphelpwidget.h"
-// Tupi Framework
-#include "tdebug.h"
-#include "tglobal.h"
-
-#include <QLocale>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QHeaderView>
 
 TupHelpWidget::TupHelpWidget(const QString &path, QWidget *parent) : TupModuleWidgetBase(parent)
 {
@@ -58,6 +50,15 @@
         m_helpPath = new QDir(path + "en");
     }
 
+    #ifdef K_DEBUG
+        QString msg = "TupHelpWidget() - Loading help files from -> " + m_helpPath->path();
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif	
+	
     QTreeWidget *contentsListView = new QTreeWidget(this);
     contentsListView->setHeaderLabels(QStringList() << tr(""));
     contentsListView->header()->hide();
@@ -107,13 +108,23 @@
             }
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupHelpWidget::TupHelpWidget() - Fatal Error: Can't set content";
+                QString msg = "TupHelpWidget::TupHelpWidget() - Fatal Error: Can't set content";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
         }
         file.close();
     } else {
         #ifdef K_DEBUG
-               tError() << "TupHelpWidget::TupHelpWidget() - Fatal Error: Can't open 'help.xml' file";
+            QString msg = "TupHelpWidget::TupHelpWidget() - Fatal Error: Can't open 'help.xml' file";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 
diff -Nru tupi-0.2+git04/src/components/help/tuphelpwidget.h tupi-0.2+git05/src/components/help/tuphelpwidget.h
--- tupi-0.2+git04/src/components/help/tuphelpwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/help/tuphelpwidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,12 +36,16 @@
 #ifndef TUPHELPWIDGET_H
 #define TUPHELPWIDGET_H
 
+#include "tglobal.h"
 #include "tupmodulewidgetbase.h"
 
 #include <QWidget>
 #include <QMap>
 #include <QTreeWidget>
 #include <QDir>
+#include <QLocale>
+#include <QBoxLayout>
+#include <QHeaderView>
 
 // class KHelpWidgetManager;
 
@@ -49,7 +53,7 @@
  * @author David Alejandro Cuadrado Cabrera
 */
 
-class TupHelpWidget : public TupModuleWidgetBase
+class TUPI_EXPORT TupHelpWidget : public TupModuleWidgetBase
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/import/import.pri tupi-0.2+git05/src/components/import/import.pri
--- tupi-0.2+git04/src/components/import/import.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/import/import.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$IMPORT_DIR
-LIBS += -L$$IMPORT_DIR -ltupimport
+
+unix {
+    LIBS += -L$$IMPORT_DIR -ltupimport
+}
+
+win32 {
+    LIBS += -L$$IMPORT_DIR/release/ -ltupimport
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$IMPORT_DIR/libtupimport.so
diff -Nru tupi-0.2+git04/src/components/import/import.pro tupi-0.2+git05/src/components/import/import.pro
--- tupi-0.2+git04/src/components/import/import.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/import/import.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/import
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += target
 target.path = /lib/
@@ -22,4 +19,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/import/tuppaletteimporter.cpp tupi-0.2+git05/src/components/import/tuppaletteimporter.cpp
--- tupi-0.2+git04/src/components/import/tuppaletteimporter.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/import/tuppaletteimporter.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,11 +34,6 @@
  ***************************************************************************/
 
 #include "tuppaletteimporter.h"
-#include "tdebug.h"
-
-#include <QFile>
-#include <QDir>
-#include <QTextStream>
 
 struct TupPaletteImporter::Private
 {
@@ -81,7 +76,12 @@
         if (extension.compare("gpl") == 0) {
             if (! stream.readLine().contains("GIMP Palette")) {
                 #ifdef K_DEBUG
-                       tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.gpl) -> " << file;
+                    QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.gpl) -> " + file;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -89,7 +89,12 @@
             QString line = stream.readLine();
             if (!line.startsWith("Name:")) {
                 #ifdef K_DEBUG
-                       tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.gpl) -> " << file;
+                    QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.gpl) -> " + file;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -107,7 +112,12 @@
 
                    if (rgb.count() != 3) {
                        #ifdef K_DEBUG
-                              tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.gpl) -> " << line;
+                           QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.gpl) -> " + line;
+                           #ifdef Q_OS_WIN32
+                               qDebug() << msg;
+                           #else
+                               tError() << msg;
+                           #endif
                        #endif
                        return false;
                    }
@@ -125,7 +135,12 @@
                                 color.setBlue(item);
                         } else {
                             #ifdef K_DEBUG
-                                   tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.gpl) -> " << line;
+                                QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.gpl) -> " + line;
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
                             #endif
                             return false;
                         }
@@ -135,7 +150,12 @@
                        k->document->addColor(color);
                    } else {
                        #ifdef K_DEBUG
-                              tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid color format (.gpl) -> " << line;
+                           QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid color format (.gpl) -> " + line;
+                           #ifdef Q_OS_WIN32
+                               qDebug() << msg;
+                           #else
+                               tError() << msg;
+                           #endif
                        #endif
                        return false;
                    }
@@ -153,8 +173,13 @@
                                k->document->addColor(color);
                            } else {
                                #ifdef K_DEBUG
-                                      tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid color format (.txt) -> " << line;
-                               #endif
+                                   QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid color format (.txt) -> " + line;
+                                   #ifdef Q_OS_WIN32
+                                       qDebug() << msg;
+                                   #else
+                                       tError() << msg;
+                                   #endif
+                                #endif
                                return false;
                            }
                        }
@@ -166,7 +191,12 @@
                               int end = line.indexOf(")");
                               if (init == -1 || end == -1) {
                                   #ifdef K_DEBUG
-                                         tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.css) -> " << line;
+                                      QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.css) -> " + line;
+                                      #ifdef Q_OS_WIN32
+                                          qDebug() << msg;
+                                      #else
+                                          tError() << msg;
+                                      #endif
                                   #endif
                                   return false;
                               }
@@ -175,7 +205,12 @@
                               QStringList rgb = text.split(",");
                               if (rgb.count() != 3) {
                                   #ifdef K_DEBUG
-                                         tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.css) -> " << line;
+                                      QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.css) -> " + line;
+                                      #ifdef Q_OS_WIN32
+                                          qDebug() << msg;
+                                      #else
+                                          tError() << msg;
+                                      #endif
                                   #endif
                                   return false;
                               }
@@ -193,7 +228,12 @@
                                            color.setBlue(item);
                                    } else {
                                        #ifdef K_DEBUG
-                                              tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.css) -> " << line;
+                                           QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid palette format (.css) -> " + line;
+                                           #ifdef Q_OS_WIN32
+                                               qDebug() << msg;
+                                           #else
+                                               tError() << msg;
+                                           #endif
                                        #endif
                                        return false;
                                    }
@@ -203,14 +243,24 @@
                                   k->document->addColor(color);
                               } else {
                                   #ifdef K_DEBUG
-                                         tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid color format (.css) -> " << line;
+                                      QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid color format (.css) -> " + line;
+                                      #ifdef Q_OS_WIN32
+                                          qDebug() << msg;
+                                      #else
+                                          tError() << msg;
+                                      #endif
                                   #endif
                                   return false;
                               }
                        }
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid extension! -> " << extension;
+                    QString msg = "TupPaletteImporter::importGimpPalette() - Fatal Error: Invalid extension! -> " + extension;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -224,7 +274,12 @@
 {
     if (k->paletteName.isNull()) {
         #ifdef K_DEBUG
-               tError() << "TupPaletteImporter::saveFile() - Fatal Error: Palette name is null!";
+            QString msg = "TupPaletteImporter::saveFile() - Fatal Error: Palette name is null!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return false;
     }
@@ -238,7 +293,12 @@
         k->filePath = pathName;
     } else {
         #ifdef K_DEBUG
-               tError() << "TupPaletteImporter::saveFile() - Fatal Error: Insufficient permission to save palette file -> " << pathName;
+            QString msg = "TupPaletteImporter::saveFile() - Fatal Error: Insufficient permission to save palette file -> " + pathName;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return false;
     }
diff -Nru tupi-0.2+git04/src/components/import/tuppaletteimporter.h tupi-0.2+git05/src/components/import/tuppaletteimporter.h
--- tupi-0.2+git04/src/components/import/tuppaletteimporter.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/import/tuppaletteimporter.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,18 @@
 #ifndef TUPPALETTEIMPORTER_H
 #define TUPPALETTEIMPORTER_H
 
+#include "tglobal.h"
 #include "tuppalettedocument.h"
 
+#include <QFile>
+#include <QDir>
+#include <QTextStream>
+
 /**
  * @author David Cuadrado
 **/
 
-class TupPaletteImporter
+class TUPI_EXPORT TupPaletteImporter
 {
     public:
         enum PaletteType
diff -Nru tupi-0.2+git04/src/components/kinas/kinas.pro tupi-0.2+git05/src/components/kinas/kinas.pro
--- tupi-0.2+git04/src/components/kinas/kinas.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/kinas/kinas.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,8 +1,3 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/kinas
-# Target is a library:  
-
 INSTALLS += target
 target.path = /lib/
 
@@ -23,6 +18,13 @@
 TEMPLATE = lib
 TARGET = tupikinas
 
+INCLUDEPATH += ../../libbase
+INCLUDEPATH += ../../store
+INCLUDEPATH += ../../libtupi
+LIBS += -L../../libbase
+LIBS += -L../../store
+LIBS += -L../../libtupi
+
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
 include(../components_config.pri)
diff -Nru tupi-0.2+git04/src/components/kinas/kinaswidget.cpp tupi-0.2+git05/src/components/kinas/kinaswidget.cpp
--- tupi-0.2+git04/src/components/kinas/kinaswidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/kinas/kinaswidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "kinaswidget.h"
-#include "tdebug.h"
 
 KinasWidget::KinasWidget(QWidget *parent) : TupModuleWidgetBase(parent)
 {
diff -Nru tupi-0.2+git04/src/components/kinas/kinaswidget.h tupi-0.2+git05/src/components/kinas/kinaswidget.h
--- tupi-0.2+git04/src/components/kinas/kinaswidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/kinas/kinaswidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,6 +36,7 @@
 #ifndef KINASWIDGET_H
 #define KINASWIDGET_H
 
+#include "tglobal.h"
 #include "tupmodulewidgetbase.h"
 #include "tupseditor.h"
 #include "tupsfunctionview.h"
diff -Nru tupi-0.2+git04/src/components/kinas/tupsfunctionview.cpp tupi-0.2+git05/src/components/kinas/tupsfunctionview.cpp
--- tupi-0.2+git04/src/components/kinas/tupsfunctionview.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/kinas/tupsfunctionview.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -45,8 +45,8 @@
     setHeaderLabels(QStringList() << "Members");
     setRootIsDecorated (true);
 
-    header()->setResizeMode(QHeaderView::Stretch);
-    // header()->setSectionResizeMode(QHeaderView::Stretch);
+    // header()->setResizeMode(QHeaderView::Stretch);
+    header()->setSectionResizeMode(QHeaderView::Stretch);
 
     setEditTriggers(QAbstractItemView::AnyKeyPressed);
 
diff -Nru tupi-0.2+git04/src/components/library/library.pri tupi-0.2+git05/src/components/library/library.pri
--- tupi-0.2+git04/src/components/library/library.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/library.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$LIBRARY_DIR
-LIBS += -L$$LIBRARY_DIR -ltupilibrary
+
+unix {
+    LIBS += -L$$LIBRARY_DIR -ltupilibrary
+}
+
+win32 {
+    LIBS += -L$$LIBRARY_DIR/release/ -ltupilibrary
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$LIBRARY_DIR/libtupilibrary.so
diff -Nru tupi-0.2+git04/src/components/library/library.pro tupi-0.2+git05/src/components/library/library.pro
--- tupi-0.2+git04/src/components/library/library.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/library.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/library
-# Target is a library:  
+QT += opengl core gui svg xml network multimedia
 
 INSTALLS += target
 target.path = /lib/
@@ -14,14 +11,18 @@
            tupitemmanager.h  \
            tupsymboleditor.h \
            tuptreedelegate.h \
-           tupnewitemdialog.h
+           tupnewitemdialog.h \
+           tuplibrarydisplay.h \
+           tupsoundplayer.h
 
 SOURCES += tuplibrarywidget.cpp \
            tupitemmanager.cpp  \
            tupsymboleditor.cpp \
            tuptreedelegate.cpp \
-           tupnewitemdialog.cpp
-
+           tupnewitemdialog.cpp \
+           tuplibrarydisplay.cpp \
+           tupsoundplayer.cpp
+           
 *:!macx{
     CONFIG += dll warn_on
 }
@@ -31,4 +32,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/library/tupitemmanager.cpp tupi-0.2+git05/src/components/library/tupitemmanager.cpp
--- tupi-0.2+git04/src/components/library/tupitemmanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tupitemmanager.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,12 +34,6 @@
  ***************************************************************************/
 
 #include "tupitemmanager.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "tapplication.h"
-
-#include <QHeaderView>
-#include <QMenu>
 
 /**
  * This class provides some methods for the TupLibraryWidget.
@@ -52,7 +46,8 @@
     currentSelection = "";
     setHeaderLabels(QStringList() << "" << "");
 
-    header()->setResizeMode(QHeaderView::ResizeToContents);
+    header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+
     setItemDelegate(new TupTreeDelegate(this));
     setColumnCount(3);
 
@@ -81,7 +76,6 @@
     newFolder->setText(1, folderName);
     newFolder->setText(2, "");
 
-    // SQA: Check if this instruction is really necessary
     newFolder->setFlags(newFolder->flags() | Qt::ItemIsEditable);
 
     foldersTotal++;
@@ -198,8 +192,12 @@
 {
     if (event->buttons() == Qt::LeftButton) {
         QTreeWidgetItem *item = currentItem();
-        if (item)
-            emit itemRequired();
+        if (item) {
+            if (isFolder(item)) 
+                emit itemRenamed(item);    
+            else
+                emit itemRequired();
+        }
     }
 }
 
@@ -227,137 +225,154 @@
         emit itemSelected(item);
 
         if (event->buttons() == Qt::RightButton) {
-
             QMenu *menu = new QMenu(tr("Options"));
 
-            if (item->text(2).compare("SVG")==0) {
-                QAction *edit = new QAction(tr("Edit with Inkscape"), this);
-                connect(edit, SIGNAL(triggered()), this, SLOT(callInkscapeToEdit()));
-#ifdef Q_OS_UNIX
-                if (!QFile::exists("/usr/bin/inkscape"))
-                    edit->setDisabled(true);
-#else
-                edit->setDisabled(true);
-#endif
-                menu->addAction(edit);
-            } else if (item->text(2).compare("OBJ")!=0) {
-                QAction *gimpEdit = new QAction(tr("Edit with Gimp"), this);
-                connect(gimpEdit, SIGNAL(triggered()), this, SLOT(callGimpToEdit()));
-#ifdef Q_OS_UNIX
-                if (!QFile::exists("/usr/bin/gimp"))
-                    gimpEdit->setDisabled(true);
-#else
-                gimpEdit->setDisabled(true);
-#endif
-                menu->addAction(gimpEdit);
-
-                QAction *kritaEdit = new QAction(tr("Edit with Krita"), this);
-                connect(kritaEdit, SIGNAL(triggered()), this, SLOT(callKritaToEdit()));
-#ifdef Q_OS_UNIX
-                if (!QFile::exists("/usr/bin/krita"))
-                    kritaEdit->setDisabled(true);
-#else
-                kritaEdit->setDisabled(true);
-#endif
-                menu->addAction(kritaEdit);
-
-                QAction *myPaintEdit = new QAction(tr("Edit with MyPaint"), this);
-                connect(myPaintEdit, SIGNAL(triggered()), this, SLOT(callMyPaintToEdit()));
-#ifdef Q_OS_UNIX
-                if (!QFile::exists("/usr/bin/mypaint"))
-                    myPaintEdit->setDisabled(true);
-#else
-                myPaintEdit->setDisabled(true);
-#endif
-                menu->addAction(myPaintEdit);
-            }
-
-            QAction *clone = new QAction(tr("Clone"), this);
-            connect(clone, SIGNAL(triggered()), this, SLOT(cloneItem()));
+            if (isFolder(item)) {
+                QAction *rename = new QAction(tr("Rename"), this);
+                connect(rename, SIGNAL(triggered()), this, SLOT(renameItem()));
+
+                QAction *remove = new QAction(tr("Delete"), this);
+                connect(remove, SIGNAL(triggered()), this, SIGNAL(itemRemoved()));
+
+                menu->addAction(rename);
+                menu->addAction(remove);
+            } else {
+                QString extension = item->text(2);
+                bool isSound = false;
+                if ((extension.compare("OGG") == 0) || (extension.compare("MP3") == 0) || (extension.compare("WAV") == 0))
+                    isSound = true; 
+
+                if (extension.compare("SVG") == 0) {
+                    QAction *edit = new QAction(tr("Edit with Inkscape"), this);
+                    connect(edit, SIGNAL(triggered()), this, SLOT(callInkscapeToEdit()));
+                    #ifdef Q_OS_UNIX
+                        if (!QFile::exists("/usr/bin/inkscape"))
+                            edit->setDisabled(true);
+                    #else
+                        edit->setDisabled(true);
+                    #endif
+                    menu->addAction(edit);
+                } else if ((extension.compare("OBJ") != 0) && !isSound) {
+                           QAction *gimpEdit = new QAction(tr("Edit with Gimp"), this);
+                           connect(gimpEdit, SIGNAL(triggered()), this, SLOT(callGimpToEdit()));
+                           #ifdef Q_OS_UNIX
+                               if (!QFile::exists("/usr/bin/gimp"))
+                                   gimpEdit->setDisabled(true);
+                           #else
+                               gimpEdit->setDisabled(true);
+                           #endif
+                           menu->addAction(gimpEdit);
+
+                           QAction *kritaEdit = new QAction(tr("Edit with Krita"), this);
+                           connect(kritaEdit, SIGNAL(triggered()), this, SLOT(callKritaToEdit()));
+                           #ifdef Q_OS_UNIX
+                               if (!QFile::exists("/usr/bin/krita"))
+                                   kritaEdit->setDisabled(true);
+                           #else
+                                   kritaEdit->setDisabled(true);
+                           #endif
+                           menu->addAction(kritaEdit);
+
+                           QAction *myPaintEdit = new QAction(tr("Edit with MyPaint"), this);
+                           connect(myPaintEdit, SIGNAL(triggered()), this, SLOT(callMyPaintToEdit()));
+                           #ifdef Q_OS_UNIX
+                               if (!QFile::exists("/usr/bin/mypaint"))
+                                   myPaintEdit->setDisabled(true);
+                           #else
+                               myPaintEdit->setDisabled(true);
+                           #endif
+                           menu->addAction(myPaintEdit);
+                }
 
-            QAction *exportObject = new QAction(tr("Export"), this);
-            connect(exportObject, SIGNAL(triggered()), this, SLOT(exportItem()));
+                if (!isSound) {
+                    QAction *clone = new QAction(tr("Clone"), this);
+                    connect(clone, SIGNAL(triggered()), this, SLOT(cloneItem()));
+                    menu->addAction(clone);
+                }
 
-            QAction *rename = new QAction(tr("Rename"), this);
-            connect(rename, SIGNAL(triggered()), this, SLOT(renameItem()));
+                QAction *exportObject = new QAction(tr("Export"), this);
+                connect(exportObject, SIGNAL(triggered()), this, SLOT(exportItem()));
 
-            QAction *remove = new QAction(tr("Delete"), this);
-            connect(remove, SIGNAL(triggered()), this, SIGNAL(itemRemoved()));
+                QAction *rename = new QAction(tr("Rename"), this);
+                connect(rename, SIGNAL(triggered()), this, SLOT(renameItem()));
 
-            menu->addAction(clone);
-            menu->addAction(exportObject);
-            menu->addAction(rename);
-            menu->addAction(remove);
-            menu->addSeparator();
+                QAction *remove = new QAction(tr("Delete"), this);
+                connect(remove, SIGNAL(triggered()), this, SIGNAL(itemRemoved()));
 
-#ifdef Q_OS_UNIX
-            if (QFile::exists("/usr/bin/gimp") || QFile::exists("/usr/bin/krita") || QFile::exists("/usr/bin/mypaint")) {
-                QAction *raster = new QAction(tr("Create new raster item"), this);
-                connect(raster, SIGNAL(triggered()), this, SLOT(createNewRaster()));
-                menu->addAction(raster);
+                menu->addAction(exportObject);
+                menu->addAction(rename);
+                menu->addAction(remove);
+                menu->addSeparator();
+
+                #ifdef Q_OS_UNIX
+                    if (!isSound) {
+                        if (QFile::exists("/usr/bin/gimp") || QFile::exists("/usr/bin/krita") || QFile::exists("/usr/bin/mypaint")) {
+                            QAction *raster = new QAction(tr("Create new raster item"), this);
+                            connect(raster, SIGNAL(triggered()), this, SLOT(createNewRaster()));
+                            menu->addAction(raster);
+                        }
+
+                        if (QFile::exists("/usr/bin/inkscape")) {
+                            QAction *svg = new QAction(tr("Create new svg item"), this);
+                            connect(svg, SIGNAL(triggered()), this, SLOT(createNewSVG()));
+                            menu->addAction(svg);
+                        }
+                    }
+                #endif
             }
-#endif
 
-#ifdef Q_OS_UNIX
-            if (QFile::exists("/usr/bin/inkscape")) {
-                QAction *svg = new QAction(tr("Create new svg item"), this);
-                connect(svg, SIGNAL(triggered()), this, SLOT(createNewSVG()));
-                menu->addAction(svg);
-            }
-#endif
             menu->exec(event->globalPos());
-
         } else if (event->buttons() == Qt::LeftButton) {
+                   // SQA: This code doesn't work well at all. Reengineering is urgently required right here!
+                   // If the node has a parent, get the parent's name
+                   QTreeWidgetItem *top = item->parent(); 
+                   if (top)
+                       parentNode = top->text(1);
+
+                   // For directories, get the children
+                   nodeChildren.clear();
+                   if (item->text(2).length()==0 && item->childCount() > 0) {
+                       for (int i=0;i<item->childCount();i++) {
+                            QTreeWidgetItem *node = item->child(i);
+                            nodeChildren << node;
+                       }
+                   } 
+
+                   QPixmap pixmap = item->icon(0).pixmap(15, 15);
+
+                   QByteArray itemData;
+                   QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+                   dataStream << pixmap << item->text(1) << item->text(2) << item->text(3);
+
+                   QMimeData *mimeData = new QMimeData;
+                   mimeData->setData("application/x-dnditemdata", itemData);
+
+                   QDrag *drag = new QDrag(this);
+                   drag->setMimeData(mimeData);
+                   drag->setPixmap(pixmap);
 
-            // If the node has a parent, get the parent's name
-            QTreeWidgetItem *top = item->parent(); 
-            if (top)
-                parentNode = top->text(1);
-
-            // For directories, get the children
-            nodeChildren.clear();
-            if (item->text(2).length()==0 && item->childCount() > 0) {
-                for (int i=0;i<item->childCount();i++) {
-                     QTreeWidgetItem *node = item->child(i);
-                     nodeChildren << node;
-                }
-            } 
-
-            QPixmap pixmap = item->icon(0).pixmap(15, 15);
-
-            QByteArray itemData;
-            QDataStream dataStream(&itemData, QIODevice::WriteOnly);
-            dataStream << pixmap << item->text(1) << item->text(2) << item->text(3);
-
-            QMimeData *mimeData = new QMimeData;
-            mimeData->setData("application/x-dnditemdata", itemData);
-
-            QDrag *drag = new QDrag(this);
-            drag->setMimeData(mimeData);
-            drag->setPixmap(pixmap);
-
-            if (drag->start(Qt::MoveAction) == Qt::MoveAction)
-                delete takeTopLevelItem(indexOfTopLevelItem(item));
+                   if (drag->start(Qt::MoveAction) == Qt::MoveAction)
+                       delete takeTopLevelItem(indexOfTopLevelItem(item));
         }
     } else {
+        if (event->buttons() == Qt::RightButton) {
             QMenu *menu = new QMenu(tr("Options"));
 
-#ifdef Q_OS_UNIX
+            #ifdef Q_OS_UNIX
             if (QFile::exists("/usr/bin/gimp") || QFile::exists("/usr/bin/krita") || QFile::exists("/usr/bin/mypaint")) {
                 QAction *raster = new QAction(tr("Create new raster item"), this);
                 connect(raster, SIGNAL(triggered()), this, SLOT(createNewRaster()));
                 menu->addAction(raster);
             }
-#endif
-
-#ifdef Q_OS_UNIX
             if (QFile::exists("/usr/bin/inkscape")) {
                 QAction *svg = new QAction(tr("Create new svg item"), this);
                 connect(svg, SIGNAL(triggered()), this, SLOT(createNewSVG()));
                 menu->addAction(svg);
             }
-#endif
+            #endif
+
             menu->exec(event->globalPos());
+        }
     }
 }
 
diff -Nru tupi-0.2+git04/src/components/library/tupitemmanager.h tupi-0.2+git05/src/components/library/tupitemmanager.h
--- tupi-0.2+git04/src/components/library/tupitemmanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tupitemmanager.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,17 +36,22 @@
 #ifndef TUPITEMMANAGER_H
 #define TUPITEMMANAGER_H
 
+#include "tglobal.h"
 #include "tuptreedelegate.h"
 #include "treelistwidget.h"
 #include "tapplicationproperties.h"
 
 #include <QKeyEvent>
+#include <QHeaderView>
+#include <QMenu>
+#include <QMimeData>
+#include <QDrag>
 
 /**
  * @author David Cuadrado
 */
 
-class TupItemManager : public TreeListWidget
+class TUPI_EXPORT TupItemManager : public TreeListWidget
 {
     Q_OBJECT
 
@@ -113,7 +118,7 @@
         QString parentNode;
         QString currentSelection;
         QList<QTreeWidgetItem *> nodeChildren;
-        typedef QList<QTreeWidgetItem *> Lists;
+        // typedef QList<QTreeWidgetItem *> Lists;
         // QHash<int, Lists> deepChildren;
 };
 
diff -Nru tupi-0.2+git04/src/components/library/tuplibrarydisplay.cpp tupi-0.2+git05/src/components/library/tuplibrarydisplay.cpp
--- tupi-0.2+git04/src/components/library/tuplibrarydisplay.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tuplibrarydisplay.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,96 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tuplibrarydisplay.h"
+
+struct TupLibraryDisplay::Private
+{
+    TupItemPreview *previewPanel;
+    TupSoundPlayer *soundPlayer;
+};
+
+TupLibraryDisplay::TupLibraryDisplay() : QWidget(), k(new Private)
+{
+    k->previewPanel = new TupItemPreview(this);
+    k->soundPlayer = new TupSoundPlayer(this);
+
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    layout->addWidget(k->previewPanel);
+    layout->addWidget(k->soundPlayer);
+    layout->setContentsMargins(0, 0, 0, 0);
+ 
+    showDisplay();
+}
+
+TupLibraryDisplay::~TupLibraryDisplay()
+{
+    delete k;
+}
+
+QSize TupLibraryDisplay::sizeHint() const
+{
+    return QWidget::sizeHint().expandedTo(QSize(100, 100));
+}
+
+void TupLibraryDisplay::reset()
+{
+    k->previewPanel->reset();
+}
+
+void TupLibraryDisplay::render(QGraphicsItem *item)
+{
+    k->previewPanel->render(item);
+}
+
+void TupLibraryDisplay::showDisplay()
+{
+    if (!k->previewPanel->isVisible()) {
+        k->previewPanel->show();
+        k->soundPlayer->hide();
+    }
+}
+
+void TupLibraryDisplay::setSoundObject(const QString &path)
+{
+    k->soundPlayer->setSoundObject(path);
+}
+
+void TupLibraryDisplay::showSoundPlayer()
+{
+    if (!k->soundPlayer->isVisible()) {
+        k->previewPanel->hide();
+        k->soundPlayer->show();
+    }
+}
diff -Nru tupi-0.2+git04/src/components/library/tuplibrarydisplay.h tupi-0.2+git05/src/components/library/tuplibrarydisplay.h
--- tupi-0.2+git04/src/components/library/tuplibrarydisplay.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tuplibrarydisplay.h	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,71 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TUPLIBRARYDISPLAY_H
+#define TUPLIBRARYDISPLAY_H
+
+#include "tglobal.h"
+#include "tupitempreview.h"
+#include "tupsoundplayer.h"
+
+#include <QWidget>
+#include <QBoxLayout>
+#include <QGraphicsItem>
+
+/**
+ * @author Gustav Gonzalez
+**/
+
+class TUPI_EXPORT TupLibraryDisplay : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        TupLibraryDisplay();
+        ~TupLibraryDisplay();
+
+        QSize sizeHint() const;
+        void reset();
+        void render(QGraphicsItem *item);
+        void showDisplay();
+        void showSoundPlayer();
+        void setSoundObject(const QString &path);
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/components/library/tuplibrarywidget.cpp tupi-0.2+git05/src/components/library/tuplibrarywidget.cpp
--- tupi-0.2+git04/src/components/library/tuplibrarywidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tuplibrarywidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,41 +34,6 @@
  ***************************************************************************/
 
 #include "tuplibrarywidget.h"
-#include "tglobal.h"
-#include "tapplication.h"
-#include "toptionaldialog.h"
-#include "tconfig.h"
-#include "tuplibrary.h"
-#include "tupproject.h"
-#include "tupsymboleditor.h"
-#include "tuprequestbuilder.h"
-#include "tosd.h"
-#include "talgorithm.h"
-// #include "taudioplayer.h"
-#include "tdebug.h"
-
-#include <QApplication>
-#include <QGroupBox>
-#include <QFileDialog>
-#include <QGraphicsItem>
-#include <QLabel>
-#include <QMenu>
-#include <QMessageBox>
-#include <QProgressDialog>
-#include <QDesktopWidget>
-#include <QBuffer>
-#include <QGraphicsSvgItem>
-#include <QSvgRenderer>
-#include <QSvgGenerator>
-#include <QComboBox>
-#include <QTreeWidgetItemIterator>
-#include <QProcess>
-#include <QFileSystemWatcher>
-#include <QChar>
-#include <QPainter>
-
-#include <cstdlib>
-#include <ctime>
 
 #define RETURN_IF_NOT_LIBRARY if (!k->library) return;
 
@@ -89,7 +54,7 @@
 
     TupLibrary *library;
     TupProject *project;
-    TupItemPreview *display;
+    TupLibraryDisplay *display;
     TupItemManager *libraryTree;
     int childCount;
     QDir libraryDir;
@@ -102,6 +67,7 @@
     QTreeWidgetItem *lastItemEdited;
     QTreeWidgetItem *currentItemDisplayed;
     QFileSystemWatcher *watcher;
+    QList<QString> editorItems;
 
     struct Frame
     {
@@ -114,7 +80,11 @@
 TupLibraryWidget::TupLibraryWidget(QWidget *parent) : TupModuleWidgetBase(parent), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupLibraryWidget()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     k->childCount = 0;
@@ -125,14 +95,14 @@
     setWindowTitle(tr("Library"));
 
     k->libraryDir = QDir(CONFIG_DIR + "libraries");
-    k->display = new TupItemPreview(this);
+    k->display = new TupLibraryDisplay();
     k->libraryTree = new TupItemManager(this);
 
     connect(k->libraryTree, SIGNAL(itemSelected(QTreeWidgetItem *)), this,
                                    SLOT(previewItem(QTreeWidgetItem *)));
 
     connect(k->libraryTree, SIGNAL(itemRemoved()), this,
-                                   SLOT(removeCurrentGraphic()));
+                                   SLOT(removeCurrentItem()));
 
     connect(k->libraryTree, SIGNAL(itemCloned(QTreeWidgetItem*)), this,
                                    SLOT(cloneObject(QTreeWidgetItem*)));
@@ -146,6 +116,9 @@
     connect(k->libraryTree, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this,
                                    SLOT(refreshItem(QTreeWidgetItem*)));
 
+    connect(k->libraryTree, SIGNAL(editorClosed()), this,
+                                   SLOT(updateItemEditionState()));
+
     connect(k->libraryTree, SIGNAL(itemMoved(QString, QString)), this,
                                    SLOT(updateLibrary(QString, QString)));
 
@@ -190,13 +163,15 @@
     k->itemType->addItem(QIcon(THEME_DIR + "icons/svg.png"), tr("Svg File"));
     k->itemType->addItem(QIcon(THEME_DIR + "icons/bitmap_array.png"), tr("Image Array"));
     k->itemType->addItem(QIcon(THEME_DIR + "icons/svg_array.png"), tr("Svg Array"));
+    k->itemType->addItem(QIcon(THEME_DIR + "icons/sound_object.png"), tr("Sound File"));
+
     comboLayout->addWidget(k->itemType);
 
-    connect(k->itemType, SIGNAL(currentIndexChanged(int)), this, SLOT(importGraphicObject()));
+    connect(k->itemType, SIGNAL(currentIndexChanged(int)), this, SLOT(importLibraryObject()));
 
     TImageButton *addGC = new TImageButton(QPixmap(THEME_DIR + "icons/plus_sign.png"), 22, buttons);
     addGC->setToolTip(tr("Add an object to library"));
-    connect(addGC, SIGNAL(clicked()), this, SLOT(importGraphicObject()));
+    connect(addGC, SIGNAL(clicked()), this, SLOT(importLibraryObject()));
     comboLayout->addWidget(addGC);
 
     buttonLayout->addLayout(comboLayout);
@@ -227,8 +202,13 @@
 TupLibraryWidget::~TupLibraryWidget()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupLibraryWidget()]";
+        #else
+            TEND;
+        #endif
     #endif
+
     delete k;
 }
 
@@ -256,6 +236,16 @@
     k->mkdir = true;
 }
 
+void TupLibraryWidget::updateItemEditionState()
+{
+    if (k->editorItems.count() == 2) {
+        TupProjectRequest request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::Remove, k->editorItems.at(0), TupLibraryObject::Folder); 
+        emit requestTriggered(&request);
+    }
+
+    k->editorItems.clear();
+}
+
 void TupLibraryWidget::activeRefresh(QTreeWidgetItem *item)
 {
     k->mkdir = true;
@@ -265,16 +255,20 @@
 void TupLibraryWidget::previewItem(QTreeWidgetItem *item)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupLibraryWidget::previewItem()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     RETURN_IF_NOT_LIBRARY;
 
     if (item) {
-
         k->currentItemDisplayed = item;
 
         if (item->text(2).length() == 0) {
+            k->display->showDisplay();
             QGraphicsTextItem *msg = new QGraphicsTextItem(tr("Directory"));
             k->display->render(static_cast<QGraphicsItem *>(msg));
             return;
@@ -284,10 +278,17 @@
 
         if (!object) {
             #ifdef K_DEBUG
-                   tError() << "TupLibraryWidget::previewItem() - Fatal Error: Cannot find the object: " << item->text(1) + "." + item->text(2).toLower();
+                QString msg = "TupLibraryWidget::previewItem() - Fatal Error: Cannot find the object: " + item->text(1) + "." + item->text(2).toLower();
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
-            QGraphicsTextItem *msg = new QGraphicsTextItem(tr("No preview available"));
-            k->display->render(static_cast<QGraphicsItem *>(msg));
+
+            k->display->showDisplay();
+            QGraphicsTextItem *text = new QGraphicsTextItem(tr("No preview available"));
+            k->display->render(static_cast<QGraphicsItem *>(text));
 
             return;
         }
@@ -295,15 +296,16 @@
         switch (object->type()) {
                 case TupLibraryObject::Svg:
                    {
+                     k->display->showDisplay();
                      QGraphicsSvgItem *svg = new QGraphicsSvgItem(object->dataPath()); 
-                     k->display->render(static_cast<QGraphicsItem *>(svg)); 
+                     k->display->render(static_cast<QGraphicsItem *>(svg));
                    }
                    break;
                 case TupLibraryObject::Image:
                 case TupLibraryObject::Item:
                    {
                      if (object->data().canConvert<QGraphicsItem *>()) {
-
+                         k->display->showDisplay();
                          k->display->render(qvariant_cast<QGraphicsItem *>(object->data()));
 
                          /* SQA: Just a test
@@ -316,19 +318,19 @@
                    break;
                 case TupLibraryObject::Sound:
                    {
-                     /*
-                     TAudioPlayer::instance()->setCurrentPlayer(k->currentPlayerId);
-                     TAudioPlayer::instance()->stop();
-
-                     k->currentPlayerId = TAudioPlayer::instance()->load(object->dataPath());
-                     TAudioPlayer::instance()->play(0);
-                     */
+                     k->display->setSoundObject(object->dataPath());
+                     k->display->showSoundPlayer();
                    }
                    break;
                 default:
                    {
                      #ifdef K_DEBUG
-                            tDebug("library") << "Unknown symbol id: " << object->type();
+                         QString msg = "TupLibraryWidget::previewItem() - Unknown symbol id: " + QString::number(object->type());
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError("library") << msg;
+                         #endif
                      #endif
                    }
                    break;
@@ -342,54 +344,107 @@
 void TupLibraryWidget::insertObjectInWorkspace()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupLibraryWidget::insertObjectInWorkspace()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
+    if (k->libraryTree->topLevelItemCount() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Library is empty!"), TOsd::Error);
+        #ifdef K_DEBUG
+            QString msg = "TupLibraryWidget::insertObjectInWorkspace() - Library is empty!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return;
+    }
+
     if (!k->libraryTree->currentItem()) { 
+        TOsd::self()->display(tr("Error"), tr("There's no current selection!"), TOsd::Error);
         #ifdef K_DEBUG
-               tFatal() << "TupLibraryWidget::insertObjectInWorkspace() - There's no current selection!";
+            QString msg = "TupLibraryWidget::insertObjectInWorkspace() - There's no current selection!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return;
+    } 
+
+    QString extension = k->libraryTree->currentItem()->text(2);
+    if (extension.length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("It's a directory! Please, pick a graphic object"), TOsd::Error);
+        #ifdef K_DEBUG
+            QString msg = "TupLibraryWidget::insertObjectInWorkspace() - It's a directory!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
         return;
-    } else if (k->libraryTree->currentItem()->text(2).length() == 0) {
-               #ifdef K_DEBUG
-                      tFatal() << "TupLibraryWidget::insertObjectInWorkspace() - It's a directory!";
-               #endif
-               return;
     }
 
-    QString objectKey = k->libraryTree->currentItem()->text(1) + "." + k->libraryTree->currentItem()->text(2).toLower();
+    if ((extension.compare("OGG") == 0) || (extension.compare("WAV") == 0) || (extension.compare("MP3") == 0)) {
+        TOsd::self()->display(tr("Error"), tr("It's a sound file! Please, pick a graphic object"), TOsd::Error);
+        #ifdef K_DEBUG
+            QString msg = "TupLibraryWidget::insertObjectInWorkspace() - It's a sound file!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
+        #endif
+        return;
+    } 
 
-    TupProjectRequest request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::InsertSymbolIntoFrame, objectKey,
+    QString key = k->libraryTree->currentItem()->text(1) + "." + extension.toLower();
+
+    TupProjectRequest request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::InsertSymbolIntoFrame, key,
                                 TupLibraryObject::Type(k->libraryTree->currentItem()->data(1, 3216).toInt()), k->project->spaceContext(), 
                                 0, QString(), k->currentFrame.scene, k->currentFrame.layer, k->currentFrame.frame);
 
     emit requestTriggered(&request);
 }
 
-void TupLibraryWidget::removeCurrentGraphic()
+void TupLibraryWidget::removeCurrentItem()
 {
     if (!k->libraryTree->currentItem()) 
         return;
 
     QString extension = k->libraryTree->currentItem()->text(2);
-
     QString objectKey = k->libraryTree->currentItem()->text(1);
     TupLibraryObject::Type type = TupLibraryObject::Folder;
 
     // If it's NOT a directory
     if (extension.length() > 0) {
         objectKey = k->libraryTree->currentItem()->text(3);
-        if (extension.compare("JPG")==0 || extension.compare("PNG")==0 || extension.compare("GIF")==0)
+        if (extension.compare("JPEG") == 0 || extension.compare("JPG") == 0 || extension.compare("PNG") == 0 || extension.compare("GIF") == 0)
             type = TupLibraryObject::Image;
         if (extension.compare("SVG")==0)
             type = TupLibraryObject::Svg;
         if (extension.compare("OBJ")==0)
             type = TupLibraryObject::Item;
+        if ((extension.compare("OGG") == 0) || (extension.compare("WAV") == 0) || (extension.compare("MP3") == 0))
+            type = TupLibraryObject::Sound;
     } 
 
+    /*
     TupProjectRequest request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::RemoveSymbolFromFrame, 
                                                    objectKey, type, k->project->spaceContext(), 0, QString(),
                                                    k->currentFrame.scene, k->currentFrame.layer, k->currentFrame.frame);
+    */
+
+    TupProjectRequest request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::Remove,
+                                                   objectKey, type, k->project->spaceContext(), 0, QString(),
+                                                   k->currentFrame.scene, k->currentFrame.layer, k->currentFrame.frame);
+
     emit requestTriggered(&request);
 }
 
@@ -426,7 +481,12 @@
 
             if (!isOk) {
                 #ifdef K_DEBUG
-                       tError() << "TupLibraryWidget::cloneObject() - Fatal Error: Object file couldn't be cloned!";
+                    QString msg = "TupLibraryWidget::cloneObject() - Fatal Error: Object file couldn't be cloned!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return;
             }
@@ -439,7 +499,12 @@
 
             if (!isOk) {
                 #ifdef K_DEBUG
-                       tError() << "TupLibraryWidget::cloneObject() - Fatal Error: Object file couldn't be loaded!";
+                    QString msg = "TupLibraryWidget::cloneObject() - Fatal Error: Object file couldn't be loaded!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return;
             } 
@@ -477,6 +542,7 @@
                     case TupLibraryObject::Sound:
                          {
                              item->setIcon(0, QIcon(THEME_DIR + "icons/sound_object.png"));
+                             previewItem(item);
                          }
                          break;
                     default:
@@ -487,8 +553,14 @@
 
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupLibraryWidget::cloneObject() - Fatal Error: Object doesn't exist! [ " << id << " ]";
+                QString msg = "TupLibraryWidget::cloneObject() - Fatal Error: Object doesn't exist! [ " + id + " ]";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
+
             return;
         }
     }
@@ -502,18 +574,29 @@
         QString path = object->dataPath();
         if (path.length() > 0) {
             QString fileExtension = object->extension();
-            QString filter = tr("Images") + " ";
+            QString filter;
 
-            if (fileExtension.compare("PNG") == 0)
-                filter += "(*.png)"; 
-            if ((fileExtension.compare("JPG") == 0) || (fileExtension.compare("JPEG") == 0))
-                filter += "(*.jpg *.jpeg)";
-            if (fileExtension.compare("GIF") == 0)
-                filter += "(*.gif)";
-            if (fileExtension.compare("XPM") == 0)
-                filter += "(*.xpm)";
-            if (fileExtension.compare("SVG") == 0)
-                filter += "(*.svg)";
+            if (object->type() == TupLibraryObject::Image) {
+                filter = tr("Images") + " ";
+                if (fileExtension.compare("PNG") == 0)
+                    filter += "(*.png)"; 
+                if ((fileExtension.compare("JPG") == 0) || (fileExtension.compare("JPEG") == 0))
+                    filter += "(*.jpg *.jpeg)";
+                if (fileExtension.compare("GIF") == 0)
+                    filter += "(*.gif)";
+                if (fileExtension.compare("XPM") == 0)
+                    filter += "(*.xpm)";
+                if (fileExtension.compare("SVG") == 0)
+                    filter += "(*.svg)";
+            } else if (object->type() == TupLibraryObject::Sound) {
+                      filter = tr("Sounds") + " ";
+                      if (fileExtension.compare("OGG") == 0)
+                          filter += "(*.ogg)";
+                      if (fileExtension.compare("MP3") == 0)
+                          filter += "(*.mp3)";
+                      if (fileExtension.compare("WAV") == 0)
+                          filter += "(*.wav)";
+            }
 
             QString target = QFileDialog::getSaveFileName(this, tr("Export object..."), QDir::homePath(), filter);
             if (target.isEmpty())
@@ -522,7 +605,12 @@
             if (QFile::exists(target)) {
                 if (!QFile::remove(target)) {
                     #ifdef K_DEBUG
-                           tError() << "TupLibraryWidget::exportObject() - Fatal Error: destination path already exists! [ " << id << " ]";
+                        QString msg = "TupLibraryWidget::exportObject() - Fatal Error: destination path already exists! [ " + id + " ]";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return;
                 }
@@ -530,7 +618,12 @@
 
             if (!QFile::copy(path, target)) {
                 #ifdef K_DEBUG
-                       tError() << "TupLibraryWidget::exportObject() - Error: Object file couldn't be exported! [ " << id << " ]";
+                    QString msg = "TupLibraryWidget::exportObject() - Error: Object file couldn't be exported! [ " + id + " ]";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return;
             } else {
@@ -538,13 +631,23 @@
             }
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupLibraryWidget::exportObject() - Error: Object path is null! [ " << id << " ]";
+                QString msg = "TupLibraryWidget::exportObject() - Error: Object path is null! [ " + id + " ]";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
             return;
         }
     } else {
         #ifdef K_DEBUG
-               tError() << "TupLibraryWidget::exportObject() - Error: Object doesn't exist! [ " << id << " ]";
+            QString msg = "TupLibraryWidget::exportObject() - Error: Object doesn't exist! [ " + id + " ]";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return;
     }
@@ -591,7 +694,12 @@
             QDir dir;
             if (!dir.mkpath(imagesDir)) {
                 #ifdef K_DEBUG
-                       tError() << "TupLibraryWidget::createRasterObject() - Fatal Error: Couldn't create directory " << imagesDir;
+                    QString msg = "TupLibraryWidget::createRasterObject() - Fatal Error: Couldn't create directory " + imagesDir;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 TOsd::self()->display(tr("Error"), tr("Couldn't create images directory!"), TOsd::Error);
                 return;
@@ -640,13 +748,23 @@
                 executeSoftware(editor, path);
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupLibraryWidget::createRasterObject() - Fatal Error: Object file couldn't be loaded from -> " << path;
+                    QString msg = "TupLibraryWidget::createRasterObject() - Fatal Error: Object file couldn't be loaded from -> " + path;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return;
             }
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupLibraryWidget::createRasterObject() - Fatal Error: Object file couldn't be saved at -> " << path;
+                QString msg = "TupLibraryWidget::createRasterObject() - Fatal Error: Object file couldn't be saved at -> " + path;
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
             return;
         }
@@ -684,8 +802,14 @@
             QDir dir;
             if (!dir.mkpath(vectorDir)) {
                 #ifdef K_DEBUG
-                       tError() << "TupLibraryWidget::createVectorObject() - Fatal Error: Couldn't create directory " << vectorDir;
+                    QString msg = "TupLibraryWidget::createVectorObject() - Fatal Error: Couldn't create directory " + vectorDir;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
+
                 TOsd::self()->display(tr("Error"), tr("Couldn't create vector directory!"), TOsd::Error);
                 return;
             }
@@ -733,13 +857,23 @@
                 executeSoftware(editor, path);
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupLibraryWidget::createVectorObject() - Fatal Error: Object file couldn't be loaded from -> " << path;
+                    QString msg = "TupLibraryWidget::createVectorObject() - Fatal Error: Object file couldn't be loaded from -> " + path;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return;
             }
         } else {
                 #ifdef K_DEBUG
-                       tError() << "TupLibraryWidget::createVectorObject() - Fatal Error: Object file couldn't be saved at -> " << path;
+                    QString msg = "TupLibraryWidget::createVectorObject() - Fatal Error: Object file couldn't be saved at -> " + path;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return;
         }
@@ -776,9 +910,15 @@
         int projectHeight = k->project->dimension().height();
 
         #ifdef K_DEBUG
+            #ifdef Q_OS_WIN32
+               qDebug() << "TupLibraryWidget::importBitmap() - Image filename: " << key << " | Raw Size: " << data.size();
+               qDebug() << "TupLibraryWidget::importBitmap() - Image Size: " << "[" << picWidth << ", " << picHeight << "]"
+                        << " | Project Size: " << "[" << projectWidth << ", " << projectHeight << "]";
+            #else
                tFatal() << "TupLibraryWidget::importBitmap() - Image filename: " << key << " | Raw Size: " << data.size();
-               tFatal() << "TupLibraryWidget::importBitmap() - Image Size: " << "[" << picWidth << ", " << picHeight << "]" 
+               tFatal() << "TupLibraryWidget::importBitmap() - Image Size: " << "[" << picWidth << ", " << picHeight << "]"
                         << " | Project Size: " << "[" << projectWidth << ", " << projectHeight << "]";
+            #endif
         #endif
 
         if (picWidth > projectWidth || picHeight > projectHeight) {
@@ -799,7 +939,8 @@
             if (answer == QMessageBox::Yes) {
                 pixmap = new QPixmap();
                 QString extension = fileInfo.suffix().toUpper();
-                QByteArray ba = extension.toAscii();
+                // QByteArray ba = extension.toAscii();
+                QByteArray ba = extension.toLatin1();
                 const char* ext = ba.data();
                 if (pixmap->loadFromData(data, ext)) {
                     QPixmap newpix;
@@ -857,12 +998,21 @@
         file.close();
 
         #ifdef K_DEBUG
-               tFatal() << "TupLibraryWidget::importSvg() - Inserting SVG into project: " << k->project->projectName();
-               int projectWidth = k->project->dimension().width();
-               int projectHeight = k->project->dimension().height();
-               tFatal() << "TupLibraryWidget::importSvg() - Project Size: " << "[" << projectWidth << ", " << projectHeight << "]";
+            QString msg1 = "TupLibraryWidget::importSvg() - Inserting SVG into project: " + k->project->projectName();
+            int projectWidth = k->project->dimension().width();
+            int projectHeight = k->project->dimension().height();
+            QString msg2 = "TupLibraryWidget::importSvg() - Project Size: [" + QString::number(projectWidth) + QString(", ") + QString::number(projectHeight) + QString("]"); 
+
+            #ifdef Q_OS_WIN32
+                qDebug() << msg1;
+                qDebug() << msg2;
+            #else
+                tFatal() << msg1;
+                tFatal() << msg2;
+            #endif
         #endif
 
+
         int i = 0;
         int index = key.lastIndexOf(".");
         QString name = key.mid(0, index);
@@ -900,14 +1050,13 @@
     for (int i = 0; i < size; ++i) {
          if (photograms.at(i).isFile()) {
              QString extension = photograms.at(i).suffix().toUpper();
-             if (extension.compare("JPG")==0 || extension.compare("PNG")==0 || extension.compare("GIF")==0 || 
+             if (extension.compare("JPEG")==0 || extension.compare("JPG")==0 || extension.compare("PNG")==0 || extension.compare("GIF")==0 || 
                  extension.compare("XPM")==0)
                  imagesCounter++;
          }
     }
 
     if (imagesCounter > 0) {
-
         QString text = tr("Image files found: %1.").arg(imagesCounter);
         bool resize = false;
 
@@ -965,7 +1114,7 @@
             for (int i = 0; i < size; ++i) {
                  if (photograms.at(i).isFile()) {
                      QString extension = photograms.at(i).suffix().toUpper();
-                     if (extension.compare("JPG")==0 || extension.compare("PNG")==0 || extension.compare("GIF")==0 ||
+                     if (extension.compare("JPEG")==0 || extension.compare("JPG")==0 || extension.compare("PNG")==0 || extension.compare("GIF")==0 ||
                          extension.compare("XPM")==0) {
                          QString path = photograms.at(i).absoluteFilePath(); 
                          QString symName = photograms.at(i).fileName().toLower();
@@ -980,7 +1129,8 @@
                              if (resize) {
                                  pixmap = new QPixmap();
                                  QString extension = fileInfo.suffix().toUpper();
-                                 QByteArray ba = extension.toAscii();
+                                 // QByteArray ba = extension.toAscii();
+                                 QByteArray ba = extension.toLatin1();
                                  const char* ext = ba.data();
                                  if (pixmap->loadFromData(data, ext)) {
                                      int width = projectWidth;
@@ -996,7 +1146,6 @@
                              emit requestTriggered(&request);
 
                              if (i < photograms.size()-1 && imagesCounter > 1) {
-
                                  TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->currentFrame.scene, k->currentFrame.layer, 
                                                                               k->currentFrame.frame + 1, TupProjectRequest::Add, tr("Frame %1").arg(k->currentFrame.frame + 2));
                                  emit requestTriggered(&request);
@@ -1051,7 +1200,6 @@
     }
 
     if (svgCounter > 0) {
-
         QString testFile = photograms.at(0).absoluteFilePath();
         QFile file(testFile);
         file.close();
@@ -1072,7 +1220,6 @@
         int answer = msgBox.exec();
 
         if (answer == QMessageBox::Ok) {
-
             QString directory = source.dirName();
             k->libraryTree->createFolder(directory);
 
@@ -1104,7 +1251,6 @@
                          QFile f(path);
 
                          if (f.open(QIODevice::ReadOnly)) {
-
                              QByteArray data = f.readAll();
                              f.close();
 
@@ -1146,25 +1292,25 @@
 
 void TupLibraryWidget::importSound()
 {
-    QString sound = QFileDialog::getOpenFileName(this, tr("Import audio file..."), QDir::homePath(),
+    QString path = QFileDialog::getOpenFileName(this, tr("Import audio file..."), QDir::homePath(),
                                                  tr("Sound file") + " (*.ogg *.wav *.mp3)");
 
-    if (sound.isEmpty()) 
+    if (path.isEmpty()) 
         return;
 
-    QFile f(sound);
-    QFileInfo fileInfo(f);
-    QString symName = fileInfo.baseName();
+    QFile file(path);
+    QFileInfo fileInfo(file);
+    QString key = fileInfo.fileName().toLower();
 
-    if (f.open(QIODevice::ReadOnly)) {
-        QByteArray data = f.readAll();
-        f.close();
+    if (file.open(QIODevice::ReadOnly)) {
+        QByteArray data = file.readAll();
+        file.close();
 
-        TupProjectRequest request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::Add, symName,
+        TupProjectRequest request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::Add, key,
                                                      TupLibraryObject::Sound, k->project->spaceContext(), data);
         emit requestTriggered(&request);
     } else {
-        TOsd::self()->display(tr("Error"), tr("Cannot open file: %1").arg(sound), TOsd::Error);
+        TOsd::self()->display(tr("Error"), tr("Error while opening file: %1").arg(path), TOsd::Error);
     }
 }
 
@@ -1229,7 +1375,9 @@
                                  item->setIcon(0, QIcon(THEME_DIR + "icons/bitmap.png"));
                                  k->libraryTree->setCurrentItem(item);
                                  previewItem(item);
-                                 if (!k->isNetworked && k->project->spaceContext() != TupProject::NONE && !k->library->loadingProject())
+                                 // if (!k->isNetworked && k->project->spaceContext() != TupProject::NONE && !k->library->loadingProject())
+                               
+                                 if (!k->isNetworked && !folderName.endsWith(".pgo") && !k->library->loadingProject())
                                      insertObjectInWorkspace();
                                }
                             break;
@@ -1238,7 +1386,8 @@
                                  item->setIcon(0, QIcon(THEME_DIR + "icons/svg.png"));
                                  k->libraryTree->setCurrentItem(item);
                                  previewItem(item);
-                                 if (!k->isNetworked && k->project->spaceContext() != TupProject::NONE && !k->library->loadingProject())
+                                 // if (!k->isNetworked && k->project->spaceContext() != TupProject::NONE && !k->library->loadingProject())
+                                 if (!k->isNetworked && !k->library->loadingProject())
                                      insertObjectInWorkspace();
                                }
                             break;
@@ -1255,7 +1404,12 @@
 
                  } else {
                      #ifdef K_DEBUG
-                            tFatal() << "TupLibraryWidget::libraryResponse() - No object found: " << id;
+                         QString msg = "TupLibraryWidget::libraryResponse() - No object found: " + id;
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tFatal() << msg;
+                         #endif
                      #endif
                  }
               }
@@ -1263,12 +1417,27 @@
             case TupProjectRequest::InsertSymbolIntoFrame:
               {
                  #ifdef K_DEBUG
-                        tFatal() << "*** TupLibraryWidget::libraryResponse() -> InsertSymbolIntoFrame : No action taken";
+                     QString msg = "TupLibraryWidget::libraryResponse() -> InsertSymbolIntoFrame : No action taken";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tFatal() << msg;
+                     #endif
                  #endif
               }
             break;
             case TupProjectRequest::RemoveSymbolFromFrame:
               {
+                 #ifdef K_DEBUG
+                     QString msg = "TupLibraryWidget::libraryResponse() -> RemoveSymbolFromFrame : No action taken";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tFatal() << msg;
+                     #endif
+                 #endif
+
+                 /*
                  QString id = response->arg().toString();
 
                  QTreeWidgetItemIterator it(k->libraryTree);
@@ -1277,7 +1446,6 @@
                         if ((*it)->text(2).length() > 0) {
                             if (id == (*it)->text(3)) {
                                 delete (*it);
-                                // k->library->removeObject(id, true);
                                 break;
                             } 
                         } else {
@@ -1292,19 +1460,49 @@
                  }
 
                  previewItem(k->libraryTree->currentItem());
+                 */
               }
             break;
             case TupProjectRequest::Remove:
               {
-                 #ifdef K_DEBUG
-                        tFatal() << "*** TupLibraryWidget::libraryResponse() -> Remove : No action taken";
-                 #endif
+                 QString id = response->arg().toString();
+
+                 QTreeWidgetItemIterator it(k->libraryTree);
+                 while ((*it)) {
+                        // If target is not a folder
+                        if ((*it)->text(2).length() > 0) {
+                            if (id == (*it)->text(3)) {
+                                delete (*it);
+                                break;
+                            }
+                        } else {
+                            // If target is a folder
+                            if (id == (*it)->text(1)) {
+                                delete (*it);
+                                k->library->removeFolder(id);
+                                break;
+                            }
+                        }
+                        ++it;
+                 }
+
+                 if (k->libraryTree->topLevelItemCount() > 0) {
+                     previewItem(k->libraryTree->currentItem());
+                 } else  {
+                     k->display->showDisplay();
+                     k->display->reset();
+                 }
               }
             break;
             default:
               {
                  #ifdef K_DEBUG
-                        tFatal() << "*** TupLibraryWidget::libraryResponse() - Unknown/Unhandled project action: " << response->action();
+                     QString msg = "TupLibraryWidget::libraryResponse() - Unknown/Unhandled project action: " + QString::number(response->action());
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tFatal() << msg;
+                     #endif
                  #endif
               }
             break;
@@ -1320,7 +1518,7 @@
     }
 }
 
-void TupLibraryWidget::importGraphicObject()
+void TupLibraryWidget::importLibraryObject()
 {
     QString option = k->itemType->currentText();
 
@@ -1343,6 +1541,11 @@
         importSvgArray();
         return;
     }
+
+    if (option.compare(tr("Sound File")) == 0) {
+        importSound();
+        return;
+    }
 }
 
 void TupLibraryWidget::refreshItem(QTreeWidgetItem *item)
@@ -1368,12 +1571,15 @@
         }
 
         item->setText(1, tag);
+
         TupLibraryFolder *folder = new TupLibraryFolder(tag, k->project);
         k->library->addFolder(folder);
 
         QGraphicsTextItem *msg = new QGraphicsTextItem(tr("Directory"));
         k->display->render(static_cast<QGraphicsItem *>(msg));
 
+        k->editorItems << tag;
+
         return;
     }
 
@@ -1484,12 +1690,22 @@
             executeSoftware(software, path);
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupLibraryWidget::callExternalEditor() - Fatal Error: No object related to the current library item -" << id << "- was found!";
+                QString msg = "TupLibraryWidget::callExternalEditor() - Fatal Error: No object related to the current library item -" + id + "- was found!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
         }
     } else {
         #ifdef K_DEBUG
-               tError() << "TupLibraryWidget::callExternalEditor() - Error: Current library item is invalid!";
+            QString msg = "TupLibraryWidget::callExternalEditor() - Error: Current library item is invalid!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -1509,7 +1725,12 @@
         k->watcher->addPath(path);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupLibraryWidget::executeSoftware() - Fatal Error: Item path either doesn't exist or is empty";
+            QString msg = "TupLibraryWidget::executeSoftware() - Fatal Error: Item path either doesn't exist or is empty";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -1525,7 +1746,12 @@
                updateItem(object->smallId(), object->extension().toLower(), object);
            } else {
                #ifdef K_DEBUG
-                      tError() << "TupLibraryWidget::updateItemFromSaveAction() - Fatal Error: The library item modified was not found!";
+                   QString msg = "TupLibraryWidget::updateItemFromSaveAction() - Fatal Error: The library item modified was not found!";
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
                #endif
            }
     }
@@ -1657,7 +1883,12 @@
                 } else {
                     name = TAlgorithm::randomString(8);
                     #ifdef K_DEBUG
-                           tWarning() << "TupLibraryWidget::verifyNameAvailability() - Warning: error while processing item name!";
+                        QString msg = "TupLibraryWidget::verifyNameAvailability() - Warning: error while processing item name!";
+                        #ifdef Q_OS_WIN32
+                            qWarning() << msg;
+                        #else
+                            tWarning() << msg;
+                        #endif
                     #endif
                 }
             } else {
@@ -1674,7 +1905,12 @@
                     } else {
                         name = TAlgorithm::randomString(8);
                         #ifdef K_DEBUG
-                               tWarning() << "TupLibraryWidget::verifyNameAvailability() - Warning: error while processing item name!";
+                            QString msg = "TupLibraryWidget::verifyNameAvailability() - Warning: error while processing item name!";
+                            #ifdef Q_OS_WIN32
+                                qWarning() << msg;
+                            #else
+                                tWarning() << msg;
+                            #endif
                         #endif
                     }
                 }
diff -Nru tupi-0.2+git04/src/components/library/tuplibrarywidget.h tupi-0.2+git05/src/components/library/tuplibrarywidget.h
--- tupi-0.2+git04/src/components/library/tuplibrarywidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tuplibrarywidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,27 +36,59 @@
 #ifndef TUPLIBRARYWIDGET_H
 #define TUPLIBRARYWIDGET_H
 
+#include "tglobal.h"
 #include "tupmodulewidgetbase.h"
-#include "tupitempreview.h"
+#include "tuplibrarydisplay.h"
 #include "timagebutton.h"
 #include "tupitemmanager.h"
 #include "tupnewitemdialog.h"
 #include "tuplibraryobject.h"
+#include "tapplication.h"
+#include "toptionaldialog.h"
+#include "tconfig.h"
+#include "tuplibrary.h"
+#include "tupproject.h"
+#include "tupsymboleditor.h"
+#include "tuprequestbuilder.h"
+#include "tosd.h"
+#include "talgorithm.h"
 
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include <QMap>
 #include <QDir>
 #include <QMouseEvent>
+#include <QApplication>
+#include <QGroupBox>
+#include <QFileDialog>
+#include <QGraphicsItem>
+#include <QLabel>
+#include <QMenu>
+#include <QMessageBox>
+#include <QProgressDialog>
+#include <QDesktopWidget>
+#include <QBuffer>
+#include <QGraphicsSvgItem>
+#include <QSvgRenderer>
+#include <QSvgGenerator>
+#include <QComboBox>
+#include <QTreeWidgetItemIterator>
+#include <QProcess>
+#include <QFileSystemWatcher>
+#include <QChar>
+#include <QPainter>
 
-class TupLibrary;
+#include <cstdlib>
+#include <ctime>
+
+// class TupLibrary;
 typedef QMap<QString, TupLibraryObject *> LibraryObjects;
 
 /**
  * @author David Cuadrado
 */
 
-class TupLibraryWidget : public TupModuleWidgetBase
+class TUPI_EXPORT TupLibraryWidget : public TupModuleWidgetBase
 {
     Q_OBJECT
 
@@ -75,13 +107,13 @@
     private slots:
         void previewItem(QTreeWidgetItem *item);
         void insertObjectInWorkspace();
-        void removeCurrentGraphic();
+        void removeCurrentItem();
         void cloneObject(QTreeWidgetItem *item);
         void exportObject(QTreeWidgetItem *item);
         void createRasterObject();
         void createVectorObject();
         void renameObject(QTreeWidgetItem *item);
-        void importGraphicObject();
+        void importLibraryObject();
         void refreshItem(QTreeWidgetItem *item);
         void updateLibrary(QString node, QString target);
         void activeRefresh(QTreeWidgetItem *item);
@@ -90,6 +122,7 @@
         void openKritaToEdit(QTreeWidgetItem *item);
         void openMyPaintToEdit(QTreeWidgetItem *item);
         void updateItemFromSaveAction();
+        void updateItemEditionState();
 
     public slots:
         void addFolder(const QString &folderName = QString());
diff -Nru tupi-0.2+git04/src/components/library/tupnewitemdialog.cpp tupi-0.2+git05/src/components/library/tupnewitemdialog.cpp
--- tupi-0.2+git04/src/components/library/tupnewitemdialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tupnewitemdialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,16 +34,6 @@
  ***************************************************************************/
 
 #include "tupnewitemdialog.h"
-#include "talgorithm.h"
-#include "tapplicationproperties.h"
-#include "tdebug.h"
-
-#include <QFormLayout>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QDialogButtonBox>
-#include <QFile>
 
 struct TupNewItemDialog::Private
 {
diff -Nru tupi-0.2+git04/src/components/library/tupnewitemdialog.h tupi-0.2+git05/src/components/library/tupnewitemdialog.h
--- tupi-0.2+git04/src/components/library/tupnewitemdialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tupnewitemdialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,23 @@
 #ifndef TUPNEWITEMDIALOG_H
 #define TUPNEWITEMDIALOG_H
 
+#include "tglobal.h"
+#include "talgorithm.h"
+#include "tapplicationproperties.h"
+
 #include <QDialog>
+#include <QFormLayout>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QSpinBox>
+#include <QDialogButtonBox>
+#include <QFile>
 
 /**
  * @author Gustav Gonzalez
 **/
 
-class TupNewItemDialog : public QDialog
+class TUPI_EXPORT TupNewItemDialog : public QDialog
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/library/tupsoundplayer.cpp tupi-0.2+git05/src/components/library/tupsoundplayer.cpp
--- tupi-0.2+git04/src/components/library/tupsoundplayer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tupsoundplayer.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,179 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     *
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tupsoundplayer.h"
+
+struct TupSoundPlayer::Private
+{
+    QMediaPlayer *player;
+    QSlider *slider;
+    QLabel *timer;
+    TImageButton *playButton;
+    bool playing;
+    qint64 duration;
+    QTime soundTotalTime;
+    QString totalTime;
+};
+
+TupSoundPlayer::TupSoundPlayer(QWidget *parent) : QFrame(parent), k(new Private)
+{
+    setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
+    setMidLineWidth(2);
+    setLineWidth(1);
+
+    k->playing = false;
+    k->player = new QMediaPlayer;
+    connect(k->player, SIGNAL(positionChanged(qint64)), SLOT(positionChanged(qint64)));
+    connect(k->player, SIGNAL(durationChanged(qint64)), SLOT(durationChanged(qint64)));
+    connect(k->player, SIGNAL(stateChanged(QMediaPlayer::State)), SLOT(stateChanged(QMediaPlayer::State)));
+
+    k->timer = new QLabel("");
+    QBoxLayout *timerLayout = new QBoxLayout(QBoxLayout::LeftToRight);
+    timerLayout->addStretch();
+    timerLayout->addWidget(k->timer);
+    timerLayout->addStretch();
+    timerLayout->setContentsMargins(0, 0, 0, 0);
+
+    k->slider = new QSlider(Qt::Horizontal, this);
+    // k->slider->setRange(0, k->player->duration() / 1000);
+    connect(k->slider, SIGNAL(sliderMoved(int)), this, SLOT(updateSoundPos(int)));
+
+    QBoxLayout *sliderLayout = new QBoxLayout(QBoxLayout::LeftToRight);
+    sliderLayout->addWidget(k->slider);
+    sliderLayout->setContentsMargins(0, 0, 0, 0);
+
+    k->playButton = new TImageButton(QPixmap(THEME_DIR + "icons/play_small.png"), 33, this, true);
+    k->playButton->setToolTip(tr("Play"));
+    connect(k->playButton, SIGNAL(clicked()), this, SLOT(playFile()));
+
+    QBoxLayout *buttonLayout = new QBoxLayout(QBoxLayout::LeftToRight);
+    buttonLayout->addStretch();
+    buttonLayout->addWidget(k->playButton);
+    buttonLayout->addStretch();
+    buttonLayout->setContentsMargins(0, 0, 0, 0);
+
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    layout->addSpacing(5);
+    layout->addLayout(timerLayout);
+    layout->addLayout(sliderLayout);
+    layout->addLayout(buttonLayout);
+    layout->addSpacing(5);
+    layout->setContentsMargins(5, 5, 5, 5);
+}
+
+TupSoundPlayer::~TupSoundPlayer()
+{
+    delete k;
+}
+
+QSize TupSoundPlayer::sizeHint() const
+{
+    return QWidget::sizeHint().expandedTo(QSize(100, 100));
+}
+
+void TupSoundPlayer::setSoundObject(const QString &path)
+{
+    k->player->setMedia(QUrl::fromLocalFile(path)); 
+}
+
+void TupSoundPlayer::playFile()
+{
+    if (!k->playing) {
+        k->playButton->setIcon(QIcon(QPixmap(THEME_DIR + "icons/pause.png")));
+        k->playing = true;
+        k->player->setVolume(60);
+
+        QString initTime = "00:00";
+        if (k->duration > 3600)
+            initTime = "00:00:00";
+        initTime = initTime + " / " + k->totalTime;
+        k->timer->setText(initTime);
+
+        k->player->play();
+    } else {
+        k->playButton->setIcon(QIcon(QPixmap(THEME_DIR + "icons/play_small.png")));
+        k->playing = false;
+        k->player->pause();
+    }
+}
+
+void TupSoundPlayer::positionChanged(qint64 value)
+{
+    qint64 currentInfo = value / 1000;
+    k->slider->setValue(currentInfo);
+    QString time;
+
+    if (currentInfo || k->duration) {
+        QTime currentTime((currentInfo/3600)%60, (currentInfo/60)%60, currentInfo%60, (currentInfo*1000)%1000);
+        QString format = "mm:ss";
+        if (k->duration > 3600)
+            format = "hh:mm:ss";
+        time = currentTime.toString(format) + " / " + k->totalTime;
+    }
+
+    k->timer->setText(time);
+}
+
+void TupSoundPlayer::durationChanged(qint64 value)
+{
+    qDebug() << "TupSoundPlayer::durationChanged() - value: " << value;
+    k->duration = value/1000;
+    k->slider->setMinimum(0);
+    k->slider->setMaximum(k->duration);
+
+    k->soundTotalTime = QTime((k->duration/3600)%60, (k->duration/60)%60, k->duration%60, (k->duration*1000)%1000);
+    QString format = "mm:ss";
+    if (k->duration > 3600)
+        format = "hh:mm:ss";
+    k->totalTime = k->soundTotalTime.toString(format);
+}
+
+void TupSoundPlayer::stateChanged(QMediaPlayer::State state)
+{
+    if (state == QMediaPlayer::StoppedState) {
+        k->slider->setValue(0);
+        k->playButton->setIcon(QIcon(QPixmap(THEME_DIR + "icons/play_small.png")));
+        k->playing = false;
+        QString init = "00:00";
+        if (k->duration > 3600)
+            init = "00:00:00";
+        k->timer->setText(init + " / " + k->totalTime);
+    }
+}
+
+void TupSoundPlayer::updateSoundPos(int pos)
+{
+    k->player->setPosition(pos*1000);
+}
diff -Nru tupi-0.2+git04/src/components/library/tupsoundplayer.h tupi-0.2+git05/src/components/library/tupsoundplayer.h
--- tupi-0.2+git04/src/components/library/tupsoundplayer.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tupsoundplayer.h	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,80 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     *
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TUPSOUNDPLAYER_H
+#define TUPSOUNDPLAYER_H
+
+#include "tglobal.h"
+#include "timagebutton.h"
+#include "tapplicationproperties.h"
+
+#include <QFrame>
+#include <QBoxLayout>
+#include <QSlider>
+#include <QLabel>
+#include <QMediaPlayer>
+#include <QUrl>
+#include <QTime>
+
+/**
+ * @author Gustav Gonzalez
+**/
+
+class TUPI_EXPORT TupSoundPlayer : public QFrame
+{
+    Q_OBJECT
+
+    public:
+        TupSoundPlayer(QWidget *parent);
+        ~TupSoundPlayer();
+
+        QSize sizeHint() const;
+        void setSoundObject(const QString &path);
+
+    private slots:
+        void playFile();
+        void positionChanged(qint64 value);
+        void durationChanged(qint64 value);
+        void stateChanged(QMediaPlayer::State state);
+        void updateSoundPos(int pos);
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
+
+
diff -Nru tupi-0.2+git04/src/components/library/tupsymboleditor.cpp tupi-0.2+git05/src/components/library/tupsymboleditor.cpp
--- tupi-0.2+git04/src/components/library/tupsymboleditor.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tupsymboleditor.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,17 +34,6 @@
  ***************************************************************************/
 
 #include "tupsymboleditor.h"
-#include "tuplibraryobject.h"
-#include "tuppluginmanager.h"
-#include "tuptoolplugin.h"
-// Tupi Framework
-#include "taction.h"
-#include "tdebug.h"
-
-#include <QGraphicsView>
-#include <QGraphicsScene>
-#include <QToolBar>
-#include <QTimer>
 
 /**
  * This class defines the toolbar at the left side of the paint area.
@@ -52,7 +41,7 @@
  * @author David Cuadrado
 */
 
-class View : public QGraphicsView
+class TUPI_EXPORT View : public QGraphicsView
 {
     public:
         View();
@@ -135,7 +124,12 @@
             
              for (it = keys.begin(); it != keys.end(); ++it) {
                   #ifdef K_DEBUG
-                         tDebug("plugins") << "*** Tool Loaded: " << *it;
+                      QString msg = "TupSymbolEditor::loadTools() - *** Tool Loaded: " + *it;
+                      #ifdef Q_OS_WIN32
+                          qDebug() << msg;
+                      #else
+                          tDebug("plugins") << msg;
+                      #endif
                   #endif
             
                   TAction *act = tool->actions()[*it];
@@ -176,7 +170,11 @@
 void TupSymbolEditor::selectTool()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;                         
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupSymbolEditor::selectTool()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TAction *action = qobject_cast<TAction *>(sender());
diff -Nru tupi-0.2+git04/src/components/library/tupsymboleditor.h tupi-0.2+git05/src/components/library/tupsymboleditor.h
--- tupi-0.2+git04/src/components/library/tupsymboleditor.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tupsymboleditor.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,7 +36,17 @@
 #ifndef TUPSYMBOLEDITOR_H
 #define TUPSYMBOLEDITOR_H
 
+#include "tglobal.h"
+#include "tuplibraryobject.h"
+#include "tuppluginmanager.h"
+#include "tuptoolplugin.h"
+#include "taction.h"
+
 #include <QMainWindow>
+#include <QGraphicsView>
+#include <QGraphicsScene>
+#include <QToolBar>
+#include <QTimer>
 
 class TupLibraryObject;
 
@@ -44,7 +54,7 @@
  * @author David Cuadrado
 */
 
-class TupSymbolEditor : public QMainWindow
+class TUPI_EXPORT TupSymbolEditor : public QMainWindow
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/library/tuptreedelegate.cpp tupi-0.2+git05/src/components/library/tuptreedelegate.cpp
--- tupi-0.2+git04/src/components/library/tuptreedelegate.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tuptreedelegate.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,9 +34,6 @@
  ***************************************************************************/
 
 #include "tuptreedelegate.h"
-#include "tdebug.h"
-
-#include <QtGui>
 
 TupTreeDelegate::TupTreeDelegate(QObject *parent) : QItemDelegate(parent)
 {
diff -Nru tupi-0.2+git04/src/components/library/tuptreedelegate.h tupi-0.2+git05/src/components/library/tuptreedelegate.h
--- tupi-0.2+git04/src/components/library/tuptreedelegate.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/library/tuptreedelegate.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,10 +36,14 @@
 #ifndef TUPTREEDELEGATE_H
 #define TUPTREEDELEGATE_H
 
+#include "tglobal.h"
+
 #include <QItemDelegate>
 #include <QRegExp>
+#include <QtGui>
+#include <QLineEdit>
 
-class TupTreeDelegate : public QItemDelegate
+class TUPI_EXPORT TupTreeDelegate : public QItemDelegate
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/paintarea.pri tupi-0.2+git05/src/components/paintarea/paintarea.pri
--- tupi-0.2+git04/src/components/paintarea/paintarea.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/paintarea.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,6 +1,13 @@
-INCLUDEPATH += /usr/include/QtMobility /usr/include/QtMultimediaKit
+INCLUDEPATH += /usr/include/qt5/QtMultimedia /usr/include/qt5/QtMultimediaWidgets
 INCLUDEPATH += $$PAINTAREA_DIR 
-LIBS += -L$$PAINTAREA_DIR -ltupipaintarea -lQtMultimediaKit
+
+unix {
+    LIBS += -L$$PAINTAREA_DIR -ltupipaintarea
+}
+
+win32 {
+    LIBS += -L$$PAINTAREA_DIR/release/ -ltupipaintarea
+}
 
 linux-g++ {
 PRE_TARGETDEPS += $$PAINTAREA_DIR/libtupipaintarea.so
diff -Nru tupi-0.2+git04/src/components/paintarea/paintarea.pro tupi-0.2+git05/src/components/paintarea/paintarea.pro
--- tupi-0.2+git04/src/components/paintarea/paintarea.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/paintarea.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,12 +1,10 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/paintarea
-# Target is a library:  paintarea
+QT += opengl core gui svg xml network
+QT += multimedia multimediawidgets printsupport
 
 INSTALLS += target
 target.path = /lib/
 
-INCLUDEPATH += /usr/include/QtMobility /usr/include/QtMultimediaKit
+INCLUDEPATH += /usr/include/qt5/QtMultimedia /usr/include/qt5/QtMultimediaWidgets
 
 macx {
     CONFIG += staticlib warn_on
@@ -37,7 +35,9 @@
            tupbasiccamerainterface.h \
            tupcameradialog.h \
            tupcamerawindow.h \
-           tupvideosurface.h
+           tupvideosurface.h \
+           tuppapagayoimporter.h \
+           tuppapagayodialog.h
 
 SOURCES += tuppaintarea.cpp \
            tupconfigurationarea.cpp \
@@ -64,7 +64,9 @@
            tupbasiccamerainterface.cpp \
            tupcameradialog.cpp \
            tupcamerawindow.cpp \
-           tupvideosurface.cpp
+           tupvideosurface.cpp \
+           tuppapagayoimporter.cpp \
+           tuppapagayodialog.cpp
 
 *:!macx{
     CONFIG += dll warn_on
@@ -73,15 +75,51 @@
 TEMPLATE = lib
 TARGET = tupipaintarea
 
+SHELL_DIR = ../../shell/
+INCLUDEPATH += $$SHELL_DIR
+
 PLUGIN_DIR = ../../plugins/export/genericexportplugin
 INCLUDEPATH += $$PLUGIN_DIR
 
-SELECTION_DIR = ../../plugins/tools/selecttool
+SELECTION_DIR = ../../plugins/tools/selection
 INCLUDEPATH += $$SELECTION_DIR
 
-POLYLINE_DIR = ../../plugins/tools/polylinetool
+POLYLINE_DIR = ../../plugins/tools/polyline
 INCLUDEPATH += $$POLYLINE_DIR
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/paintarea/tupbasiccamerainterface.cpp tupi-0.2+git05/src/components/paintarea/tupbasiccamerainterface.cpp
--- tupi-0.2+git04/src/components/paintarea/tupbasiccamerainterface.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupbasiccamerainterface.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,18 +34,6 @@
  ***************************************************************************/
 
 #include "tupbasiccamerainterface.h"
-#include "tupapplication.h"
-#include "tapplicationproperties.h"
-#include "tseparator.h"
-#include "talgorithm.h"
-#include "tosd.h"
-#include "tdebug.h"
-
-#include <QBoxLayout>
-#include <QIcon>
-#include <QDir>
-#include <QDesktopWidget>
-#include <QPushButton>
 
 struct TupBasicCameraInterface::Private
 {
@@ -63,7 +51,11 @@
                                        const QSize cameraSize, int counter, QWidget *parent) : QFrame(parent), k(new Private)
 {
     #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupBasicCameraInterface()]";
+        #else
            TINIT;
+        #endif
     #endif
 
     setWindowTitle(tr("Tupi Camera Manager") + " | " + tr("Current resolution:") + " " + title);
@@ -150,9 +142,16 @@
         menuLayout->addWidget(devicesCombo);
     } 
 
+    QPushButton *exitButton = new QPushButton(QIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "exit.png")), "");
+    exitButton->setIconSize(QSize(20, 20));
+    exitButton->setToolTip(tr("Close manager"));
+    exitButton->setShortcut(Qt::Key_Escape);
+    connect(exitButton, SIGNAL(clicked()), this, SLOT(close()));
+
     devicesCombo->setCurrentIndex(cameraIndex);
     menuLayout->addWidget(new TSeparator(Qt::Horizontal));
     menuLayout->addWidget(clickButton);
+    menuLayout->addWidget(exitButton);
     menuLayout->addStretch(2);
 
     connect(devicesCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(changeCameraDevice(int)));
@@ -169,7 +168,11 @@
 TupBasicCameraInterface::~TupBasicCameraInterface()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupBasicCameraInterface()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
@@ -185,7 +188,12 @@
 
     if (! dir.rmdir(dir.absolutePath())) {
         #ifdef K_DEBUG
-               tError() << "TupBasicCameraInterface::closeEvent() - Fatal Error: Can't remove pictures directory -> " << dir.absolutePath();
+            QString msg = "TupBasicCameraInterface::closeEvent() - Fatal Error: Can't remove pictures directory -> " + dir.absolutePath();
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 
@@ -199,8 +207,14 @@
     QDir dir;
     if (!dir.mkdir(path)) {
         #ifdef K_DEBUG
-               tError() << "TupBasicCameraInterface::randomPath() - Fatal Error: Can't create pictures directory -> " << path;
+            QString msg = "TupBasicCameraInterface::randomPath() - Fatal Error: Can't create pictures directory -> " + path;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         path = "";
         TOsd::self()->display(tr("Error"), tr("Can't create pictures directory"), TOsd::Error);
     }
diff -Nru tupi-0.2+git04/src/components/paintarea/tupbasiccamerainterface.h tupi-0.2+git05/src/components/paintarea/tupbasiccamerainterface.h
--- tupi-0.2+git04/src/components/paintarea/tupbasiccamerainterface.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupbasiccamerainterface.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,26 @@
 #ifndef TUPBASICCAMERAINTERFACE_H
 #define TUPBASICCAMERAINTERFACE_H
 
+#include "tglobal.h"
+#include "tupapplication.h"
+#include "tapplicationproperties.h"
+#include "tseparator.h"
+#include "talgorithm.h"
+#include "tosd.h"
+
 #include <QFrame>
 #include <QCloseEvent>
 #include <QComboBox>
 #include <QCamera>
 #include <QCameraViewfinder>
 #include <QCameraImageCapture>
+#include <QBoxLayout>
+#include <QIcon>
+#include <QDir>
+#include <QDesktopWidget>
+#include <QPushButton>
 
-class TupBasicCameraInterface : public QFrame
+class TUPI_EXPORT TupBasicCameraInterface : public QFrame
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupbrushstatus.cpp tupi-0.2+git05/src/components/paintarea/tupbrushstatus.cpp
--- tupi-0.2+git04/src/components/paintarea/tupbrushstatus.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupbrushstatus.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,14 +34,6 @@
  ***************************************************************************/
 
 #include "tupbrushstatus.h"
-#include "tseparator.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QPen>
-#include <QBrush>
-#include <QColorDialog>
 
 TupBrushStatus::TupBrushStatus(const QString &label, const QPixmap &pix, bool bg)
 {
diff -Nru tupi-0.2+git04/src/components/paintarea/tupbrushstatus.h tupi-0.2+git05/src/components/paintarea/tupbrushstatus.h
--- tupi-0.2+git04/src/components/paintarea/tupbrushstatus.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupbrushstatus.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,16 +36,21 @@
 #ifndef TUPBRUSHSTATUS_H
 #define TUPBRUSHSTATUS_H
 
+#include "tglobal.h"
 #include "tupcolorwidget.h"
+#include "tseparator.h"
 
 #include <QPixmap>
 #include <QPen>
 #include <QBrush>
 #include <QColor>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QColorDialog>
 
 class TupColorWidget;
 
-class TupBrushStatus : public QWidget
+class TUPI_EXPORT TupBrushStatus : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcameradialog.cpp tupi-0.2+git05/src/components/paintarea/tupcameradialog.cpp
--- tupi-0.2+git04/src/components/paintarea/tupcameradialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcameradialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,19 +34,6 @@
  ***************************************************************************/
 
 #include "tupcameradialog.h"
-#include "tapplicationproperties.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QComboBox>
-#include <QBoxLayout>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QDir>
-
-#include <QCameraImageCapture>
 
 struct TupCameraDialog::Private
 {
@@ -148,8 +135,20 @@
     k->deviceIndex = k->devicesCombo->currentIndex();
     setCamera(k->cameraReference);
 
-    QCameraImageCapture *imageCapture = new QCameraImageCapture(k->camera);
-    k->resolutions = imageCapture->supportedResolutions();
+    // QCameraImageCapture *imageCapture = new QCameraImageCapture(k->camera);
+    // k->resolutions = imageCapture->supportedResolutions();
+
+    k->resolutions.clear();
+    k->resolutions << QSize(1280, 1024);
+    k->resolutions << QSize(1280, 960);
+    k->resolutions << QSize(1224, 768);
+    k->resolutions << QSize(800, 600);
+    k->resolutions << QSize(640, 480);
+    k->resolutions << QSize(352, 288);
+    k->resolutions << QSize(320, 240);
+    k->resolutions << QSize(176, 144);
+    k->resolutions << QSize(160, 120);
+	
     k->resolutionCombo->clear();
 
     for (int i=0; i<k->resolutions.size(); i++) {
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcameradialog.h tupi-0.2+git05/src/components/paintarea/tupcameradialog.h
--- tupi-0.2+git04/src/components/paintarea/tupcameradialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcameradialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,11 +36,22 @@
 #ifndef TUPCAMERADIALOG_H
 #define TUPCAMERADIALOG_H
 
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+#include "tconfig.h"
+
 #include <QDialog>
 #include <QComboBox>
+#include <QLabel>
+#include <QComboBox>
+#include <QBoxLayout>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QDir>
 #include <QCamera>
+#include <QCameraImageCapture>
 
-class TupCameraDialog : public QDialog
+class TUPI_EXPORT TupCameraDialog : public QDialog
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcamerainterface.cpp tupi-0.2+git05/src/components/paintarea/tupcamerainterface.cpp
--- tupi-0.2+git04/src/components/paintarea/tupcamerainterface.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcamerainterface.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,22 +34,6 @@
  ***************************************************************************/
 
 #include "tupcamerainterface.h"
-#include "tupcamerawindow.h"
-#include "tupapplication.h"
-#include "tapplicationproperties.h"
-#include "tseparator.h"
-#include "talgorithm.h"
-#include "tosd.h"
-#include "tupcolorwidget.h"
-#include "tdebug.h"
-
-#include <QBoxLayout>
-#include <QIcon>
-#include <QDir>
-#include <QDesktopWidget>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
 
 struct TupCameraInterface::Private
 {
@@ -69,7 +53,11 @@
                                        const QSize cameraSize, int counter, QWidget *parent) : QFrame(parent), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCameraInterface()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     setWindowTitle(tr("Tupi Camera Manager") + " | " + tr("Current resolution:") + " " + title);
@@ -113,7 +101,12 @@
              QByteArray device = cameraDevices.at(i);
              QCamera *camera = new QCamera(device); 
              QCameraImageCapture *imageCapture = new QCameraImageCapture(camera);
-             QSize camSize = setBestResolution(imageCapture->supportedResolutions(), cameraSize);
+
+             // QSize camSize = setBestResolution(imageCapture->supportedResolutions(), cameraSize);
+
+             QList<QSize> resolutions;
+             resolutions << QSize(640, 480);
+             QSize camSize = setBestResolution(resolutions, cameraSize);
 
              TupCameraWindow *cameraWindow = new TupCameraWindow(camera, camSize, displaySize, imageCapture, path);
              connect(cameraWindow, SIGNAL(pictureHasBeenSelected(int, const QString)), this, SIGNAL(pictureHasBeenSelected(int, const QString)));
@@ -233,6 +226,12 @@
         menuLayout->addWidget(devicesCombo);
     } 
 
+    QPushButton *exitButton = new QPushButton(QIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "exit.png")), "");
+    exitButton->setIconSize(QSize(20, 20));
+    exitButton->setToolTip(tr("Close manager"));
+    exitButton->setShortcut(Qt::Key_Escape);
+    connect(exitButton, SIGNAL(clicked()), this, SLOT(close()));
+
     devicesCombo->setCurrentIndex(cameraIndex);
     menuLayout->addWidget(new TSeparator(Qt::Horizontal));
     menuLayout->addWidget(clickButton);
@@ -241,6 +240,7 @@
     menuLayout->addWidget(k->gridWidget);
     menuLayout->addWidget(k->historyButton);
     menuLayout->addWidget(k->historyWidget);
+    menuLayout->addWidget(exitButton);
     menuLayout->addStretch(2);
 
     connect(devicesCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(changeCameraDevice(int)));
@@ -255,7 +255,11 @@
 TupCameraInterface::~TupCameraInterface()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupCameraInterface()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
@@ -286,8 +290,14 @@
     QDir dir;
     if (!dir.mkdir(path)) {
         #ifdef K_DEBUG
-               tError() << "TupCameraInterface::randomPath() - Fatal Error: Can't create pictures directory -> " << path;
+            QString msg = "TupCameraInterface::randomPath() - Fatal Error: Can't create pictures directory -> " + path;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         path = "";
         TOsd::self()->display(tr("Error"), tr("Can't create pictures directory"), TOsd::Error);
     }
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcamerainterface.h tupi-0.2+git05/src/components/paintarea/tupcamerainterface.h
--- tupi-0.2+git04/src/components/paintarea/tupcamerainterface.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcamerainterface.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,30 @@
 #ifndef TUPCAMERAINTERFACE_H
 #define TUPCAMERAINTERFACE_H
 
+#include "tglobal.h"
+#include "tupcamerawindow.h"
+#include "tupapplication.h"
+#include "tapplicationproperties.h"
+#include "tseparator.h"
+#include "talgorithm.h"
+#include "tosd.h"
+#include "tupcolorwidget.h"
+
 #include <QFrame>
 #include <QCloseEvent>
 #include <QComboBox>
+#include <QBoxLayout>
+#include <QIcon>
+#include <QDir>
+#include <QDesktopWidget>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QDoubleSpinBox>
+#include <QColorDialog>
 #include <QCamera>
 #include <QCameraImageCapture>
 
-class TupCameraInterface : public QFrame
+class TUPI_EXPORT TupCameraInterface : public QFrame
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcamerawindow.cpp tupi-0.2+git05/src/components/paintarea/tupcamerawindow.cpp
--- tupi-0.2+git04/src/components/paintarea/tupcamerawindow.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcamerawindow.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
 #include "tupcamerawindow.h"
-#include "tdebug.h"
-
-#include <QVideoEncoderControl>
 
 struct TupCameraWindow::Private
 {
@@ -28,10 +25,10 @@
 
     QMediaService *service = k->camera->service();
 
-    QVideoEncoderControl *encoderControl = service->requestControl<QVideoEncoderControl*>();
-    QVideoEncoderSettings settings = encoderControl->videoSettings();
-    settings.setResolution(camSize);
-    encoderControl->setVideoSettings(settings);
+    // QVideoEncoderControl *encoderControl = service->requestControl<QVideoEncoderControl*>();
+    // QVideoEncoderSettings settings = encoderControl->videoSettings();
+    // settings.setResolution(camSize);
+    // encoderControl->setVideoSettings(settings);
 
     QVideoRendererControl *rendererControl = service->requestControl<QVideoRendererControl*>();
 
@@ -70,8 +67,13 @@
 
     if (! dir.rmdir(dir.absolutePath())) {
         #ifdef K_DEBUG
-               tError() << "TupCameraInterface::closeEvent() - Fatal Error: Can't remove pictures directory -> " << dir.absolutePath();
-        #endif
+            QString msg = "TupCameraInterface::closeEvent() - Fatal Error: Can't remove pictures directory -> " + dir.absolutePath();
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif 
     }
 
     if (k->videoSurface)
@@ -90,22 +92,22 @@
             }
             case QCamera::CameraError:
             {
-                QMessageBox::warning(this, "TupCameraWindow", "General Camera error");
+                QMessageBox::warning(this, "TupCameraWindow", tr("General Camera error"));
                 break;
             }
             case QCamera::InvalidRequestError:
             {
-                QMessageBox::warning(this, "TupCameraWindow", "Camera invalid request error");
+                QMessageBox::warning(this, "TupCameraWindow", tr("Camera invalid request error"));
                 break;
             }
             case QCamera::ServiceMissingError:
             {
-                QMessageBox::warning(this, "TupCameraWindow", "Camera service missing error");
+                QMessageBox::warning(this, "TupCameraWindow", tr("Camera service missing error"));
                 break;
             }
             case QCamera::NotSupportedFeatureError :
             {
-                QMessageBox::warning(this, "TupCameraWindow", "Camera not supported error");
+                QMessageBox::warning(this, "TupCameraWindow", tr("Camera not supported error"));
                 break;
             }
     };
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcamerawindow.h tupi-0.2+git05/src/components/paintarea/tupcamerawindow.h
--- tupi-0.2+git04/src/components/paintarea/tupcamerawindow.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcamerawindow.h	2014-12-15 14:21:32.000000000 +0000
@@ -1,13 +1,16 @@
 #ifndef TUPCAMERAWINDOW_H
 #define TUPCAMERAWINDOW_H
 
+#include "tglobal.h"
 #include "tupvideosurface.h"
 
 #include <QtGui>
+#include <QWidget>
+#include <QMessageBox>
 #include <QCamera>
 #include <QCameraImageCapture>
 
-class TupCameraWindow: public QWidget, public VideoIF
+class TUPI_EXPORT TupCameraWindow: public QWidget, public VideoIF
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcanvas.cpp tupi-0.2+git05/src/components/paintarea/tupcanvas.cpp
--- tupi-0.2+git04/src/components/paintarea/tupcanvas.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcanvas.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,33 +34,6 @@
  ***************************************************************************/
 
 #include "tupcanvas.h"
-#include "tupapplication.h"
-#include "tapplicationproperties.h"
-#include "tuptoolplugin.h"
-#include "timagebutton.h"
-#include "tdebug.h"
-#include "tuppendialog.h"
-#include "tuponionopacitydialog.h"
-#include "tupexposuredialog.h"
-#include "tuptoolsdialog.h"
-#include "tupinfowidget.h"
-
-#include <QDialog>
-#include <QHBoxLayout>
-#include <QBoxLayout>
-#include <QFrame>
-#include <QIcon>
-#include <QGraphicsView>
-#include <QColorDialog>
-#include <QToolBar>
-#include <QAction>
-#include <QSlider>
-#include <QLabel>
-#include <QFont>
-#include <QDesktopWidget>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QBuffer>
 
 struct TupCanvas::Private
 {
@@ -84,11 +57,15 @@
 };
 
 TupCanvas::TupCanvas(QWidget *parent, Qt::WindowFlags flags, TupGraphicsScene *scene, 
-                   const QPointF centerPoint, const QSize &screenSize, TupProject *project, double scaleFactor,
+                   const QPointF centerPoint, const QSize &screenSize, TupProject *project, qreal scaleFactor,
                    int angle, TupBrushManager *brushManager, bool isNetworked, const QStringList &onLineUsers) : QFrame(parent, flags), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCanvas()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     setWindowTitle(tr("Tupi: Open 2D Magic"));
@@ -152,9 +129,9 @@
     zoomOut->setToolTip(tr("Zoom Out"));
     connect(zoomOut, SIGNAL(clicked()), this, SLOT(wakeUpZoomOut()));
 
-    TImageButton *hand = new TImageButton(QPixmap(THEME_DIR + "icons/hand_big.png"), 60, this, true);
-    hand->setToolTip(tr("Hand"));
-    connect(hand, SIGNAL(clicked()), this, SLOT(wakeUpHand()));
+    TImageButton *shift = new TImageButton(QPixmap(THEME_DIR + "icons/hand_big.png"), 60, this, true);
+    shift->setToolTip(tr("Shift"));
+    connect(shift, SIGNAL(clicked()), this, SLOT(wakeUpShift()));
 
     TImageButton *penProperties = new TImageButton(QPixmap(THEME_DIR + "icons/color_palette_big.png"), 60, this, true);
     penProperties->setToolTip(tr("Pen Properties"));
@@ -177,7 +154,7 @@
     controls->addWidget(trash);
     controls->addWidget(zoomIn);
     controls->addWidget(zoomOut);
-    controls->addWidget(hand);
+    controls->addWidget(shift);
     controls->addWidget(penProperties);
     controls->addWidget(exposure);
 
@@ -222,6 +199,7 @@
 
 void TupCanvas::closeEvent(QCloseEvent *event)
 {
+    delete graphicsView; 
     event->accept();
 }
 
@@ -497,7 +475,8 @@
                 if (answer == QMessageBox::Yes) {
                     pixmap = new QPixmap();
                     QString extension = fileInfo.suffix().toUpper();
-                    QByteArray ba = extension.toAscii();
+                    // QByteArray ba = extension.toAscii();
+                    QByteArray ba = extension.toLatin1();
                     const char* ext = ba.data();
                     if (pixmap->loadFromData(data, ext)) {
                         QPixmap newpix;
@@ -533,27 +512,23 @@
 void TupCanvas::wakeUpZoomIn()
 {
     updateMenuStates();
-    // emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::ZoomInTool);
+    graphicsView->scale(1.3, 1.3);
 
-    foreach (QGraphicsView * view, k->scene->views()) {
-             view->scale(1 + 0.3, 1 + 0.3);
-    }
+    emit updateZoomFactorFromFullScreen(1.3);
 }
 
 void TupCanvas::wakeUpZoomOut()
 {
     updateMenuStates();
-    // emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::ZoomOutTool);
+    graphicsView->scale(0.7, 0.7);
 
-    foreach (QGraphicsView * view, k->scene->views()) {
-             view->scale(1 - 0.3, 1 - 0.3);
-    }
+    emit updateZoomFactorFromFullScreen(0.7);
 }
 
-void TupCanvas::wakeUpHand()
+void TupCanvas::wakeUpShift()
 {
     updateMenuStates();
-    emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::HandTool);
+    emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::ShiftTool);
 }
 
 void TupCanvas::undo()
@@ -653,7 +628,7 @@
     TupProjectRequest request = TupRequestBuilder::createLayerRequest(sceneIndex, layerIndex, TupProjectRequest::Add, tr("Layer %1").arg(layerIndex + 1));
     emit requestTriggered(&request);
 
-    tError() << "TupCanvas::createLayer() - Creating layer at [ " << sceneIndex << ", " << layerIndex << " ]";
+    // tError() << "TupCanvas::createLayer() - Creating layer at [ " << sceneIndex << ", " << layerIndex << " ]";
 
     int oneRow = k->scene->framesTotal();
     for(int i=0; i<oneRow; i++) {
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcanvas.h tupi-0.2+git05/src/components/paintarea/tupcanvas.h
--- tupi-0.2+git04/src/components/paintarea/tupcanvas.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcanvas.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,8 +36,16 @@
 #ifndef TUPCANVAS_H
 #define TUPCANVAS_H
 
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+#include "tapplication.h"
 #include "tupgraphicsscene.h"
 #include "tupcanvasview.h"
+#include "tupexposuredialog.h"
+#include "tuptoolsdialog.h"
+#include "tuponionopacitydialog.h"
+#include "tuppendialog.h"
+#include "timagebutton.h"
 #include "tupbrushmanager.h"
 #include "tupprojectrequest.h"
 #include "tuprequestbuilder.h"
@@ -50,17 +58,31 @@
 #include <QColor>
 #include <QPen>
 #include <QStringList>
+#include <QDialog>
+#include <QBoxLayout>
+#include <QIcon>
+#include <QGraphicsView>
+#include <QColorDialog>
+#include <QToolBar>
+#include <QAction>
+#include <QSlider>
+#include <QLabel>
+#include <QFont>
+#include <QDesktopWidget>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QBuffer>
 
-class TupGraphicsScene;
+// class TupGraphicsScene;
 
-class TupCanvas : public QFrame
+class TUPI_EXPORT TupCanvas : public QFrame
 {
     Q_OBJECT
 
     public:
         TupCanvas(QWidget *parent=0, Qt::WindowFlags f=0, TupGraphicsScene *scene=0, 
                   const QPointF centerPoint = QPoint(0, 0) , const QSize &size = QSize(0, 0), 
-                  TupProject *project = 0, double scaleFactor = 1, int angle=0, 
+                  TupProject *project = 0, qreal scaleFactor = 1, int angle=0, 
                   TupBrushManager *brushManager = 0, bool isNetworked = false, const QStringList &onLineUsers = QStringList());
         ~TupCanvas();
         void updateCursor(const QCursor &cursor);
@@ -96,7 +118,7 @@
         void wakeUpDeleteSelection();
         void wakeUpZoomIn();
         void wakeUpZoomOut();
-        void wakeUpHand();
+        void wakeUpShift();
 
         void undo();
         void redo();
@@ -118,6 +140,7 @@
         void updateColorFromFullScreen(const QColor &color);
         void updatePenThicknessFromFullScreen(int size);
         void updateOnionOpacityFromFullScreen(double opacity);
+        void updateZoomFactorFromFullScreen(qreal factor);
         void callAction(int menu, int index);
         void goToFrame(int frame, int layer, int scene);
         void goToScene(int scene);
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcanvas.pc.cpp tupi-0.2+git05/src/components/paintarea/tupcanvas.pc.cpp
--- tupi-0.2+git04/src/components/paintarea/tupcanvas.pc.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcanvas.pc.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -38,9 +38,7 @@
 #include "tapplicationproperties.h"
 #include "tuptoolplugin.h"
 #include "timagebutton.h"
-#include "tglobal.h"
 #include "tconfig.h"
-#include "tdebug.h"
 #include "tuppendialog.h"
 #include "tupexposuredialog.h"
 
@@ -124,7 +122,7 @@
     connect(objects, SIGNAL(clicked()), this, SLOT(wakeUpObjectSelection()));
 
     TImageButton *nodes = new TImageButton(QPixmap(THEME_DIR + "icons/nodes_big.png"), 40, this, true);
-    nodes->setToolTip(tr("Line Selection"));
+    nodes->setToolTip(tr("Nodes Selection"));
     connect(nodes, SIGNAL(clicked()), this, SLOT(wakeUpNodeSelection()));
 
     TImageButton *trash = new TImageButton(QPixmap(THEME_DIR + "icons/delete_big.png"), 40, this, true);
@@ -139,9 +137,9 @@
     zoomOut->setToolTip(tr("Zoom Out"));
     connect(zoomOut, SIGNAL(clicked()), this, SLOT(wakeUpZoomOut()));
 
-    TImageButton *hand = new TImageButton(QPixmap(THEME_DIR + "icons/hand_big.png"), 40, this, true);
-    hand->setToolTip(tr("Hand"));
-    connect(hand, SIGNAL(clicked()), this, SLOT(wakeUpHand()));
+    TImageButton *shift = new TImageButton(QPixmap(THEME_DIR + "icons/hand_big.png"), 40, this, true);
+    shift->setToolTip(tr("Shift"));
+    connect(shift, SIGNAL(clicked()), this, SLOT(wakeUpShift()));
 
     TImageButton *undo = new TImageButton(QPixmap(THEME_DIR + "icons/undo_big.png"), 40, this, true);
     undo->setToolTip(tr("Undo"));
@@ -404,9 +402,9 @@
     emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::ZoomOutTool);
 }
 
-void TupCanvas::wakeUpHand()
+void TupCanvas::wakeUpShift()
 {
-    emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::HandTool);
+    emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::ShiftTool);
 }
 
 void TupCanvas::undo()
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcanvas.tablet.cpp tupi-0.2+git05/src/components/paintarea/tupcanvas.tablet.cpp
--- tupi-0.2+git04/src/components/paintarea/tupcanvas.tablet.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcanvas.tablet.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -33,14 +33,13 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
+#include "tglobal.h"
 #include "tupcanvas.h"
 #include "tupapplication.h"
 #include "tapplicationproperties.h"
 #include "tuptoolplugin.h"
 #include "timagebutton.h"
-#include "tglobal.h"
 #include "tconfig.h"
-#include "tdebug.h"
 #include "tuppendialog.h"
 #include "tupexposuredialog.h"
 
@@ -124,7 +123,7 @@
     connect(objects, SIGNAL(clicked()), this, SLOT(wakeUpObjectSelection()));
 
     TImageButton *nodes = new TImageButton(QPixmap(THEME_DIR + "icons/nodes_big.png"), 40, this, true);
-    nodes->setToolTip(tr("Line Selection"));
+    nodes->setToolTip(tr("Nodes Selection"));
     connect(nodes, SIGNAL(clicked()), this, SLOT(wakeUpNodeSelection()));
 
     TImageButton *trash = new TImageButton(QPixmap(THEME_DIR + "icons/delete_big.png"), 40, this, true);
@@ -139,9 +138,9 @@
     zoomOut->setToolTip(tr("Zoom Out"));
     connect(zoomOut, SIGNAL(clicked()), this, SLOT(wakeUpZoomOut()));
 
-    TImageButton *hand = new TImageButton(QPixmap(THEME_DIR + "icons/hand_big.png"), 40, this, true);
-    hand->setToolTip(tr("Hand"));
-    connect(hand, SIGNAL(clicked()), this, SLOT(wakeUpHand()));
+    TImageButton *shift = new TImageButton(QPixmap(THEME_DIR + "icons/hand_big.png"), 40, this, true);
+    shift->setToolTip(tr("Shift"));
+    connect(shift, SIGNAL(clicked()), this, SLOT(wakeUpShift()));
 
     TImageButton *undo = new TImageButton(QPixmap(THEME_DIR + "icons/undo_big.png"), 40, this, true);
     undo->setToolTip(tr("Undo"));
@@ -405,9 +404,9 @@
     emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::ZoomOutTool);
 }
 
-void TupCanvas::wakeUpHand()
+void TupCanvas::wakeUpShift()
 {
-    emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::HandTool);
+    emit callAction(TupToolPlugin::ZoomMenu, TupToolPlugin::ShiftTool);
 }
 
 void TupCanvas::undo()
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcanvasview.cpp tupi-0.2+git05/src/components/paintarea/tupcanvasview.cpp
--- tupi-0.2+git04/src/components/paintarea/tupcanvasview.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcanvasview.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupcanvasview.h"
-#include "tdebug.h"
 
 struct TupCanvasView::Private
 {
@@ -46,6 +45,7 @@
 TupCanvasView::TupCanvasView(QWidget *parent, const QSize &screenSize, const QSize &projectSize, 
                              const QColor &bg) : QGraphicsView(parent), k(new Private)
 {
+    setAccessibleName("FULL_SCREEN");
     k->screenSize = screenSize;
     k->projectSize = projectSize;
     k->bg = bg;
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcanvasview.h tupi-0.2+git05/src/components/paintarea/tupcanvasview.h
--- tupi-0.2+git04/src/components/paintarea/tupcanvasview.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcanvasview.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,6 +36,7 @@
 #ifndef TUPCANVASVIEW_H
 #define TUPCANVASVIEW_H
 
+#include "tglobal.h"
 #include "tuppaintareabase.h"
 
 #include <QGraphicsView>
@@ -43,7 +44,7 @@
 #include <QRectF>
 #include <QMouseEvent>
 
-class TupCanvasView : public QGraphicsView
+class TUPI_EXPORT TupCanvasView : public QGraphicsView
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcolorwidget.cpp tupi-0.2+git05/src/components/paintarea/tupcolorwidget.cpp
--- tupi-0.2+git04/src/components/paintarea/tupcolorwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcolorwidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,9 +34,6 @@
  ***************************************************************************/
 
 #include "tupcolorwidget.h"
-#include "tdebug.h"
-
-#include <QPainter>
 
 /**
  * This class defines the options panel in the bottom of the paint area.
diff -Nru tupi-0.2+git04/src/components/paintarea/tupcolorwidget.h tupi-0.2+git05/src/components/paintarea/tupcolorwidget.h
--- tupi-0.2+git04/src/components/paintarea/tupcolorwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupcolorwidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,10 +36,13 @@
 #ifndef TUPPAINTAREASTATUS_H
 #define TUPPAINTAREASTATUS_H
 
+#include "tglobal.h"
+
 #include <QBrush>
 #include <QSize>
 #include <QPaintEvent>
 #include <QWidget>
+#include <QPainter>
 
 /**
  * This class defines the options panel in the bottom of the paint area.
@@ -47,7 +50,7 @@
  * @author David Cuadrado
 */
 
-class TupColorWidget : public QWidget
+class TUPI_EXPORT TupColorWidget : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupconfigurationarea.cpp tupi-0.2+git05/src/components/paintarea/tupconfigurationarea.cpp
--- tupi-0.2+git04/src/components/paintarea/tupconfigurationarea.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupconfigurationarea.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,21 +34,6 @@
  ***************************************************************************/
 
 #include "tupconfigurationarea.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QTextBrowser>
-#include <QMainWindow>
-#include <QMouseEvent>
-#include <QApplication>
-#include <QPushButton>
-#include <QToolTip>
-#include <QPainter>
-#include <QPainterPath>
-#include <QStyle>
-#include <QStyleOptionButton>
-#include <QTimer>
-//#include <QVBoxLayout>
 
 struct TupConfigurationArea::Private
 {
@@ -112,13 +97,22 @@
 void TupConfigurationArea::shrink()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupConfigurationArea::shrink()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     QMainWindow *mainWindow = dynamic_cast<QMainWindow *>(parentWidget());
     if (!mainWindow || !widget()) {
         #ifdef K_DEBUG
-               tError() << "TupConfigurationArea::shrink() - Fatal error!";
+            QString msg = "TupConfigurationArea::shrink() - Fatal error!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return;
     }
@@ -198,8 +192,16 @@
                      QPoint(x2, y2),
                      Qt::LeftButton, 0, 0);
 
-    if (! QApplication::sendEvent(mainWindow, &move))
-        qWarning("Fail moving");
+    if (! QApplication::sendEvent(mainWindow, &move)) {
+        #ifdef K_DEBUG
+            QString msg = "TupConfigurationArea::shrink() - Error while moving!";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
+        #endif
+    }
 
     qApp->processEvents();
 
@@ -207,8 +209,16 @@
                         QPoint(xRelease, yRelease),
                         Qt::LeftButton, 0, 0);
 
-    if (! QApplication::sendEvent(mainWindow, &release))
-        qWarning("Fail releasing");
+    if (! QApplication::sendEvent(mainWindow, &release)) {
+        #ifdef K_DEBUG
+            QString msg = "TupConfigurationArea::shrink() - Error while releasing!";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
+        #endif
+    }
 
     qApp->processEvents();
     mainWindow->setMouseTracking(hmt);
diff -Nru tupi-0.2+git04/src/components/paintarea/tupconfigurationarea.h tupi-0.2+git05/src/components/paintarea/tupconfigurationarea.h
--- tupi-0.2+git04/src/components/paintarea/tupconfigurationarea.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupconfigurationarea.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,15 +36,28 @@
 #ifndef TCONFIGURATIONAREA_H
 #define TCONFIGURATIONAREA_H
 
-#include <QDockWidget>
+#include "tglobal.h"
 
-class QPushButton;
+#include <QDockWidget>
+#include <QPushButton>
+#include <QLabel>
+#include <QTextBrowser>
+#include <QMainWindow>
+#include <QMouseEvent>
+#include <QApplication>
+#include <QPushButton>
+#include <QToolTip>
+#include <QPainter>
+#include <QPainterPath>
+#include <QStyle>
+#include <QStyleOptionButton>
+#include <QTimer>
 
 /**
  * @author David Cuadrado
 */
 
-class TupConfigurationArea : public QDockWidget
+class TUPI_EXPORT TupConfigurationArea : public QDockWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupdocumentruler.cpp tupi-0.2+git05/src/components/paintarea/tupdocumentruler.cpp
--- tupi-0.2+git04/src/components/paintarea/tupdocumentruler.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupdocumentruler.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,12 +34,6 @@
  ***************************************************************************/
 
 #include "tupdocumentruler.h"
-#include "tdebug.h"
-
-#include <iostream>
-using namespace std;
-
-#include <QApplication>
 
 struct TupDocumentRuler::Private
 {
diff -Nru tupi-0.2+git04/src/components/paintarea/tupdocumentruler.h tupi-0.2+git05/src/components/paintarea/tupdocumentruler.h
--- tupi-0.2+git04/src/components/paintarea/tupdocumentruler.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupdocumentruler.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,18 @@
 #ifndef TUPDOCUMENTRULER_H
 #define TUPDOCUMENTRULER_H
 
+#include "tglobal.h"
 #include "trulerbase.h"
 
+#include <QApplication>
+#include <iostream>
+using namespace std;
+
 /**
  * @author Jorge Cuadrado
 */
 
-class TupDocumentRuler : public TRulerBase
+class TUPI_EXPORT TupDocumentRuler : public TRulerBase
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupdocumentview.cpp tupi-0.2+git05/src/components/paintarea/tupdocumentview.cpp
--- tupi-0.2+git04/src/components/paintarea/tupdocumentview.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupdocumentview.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -35,11 +35,7 @@
 
 #include "tupdocumentview.h"
 #include "tupapplication.h"
-
-// Tupi Framework 
-#include "tdebug.h"
 #include "tconfig.h"
-
 #include "tuprequestbuilder.h"
 #include "tuppaintareaproperties.h"
 #include "tuppluginmanager.h"
@@ -49,14 +45,13 @@
 #include "tuppaintareaevent.h"
 #include "tuppaintareacommand.h"
 #include "tupgraphicsscene.h"
-
 #include "tupbrushmanager.h"
 #include "tupproject.h"
 #include "tupscene.h"
 #include "tuplayer.h"
 #include "tuppaintareastatus.h"
 #include "tupcanvas.h"
-#include "polyline.h"
+#include "polylinetool.h"
 #include "tupimagedialog.h"
 #include "tupstoryboarddialog.h"
 #include "tupruler.h"
@@ -64,31 +59,8 @@
 #include "tupbasiccamerainterface.h"
 #include "tupcameradialog.h"
 #include "tuplibrary.h"
-
-#include <QLayout>
-#include <QStatusBar>
-#include <QMenuBar>
-#include <QPixmap>
-#include <QActionGroup>
-#include <QDockWidget>
-#include <QTimer>
-#include <QApplication>
-#include <QCursor>
-#include <QAction>
-#include <QActionGroup>
-#include <QToolBar>
-#include <QMenu>
-#include <QDir>
-#include <QPluginLoader>
-#include <QSpinBox>
-#include <QFrame>
-#include <QGridLayout>
-#include <QComboBox>
-#include <QDesktopWidget>
-#include <QMessageBox>
-
-#include <QCamera>
-#include <QCameraImageCapture>
+#include "tuppapagayoimporter.h"
+#include "tuppapagayodialog.h"
 
 /**
  * This class defines all the environment for the Ilustration interface.
@@ -99,15 +71,8 @@
 struct TupDocumentView::Private
 {
     QSize wsDimension;
-    QActionGroup *gridGroup; 
-    QActionGroup *editGroup; 
-    QActionGroup *viewNextGroup; 
-    QActionGroup *viewZoomGroup; 
-    QActionGroup *viewPreviousGroup;
-    QMenu *brushesMenu;
-    QMenu *selectionMenu;
-    QMenu *fillMenu;
-    QMenu *viewToolMenu;
+
+    QMenu *shapesMenu;
     QMenu *motionMenu;
 
     QMenu *filterMenu;
@@ -120,7 +85,6 @@
     QToolBar *toolbar;
     QToolBar *propertiesBar;
 
-    QDoubleSpinBox *zoomFactorSpin;
     QDoubleSpinBox *onionFactorSpin;
     QSpinBox *prevOnionSkinSpin;
     QSpinBox *nextOnionSkinSpin;
@@ -157,12 +121,29 @@
     QTimer *timer;
 
     TupExportInterface *imagePlugin;
+
+    qreal nodesScaleFactor;
+    qreal cacheScaleFactor;
+
+    TAction *pencilAction;
+    TAction *inkAction;
+    TAction *polyLineAction;
+    TAction *selectionAction;
+    TAction *nodesAction;
+    TAction *borderFillAction;
+    TAction *fillAction;
+    TAction *shiftAction;
+    TAction *papagayoAction;
 };
 
 TupDocumentView::TupDocumentView(TupProject *project, QWidget *parent, bool isNetworked, const QStringList &users) : QMainWindow(parent), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupDocumentView()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     setWindowIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "animation_mode.png"));
@@ -176,6 +157,7 @@
     k->onLineUsers = users;
     k->dynamicFlag = false;
     k->photoCounter = 1;
+    k->nodesScaleFactor = 1;
 
     k->actionManager = new TActionManager(this);
 
@@ -199,9 +181,11 @@
     layout->addWidget(k->horizontalRuler, 0, 1);
     layout->addWidget(k->verticalRuler, 1, 0);
 
-    connect(k->paintArea, SIGNAL(scaled(double)), this, SLOT(updateScaleVars(double)));
+    connect(k->paintArea, SIGNAL(scaled(qreal)), this, SLOT(updateZoomVars(qreal)));
     connect(k->paintArea, SIGNAL(rotated(int)), this, SLOT(updateRotationVars(int)));
     connect(k->paintArea, SIGNAL(updateStatusBgColor(QColor)), this, SLOT(updateStatusBgColor(QColor)));
+    connect(k->paintArea, SIGNAL(zoomIn()), this, SLOT(applyZoomIn()));
+    connect(k->paintArea, SIGNAL(zoomOut()), this, SLOT(applyZoomOut()));
 
     Tupi::RenderType renderType = Tupi::RenderType(TCONFIG->value("RenderType").toInt()); 
 
@@ -216,7 +200,12 @@
 
             default:
                  #ifdef K_DEBUG
-                        tWarning() << "Unsopported render, switching to native!";
+                     QString msg = "TupDocumentView() - Unsopported render, switching to native!";
+                     #ifdef Q_OS_WIN32
+                         qWarning() << msg;
+                     #else
+                         tWarning() << msg;
+                     #endif
                  #endif
                  k->paintArea->setUseOpenGL(false);
             break;
@@ -234,7 +223,7 @@
 
     setupDrawActions();
 
-    createTools(); 
+    createLateralToolBar(); 
     createToolBar();
     
     k->status = new TupPaintAreaStatus(this);
@@ -250,7 +239,8 @@
 
     connect(k->paintArea->brushManager(), SIGNAL(penChanged(const QPen&)), k->status, SLOT(setPen(const QPen &)));
 
-    QTimer::singleShot(1000, this, SLOT(loadPlugins()));
+    // SQA: Find out why this timer instruction is required?
+    QTimer::singleShot(500, this, SLOT(loadPlugins()));
 
     // SQA: Temporarily disabled  
     // if (!k->isNetworked)
@@ -260,7 +250,11 @@
 TupDocumentView::~TupDocumentView()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupDocumentView()]";
+        #else
+            TEND;
+        #endif
     #endif
 
     TCONFIG->beginGroup("General");
@@ -331,21 +325,56 @@
     k->status->updateRotationAngle(angle);
 }
 
-void TupDocumentView::setZoom(qreal factor)
+void TupDocumentView::setZoomFactor(qreal factor)
 {
     k->paintArea->setZoom(factor);
     k->verticalRuler->setRulerZoom(factor);
     k->horizontalRuler->setRulerZoom(factor);
 
+    updateNodesScale(factor);
+}
+
+void TupDocumentView::updateZoomVars(qreal factor)
+{
+    k->status->updateZoomFactor(factor);
+    k->verticalRuler->setRulerZoom(factor);
+    k->horizontalRuler->setRulerZoom(factor);
+
+    updateNodesScale(factor);
+}
+
+void TupDocumentView::applyZoomIn()
+{
+    qreal zoom = k->status->currentZoomFactor();
+    if (zoom <= 495) {
+        zoom += 5;
+        k->status->setZoomPercent(QString::number(zoom));
+    }
+}
+
+void TupDocumentView::applyZoomOut()
+{
+    qreal zoom = k->status->currentZoomFactor();
+    if (zoom >= 15) {
+        zoom -= 5;
+        k->status->setZoomPercent(QString::number(zoom));
+    }
+}
+
+void TupDocumentView::updateNodesScale(qreal factor)
+{
     if (k->currentTool) {
-        if (k->currentTool->name().compare(tr("Object Selection")) == 0)
-            k->currentTool->resizeNodes(factor);
+        k->nodesScaleFactor *= factor;
+        QString toolName = k->currentTool->name();
+        if (toolName.compare(tr("Object Selection")) == 0 || toolName.compare(tr("Nodes Selection")) == 0 || toolName.compare(tr("PolyLine")) == 0)
+            k->currentTool->resizeNodes(1 / k->nodesScaleFactor);
     }
 }
 
-void TupDocumentView::setZoomView(const QString &percent)
+void TupDocumentView::setZoomPercent(const QString &percent)
 {
-    k->status->setZoomFactor(percent);
+    k->nodesScaleFactor = percent.toDouble() / 100;
+    k->status->setZoomPercent(percent);
 }
 
 void TupDocumentView::showPos(const QPointF &point)
@@ -367,15 +396,19 @@
 
     new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "delete.png"), tr("Delete"), QKeySequence(Qt::Key_Delete), 
                 k->paintArea, SLOT(deleteItems()), k->actionManager, "delete");
-    
+   
+    /* 
     TAction *group = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "group.png"), tr("&Group"), QKeySequence(tr("Ctrl+G")), 
-                k->paintArea, SLOT(groupItems()), k->actionManager, "group");
+                                 k->paintArea, SLOT(groupItems()), k->actionManager, "group");
+    // SQA: Enabled just for initial development
     group->setDisabled(true);
 
     TAction *ungroup = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "ungroup.png"), tr("&Ungroup"), 
                                     QKeySequence(tr("Ctrl+Shift+G")) , k->paintArea, SLOT(ungroupItems()), 
                                     k->actionManager, "ungroup");
+    // SQA: Enabled just for initial development
     ungroup->setDisabled(true);
+    */
 
     new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "layer.png"), tr("Onion Skin"), QKeySequence(tr("Ctrl+Shift+O")), 
                 this, SLOT(enableOnionFeature()), k->actionManager, "onion");
@@ -397,11 +430,21 @@
     new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "storyboard.png"), tr("Storyboard Settings"), QKeySequence(tr("Ctrl+Shift+S")),
                 this, SLOT(storyboardSettings()), k->actionManager, "storyboard");
 
-    new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "camera.png"), tr("Camera"), QKeySequence(tr("Ctrl+Shift+C")),
-                this, SLOT(cameraInterface()), k->actionManager, "camera");
+    #ifdef Q_OS_WIN32
+        if (QSysInfo::windowsVersion() != QSysInfo::WV_XP) {
+            new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "camera.png"), tr("Camera"), QKeySequence(tr("Ctrl+Shift+C")),
+                        this, SLOT(cameraInterface()), k->actionManager, "camera");
+        }
+    #else
+        new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "camera.png"), tr("Camera"), QKeySequence(tr("Ctrl+Shift+C")),
+                    this, SLOT(cameraInterface()), k->actionManager, "camera");
+    #endif
+
+    new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "papagayo.png"), tr("Papagayo Lip-sync Files"), QKeySequence(tr("Ctrl+Shift+P")),
+                this, SLOT(papagayoManager()), k->actionManager, "papagayo");
 }
 
-void TupDocumentView::createTools()
+void TupDocumentView::createLateralToolBar()
 {
     k->toolbar = new QToolBar(tr("Draw tools"), this);
     k->toolbar->setIconSize(QSize(16, 16));
@@ -410,39 +453,14 @@
     connect(k->toolbar, SIGNAL(actionTriggered(QAction *)), this, SLOT(selectToolFromMenu(QAction *)));
 
     // Brushes menu
-    k->brushesMenu = new QMenu(tr("Brushes"), k->toolbar);
-    k->brushesMenu->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "brush.png"));
-    connect(k->brushesMenu, SIGNAL(triggered(QAction *)), this, SLOT(selectToolFromMenu(QAction*)));
-
-    k->toolbar->addAction(k->brushesMenu->menuAction());
-
-    // Selection menu
-    k->selectionMenu = new QMenu(tr("Selection"), k->toolbar);
-    k->selectionMenu->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "selection.png"));
-    connect(k->selectionMenu, SIGNAL(triggered(QAction*)), this, SLOT(selectToolFromMenu(QAction*)));
-
-    k->toolbar->addAction(k->selectionMenu->menuAction());
-
-    // Fill menu
-    k->fillMenu = new QMenu(tr("Fill"), k->toolbar);
-    k->fillMenu->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "fillcolor.png"));
-    connect(k->fillMenu, SIGNAL(triggered(QAction *)), this, SLOT(selectToolFromMenu(QAction*)));
-
-    k->toolbar->addAction(k->fillMenu->menuAction());
-
-    // View menu
-    k->viewToolMenu = new QMenu(tr("View"), k->toolbar);
-    k->viewToolMenu->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "zoom.png"));
-    connect(k->fillMenu, SIGNAL(triggered(QAction *)), this, SLOT(selectToolFromMenu(QAction*)));
-
-    k->toolbar->addAction(k->viewToolMenu->menuAction());
+    k->shapesMenu = new QMenu(tr("Brushes"), k->toolbar);
+    k->shapesMenu->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "square.png"));
+    connect(k->shapesMenu, SIGNAL(triggered(QAction *)), this, SLOT(selectToolFromMenu(QAction*)));
 
     // Motion Tween menu
     k->motionMenu = new QMenu(tr("Tweening"), k->toolbar);
     k->motionMenu->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "tweening.png"));
     connect(k->motionMenu, SIGNAL(triggered(QAction *)), this, SLOT(selectToolFromMenu(QAction*)));
-
-    k->toolbar->addAction(k->motionMenu->menuAction());
 }
 
 void TupDocumentView::loadPlugins()
@@ -452,6 +470,15 @@
              if (plugin) {
                  TupExportInterface *exporter = qobject_cast<TupExportInterface *>(plugin);
                  if (exporter) {
+                     #ifdef K_DEBUG
+                         QString msg = "TupDocumentView::loadPlugins() - plugin: " + exporter->key();
+                         #ifdef Q_OS_WIN32
+                             qWarning() << msg;
+                         #else
+                             tWarning() << msg;
+                         #endif
+                     #endif
+
                      if (exporter->key().compare(tr("Image Array")) == 0) {
                          k->imagePlugin = exporter;
                          imagePluginLoaded = true;
@@ -463,19 +490,22 @@
 
     if (!imagePluginLoaded) {
         #ifdef K_DEBUG
-               tError() << "TupDocumentView::loadPlugins() - Fatal Error: Couldn't found the \"Image Array\" plugin!";
+            QString msg = "TupDocumentView::loadPlugins() - Warning: Couldn't found plugin -> " + tr("Image Array");
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
     }
 
-    QVector<TAction*> brushTools(8);
+    QVector<TAction*> brushTools(3);
     QVector<TAction*> tweenTools(7);
 
-    TAction *pencil = 0;
-
     foreach (QObject *plugin, TupPluginManager::instance()->tools()) {
              TupToolPlugin *tool = qobject_cast<TupToolPlugin *>(plugin);
 
-             if (tool->toolType() != TupToolInterface::Tweener) {
+             if (tool->toolType() != TupToolInterface::Tweener && tool->toolType() != TupToolInterface::LipSync) {
                  connect(tool, SIGNAL(closeHugeCanvas()), this, SLOT(closeFullScreen()));
                  connect(tool, SIGNAL(callForPlugin(int, int)), this, SLOT(loadPlugin(int, int)));
              }
@@ -485,13 +515,18 @@
 
              for (it = keys.begin(); it != keys.end(); ++it) {
                   #ifdef K_DEBUG
-                         tWarning() << "TupDocumentView::loadPlugins() - Tool Loaded: " << *it;
+                      QString msg = "TupDocumentView::loadPlugins() - Tool Loaded: " + *it;
+                      #ifdef Q_OS_WIN32
+                          qWarning() << msg;
+                      #else
+                          tWarning() << msg;
+                      #endif
                   #endif
 
                   TAction *action = tool->actions()[*it];
-                  action->setIconVisibleInMenu(true);
 
                   if (action) {
+                      action->setIconVisibleInMenu(true);
                       connect(action, SIGNAL(triggered()), this, SLOT(selectTool()));
                       action->setParent(plugin);
                       QString toolName = action->text();
@@ -499,7 +534,7 @@
                       switch (tool->toolType()) {
                               case TupToolInterface::Brush:
                                  {
-                                   // SQA: Experimental plugin (disabled)
+                                   // SQA: Experimental plugin (enable it only for testing)
                                    /*
                                    if (toolName.compare(tr("Scheme")) == 0) {
                                        action->setDisabled(true);
@@ -507,41 +542,49 @@
                                    }
                                    */
 
-                                   if (toolName.compare(tr("Pencil")) == 0) {
-                                       brushTools[0] = action;
-                                       pencil = action;
-                                       k->brushesMenu->setDefaultAction(action);
-                                   }
+                                   if (toolName.compare(tr("Pencil")) == 0)
+                                       k->pencilAction = action;
 
-                                   if (toolName.compare(tr("Ink")) == 0) {
-                                       brushTools[1] = action;
-                                   }
+                                   if (toolName.compare(tr("Ink")) == 0)
+                                       k->inkAction = action;
 
+                                   // SQA: This code has been disabled temporarily
+                                   /*
                                    if (toolName.compare(tr("Eraser")) == 0) {
                                        action->setDisabled(true);
                                        brushTools[2] = action;
                                    }
+                                   */
 
                                    if (toolName.compare(tr("PolyLine")) == 0) {
-                                       brushTools[3] = action;
+                                       k->polyLineAction = action;
                                        TupToolPlugin *tool = qobject_cast<TupToolPlugin *>(action->parent());
                                        connect(k->paintArea, SIGNAL(closePolyLine()), tool, SLOT(initEnv()));
                                        connect(this, SIGNAL(closePolyLine()), tool, SLOT(initEnv()));
                                    }
 
-                                   if (toolName.compare(tr("Line")) == 0)
-                                       brushTools[4] = action;
+                                   if (toolName.compare(tr("Line")) == 0) {
+                                       brushTools[2] = action;
+                                       TupToolPlugin *tool = qobject_cast<TupToolPlugin *>(action->parent());
+                                       connect(k->paintArea, SIGNAL(closeLine()), tool, SLOT(endItem()));
+                                       connect(this, SIGNAL(closeLine()), tool, SLOT(endItem()));
+                                   }
 
-                                   if (toolName.compare(tr("Rectangle")) == 0)
-                                       brushTools[5] = action;
+                                   if (toolName.compare(tr("Rectangle")) == 0) {
+                                       brushTools[0] = action;
+                                       k->shapesMenu->setDefaultAction(action);
+                                   }
 
                                    if (toolName.compare(tr("Ellipse")) == 0)
-                                       brushTools[6] = action;
+                                       brushTools[1] = action;
 
+                                   // SQA: This code has been disabled temporarily
+                                   /*
                                    if (toolName.compare(tr("Text")) == 0) {
                                        action->setDisabled(true);
                                        brushTools[7] = action;
                                    }
+                                   */
                                  }
                                  break;
                               case TupToolInterface::Tweener:
@@ -552,99 +595,130 @@
                                    }
 
                                    if (toolName.compare(tr("Rotation Tween")) == 0)
-                                       // action->setDisabled(true);
                                        tweenTools[1] = action;
 
-                                   if (toolName.compare(tr("Scale Tween")) == 0) {
-                                       // action->setDisabled(true);
+                                   if (toolName.compare(tr("Scale Tween")) == 0)
                                        tweenTools[2] = action;
-                                   }
 
-                                   if (toolName.compare(tr("Shear Tween")) == 0) {
-                                       // action->setDisabled(true);
+                                   if (toolName.compare(tr("Shear Tween")) == 0)
                                        tweenTools[3] = action;
-                                   }
 
-                                   if (toolName.compare(tr("Opacity Tween")) == 0) {
-                                       // action->setDisabled(true);
+                                   if (toolName.compare(tr("Opacity Tween")) == 0)
                                        tweenTools[4] = action;
-                                   }
 
-                                   if (toolName.compare(tr("Coloring Tween")) == 0) {
-                                       // action->setDisabled(true);
+                                   if (toolName.compare(tr("Coloring Tween")) == 0)
                                        tweenTools[5] = action;
-                                   }
 
-                                   if (toolName.compare(tr("Compound Tween")) == 0) {
+                                   if (toolName.compare(tr("Compound Tween")) == 0)
                                        action->setDisabled(true);
                                        tweenTools[6] = action;
-                                   }
                                  }
                                  break;
                               case TupToolInterface::Selection:
                                  {
-                                   k->selectionMenu->addAction(action);
                                    if (toolName.compare(tr("Object Selection")) == 0)
-                                       k->selectionMenu->setDefaultAction(action);
+                                       k->selectionAction = action;
+
+                                   if (toolName.compare(tr("Nodes Selection")) == 0)
+                                       k->nodesAction = action;
                                  }
                                  break;
                               case TupToolInterface::Fill:
                                  {
-                                   k->fillMenu->addAction(action);
                                    if (toolName.compare(tr("Internal fill")) == 0)
-                                       k->fillMenu->setDefaultAction(action);
+                                       k->fillAction = action;
+
+                                   if (toolName.compare(tr("Line fill")) == 0)
+                                       k->borderFillAction = action;
                                  }
                                  break;
                                case TupToolInterface::View:
                                  {
-                                   k->viewToolMenu->addAction(action);
-                                   if (toolName.compare(tr("Zoom In")) == 0)
-                                       k->viewToolMenu->setDefaultAction(action);
-
+                                   if (toolName.compare(tr("Shift")) == 0)
+                                       k->shiftAction = action;
+                                 }
+                                 break;
+                               case TupToolInterface::LipSync:
+                                 {
+                                   if (toolName.compare(tr("Papagayo Lip-sync")) == 0)
+                                       k->papagayoAction = action;
                                  }
                                  break;
                                default:
                                  break;
                       }
+                  } else {
+                      #ifdef K_DEBUG
+                          QString msg = "TupDocumentView::loadPlugins() - Fatal Error: Tool action is NULL -> " + *it;
+                          #ifdef Q_OS_WIN32
+                              qDebug() << msg;
+                          #else
+                              tError() << msg;
+                          #endif
+                      #endif
                   }
              }
     } // end foreach
 
-    for (int i = 0; i < brushTools.size(); ++i) {
-         k->brushesMenu->addAction(brushTools.at(i));
-    }
+    for (int i = 0; i < brushTools.size(); ++i) 
+         k->shapesMenu->addAction(brushTools.at(i));
 
     for (int i = 0; i < tweenTools.size(); ++i)
          k->motionMenu->addAction(tweenTools.at(i));
 
     foreach (QObject *plugin, TupPluginManager::instance()->filters()) {
-             AFilterInterface *filter = qobject_cast<AFilterInterface *>(plugin);
+             AFilterInterface *filterInterface = qobject_cast<AFilterInterface *>(plugin);
              QStringList::iterator it;
-             QStringList keys = filter->keys();
+             QStringList keys = filterInterface->keys();
 
              for (it = keys.begin(); it != keys.end(); ++it) {
                   #ifdef K_DEBUG
-                         tDebug("plugins") << "*** Filter Loaded: " << *it;
+                      QString msg = "TupDocumentView::loadPlugins() - Filter Loaded: " + *it;
+                      #ifdef Q_OS_WIN32
+                          qDebug() << msg;
+                      #else
+                          tDebug("plugins") << msg;
+                      #endif
                   #endif
 
-                  TAction *act = filter->actions()[*it];
-                  if (act) {
-                      connect(act, SIGNAL(triggered()), this, SLOT(applyFilter()));
-                      k->filterMenu->addAction(act);
+                  TAction *filter = filterInterface->actions()[*it];
+                  if (filter) {
+                      connect(filter, SIGNAL(triggered()), this, SLOT(applyFilter()));
+                      k->filterMenu->addAction(filter);
                   }
              }
     }
 
+    k->toolbar->addAction(k->pencilAction);
+    k->toolbar->addAction(k->inkAction);
+    k->toolbar->addAction(k->polyLineAction);
+    k->toolbar->addSeparator();
+    k->toolbar->addAction(k->shapesMenu->menuAction());
+    k->toolbar->addSeparator();
+    k->toolbar->addAction(k->selectionAction);
+    k->toolbar->addAction(k->nodesAction);
+    k->toolbar->addSeparator();
+    k->toolbar->addAction(k->fillAction);
+    k->toolbar->addAction(k->borderFillAction);
+    k->toolbar->addSeparator();
+    k->toolbar->addAction(k->shiftAction);
+    k->toolbar->addSeparator();
+    k->toolbar->addAction(k->motionMenu->menuAction());
+
     brushTools.clear();
     tweenTools.clear();
 
-    pencil->trigger();
+    k->pencilAction->trigger();
 }
 
 void TupDocumentView::loadPlugin(int menu, int index)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupDocumentView::loadPlugin()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TAction *action = 0;
@@ -675,64 +749,86 @@
             break;
             case TupToolPlugin::BrushesMenu:
                  {
-                     QList<QAction*> brushActions = k->brushesMenu->actions();
-                     if (index < brushActions.size()) {
-                         action = (TAction *) brushActions[index];
-                     } else {
-                         #ifdef K_DEBUG
-                                tError() << "TupDocumentView::loadPlugin() - Error: Invalid Brush Index / No plugin loaded";
-                         #endif
-                         return;
+                     QList<QAction*> brushActions = k->shapesMenu->actions();
+
+                     switch (index) {
+                             case TupToolPlugin::PencilTool:
+                             {
+                                 action = k->pencilAction;
+                             }
+                             break;
+                             case TupToolPlugin::InkTool:
+                             {
+                                 action = k->inkAction;
+                             }
+                             break;
+                             case TupToolPlugin::PolyLineTool:
+                             {
+                                 action = k->polyLineAction;
+                             }
+                             break;
+                             case TupToolPlugin::RectangleTool:
+                             {
+                                 action = (TAction *) brushActions[0];
+                             }
+                             break;
+                             case TupToolPlugin::EllipseTool:
+                             {
+                                 action = (TAction *) brushActions[1];
+                             }
+                             break;
+                             case TupToolPlugin::LineTool:
+                             {
+                                 action = (TAction *) brushActions[2];
+                             }
+                             break;
                      }
                  }
             break;
             case TupToolPlugin::SelectionMenu:
                  {
-                     if (index == TupToolPlugin::Delete) {
-                         k->paintArea->deleteItems();
-                     } else {
-                         QList<QAction*> selectionActions = k->selectionMenu->actions();
-                         if (index < selectionActions.size()) {
-                             action = (TAction *) selectionActions[index];
-                         } else {
-                             #ifdef K_DEBUG
-                                    tError() << "TupDocumentView::loadPlugin() - Error: Invalid Selection Index / No plugin loaded";
-                             #endif
-                             return;
+                     switch (index) {
+                         case TupToolPlugin::Delete:
+                         {
+                             k->paintArea->deleteItems();
+                         }
+                         break;
+                         case TupToolPlugin::NodesTool:
+                         {
+                             action = k->nodesAction;
                          }
+                         break;
+                         case TupToolPlugin::ObjectsTool:
+                         {
+                             action = k->selectionAction;
+                         }
+                         break;
                      }
                  }
             break;
             case TupToolPlugin::FillMenu:
                  {
-                     QList<QAction*> fillActions = k->fillMenu->actions();
-                     if (index < fillActions.size()) {
-                         action = (TAction *) fillActions[index];
-                     } else {
-                         #ifdef K_DEBUG
-                                tError() << "TupDocumentView::loadPlugin() - Error: Invalid Fill Index / No plugin loaded";
-                         #endif
-                         return;
-                     }
+                     if (index == TupToolPlugin::InsideTool)
+                         action = k->fillAction;
+
+                     if (index == TupToolPlugin::ContourTool)
+                         action = k->borderFillAction;
                  }
             break;
             case TupToolPlugin::ZoomMenu:
                  {
-                     QList<QAction*> viewActions = k->viewToolMenu->actions();
-                     if (index < viewActions.size()) {
-                         action = (TAction *) viewActions[index];
-                     } else {
-                         #ifdef K_DEBUG
-                                tError() << "TupDocumentView::loadPlugin() - Error: Invalid Zoom Index (" << index << ") / No plugin loaded";
-                         #endif
-                         return;
-                     }
+                     action = k->shiftAction;
                  }
             break;
             default:
                  {
                      #ifdef K_DEBUG
-                            tError() << "TupDocumentView::loadPlugin() - Error: Invalid Menu Index / No plugin loaded";
+                         QString msg = "TupDocumentView::loadPlugin() - Error: Invalid Menu Index / No plugin loaded";
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError() << msg;
+                         #endif
                      #endif
                      return;
                  }
@@ -742,14 +838,7 @@
     if (action) {
         QString toolName = tr("%1").arg(action->text());
 
-        if (index == TupToolPlugin::ZoomInTool || index == TupToolPlugin::ZoomOutTool) {
-            if (k->fullScreenOn) {
-                action->trigger();
-                k->fullScreen->updateCursor(action->cursor());
-                TupToolPlugin *tool = qobject_cast<TupToolPlugin *>(action->parent());
-                tool->autoZoom();
-            }
-        } else if (toolName.compare(k->currentTool->name()) != 0) {
+        if (toolName.compare(k->currentTool->name()) != 0) {
             if (k->fullScreenOn) {
                 action->trigger();
                 k->fullScreen->updateCursor(action->cursor());
@@ -757,7 +846,12 @@
         }
     } else {
         #ifdef K_DEBUG
-               tError() << "TupDocumentView::loadPlugin() - Error: Action pointer is NULL!";
+            QString msg = "TupDocumentView::loadPlugin() - Error: Action pointer is NULL!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return;
     }
@@ -766,7 +860,11 @@
 void TupDocumentView::selectTool()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupDocumentView::selectTool()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TAction *action = qobject_cast<TAction *>(sender());
@@ -797,42 +895,33 @@
         switch (tool->toolType()) {
                 case TupToolInterface::Brush: 
                      k->status->enableFullScreenFeature(true);
-                     if (toolName.compare(tr("Pencil"))==0) {
+                     if (toolName.compare(tr("Pencil"))==0 || toolName.compare(tr("PolyLine"))==0) {
                          minWidth = 130;
                      } else if (toolName.compare(tr("Text"))==0) {
                                 minWidth = 350;
-                     } else if (toolName.compare(tr("PolyLine"))==0 
-                                || toolName.compare(tr("Rectangle"))==0 
-                                || toolName.compare(tr("Ellipse"))==0) {
-                                minWidth = 130;
-                     }
+                     } 
 
-                     k->brushesMenu->setDefaultAction(action);
-                     k->brushesMenu->setActiveAction(action);
-                     if (!action->icon().isNull())
-                         k->brushesMenu->menuAction()->setIcon(action->icon());
+                     if (toolName.compare(tr("Rectangle"))==0 || toolName.compare(tr("Ellipse"))==0 || toolName.compare(tr("Line"))==0) { 
+                         minWidth = 130;
+                         k->shapesMenu->setDefaultAction(action);
+                         k->shapesMenu->setActiveAction(action);
+                         if (!action->icon().isNull())
+                             k->shapesMenu->menuAction()->setIcon(action->icon());
+                     }
                      break;
+                     
                 case TupToolInterface::Tweener:
                      k->status->enableFullScreenFeature(false);
                      minWidth = 220;
-                     k->motionMenu->setDefaultAction(action);
                      k->motionMenu->setActiveAction(action);
                      if (!action->icon().isNull())
                          k->motionMenu->menuAction()->setIcon(action->icon());
                      break;
                 case TupToolInterface::Fill:
                      k->status->enableFullScreenFeature(true);
-                     k->fillMenu->setDefaultAction(action);
-                     k->fillMenu->setActiveAction(action);
-                     if (!action->icon().isNull())
-                         k->fillMenu->menuAction()->setIcon(action->icon());
                      break;
                 case TupToolInterface::Selection:
                      k->status->enableFullScreenFeature(true);
-                     k->selectionMenu->setDefaultAction(action);
-                     k->selectionMenu->setActiveAction(action);
-                     if (!action->icon().isNull())
-                         k->selectionMenu->menuAction()->setIcon(action->icon());
                      if (toolName.compare(tr("Object Selection"))==0) {
                          minWidth = 130;
                          connect(k->paintArea, SIGNAL(itemAddedOnSelection(TupGraphicsScene *)), 
@@ -841,17 +930,22 @@
                      break;
                 case TupToolInterface::View:
                      k->status->enableFullScreenFeature(true);
-                     k->viewToolMenu->setDefaultAction(action);
-                     k->viewToolMenu->setActiveAction(action);
-                     if (!action->icon().isNull())
-                         k->viewToolMenu->menuAction()->setIcon(action->icon());
-                     if (toolName.compare(tr("Zoom In"))==0 || toolName.compare(tr("Zoom Out"))==0)
-                         minWidth = 130;
 
-                     if (toolName.compare(tr("Hand"))==0) {
+                     if (toolName.compare(tr("Shift"))==0) {
                          tool->setProjectSize(k->project->dimension());
+                         if (k->fullScreenOn)
+                             tool->setActiveView("FULL_SCREEN");
+                         else
+                             tool->setActiveView("WORKSPACE");
                      }
                      break;
+                case TupToolInterface::LipSync:
+                     k->status->enableFullScreenFeature(false);
+                     minWidth = 220;
+                     connect(k->currentTool, SIGNAL(importLipSync()), this, SLOT(importPapagayoLipSync()));
+                     break;
+                default:
+                     break;
         }
 
         QWidget *toolConfigurator = tool->configurator();
@@ -871,15 +965,16 @@
         k->paintArea->setTool(tool);
         k->paintArea->viewport()->setCursor(action->cursor());
 
-        if (toolName.compare(tr("Object Selection"))==0) {
-            qreal globalFactor = k->status->currentZoomFactor();
-            qreal factor = globalFactor*0.01;
-            tool->updateZoomFactor(factor);
-        }
-
+        if (toolName.compare(tr("Object Selection"))==0 || toolName.compare(tr("Nodes Selection"))==0 || toolName.compare(tr("PolyLine"))==0)
+            tool->updateZoomFactor(1 / k->nodesScaleFactor);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupDocumentView::selectTool() - Fatal Error: Action from sender() is NULL";
+            QString msg = "TupDocumentView::selectTool() - Fatal Error: Action from sender() is NULL";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -887,7 +982,11 @@
 void TupDocumentView::selectToolFromMenu(QAction *action)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupDocumentView::selectToolFromMenu()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     QMenu *menu = qobject_cast<QMenu *>(action->parent());
@@ -905,13 +1004,23 @@
                 tool->trigger();
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupDocumentView::selectToolFromMenu() - Default action is NULL";
+                    QString msg = "TupDocumentView::selectToolFromMenu() - Default action is NULL";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
             }
         }
     } else {
         #ifdef K_DEBUG
-               tFatal() << "TupDocumentView::selectToolFromMenu() - Error: Action with NO parent! Aborting...";
+            QString msg = "TupDocumentView::selectToolFromMenu() - Error: Action with NO parent! Aborting...";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
     } 
 }
@@ -941,13 +1050,6 @@
     }
 }
 
-void TupDocumentView::updateZoomFactor(double factor)
-{
-    k->zoomFactorSpin->blockSignals(true);
-    k->zoomFactorSpin->setValue(factor*100);
-    k->zoomFactorSpin->blockSignals(false);
-}
-
 void TupDocumentView::createToolBar()
 {
     k->barGrid = new QToolBar(tr("Paint area actions"), this);
@@ -974,11 +1076,8 @@
     k->barGrid->addAction(k->actionManager->find("cut"));
     k->barGrid->addAction(k->actionManager->find("delete"));
 
-    // k->barGrid->addAction(k->actionManager->find("show_grid"));
-    // k->barGrid->addAction(k->actionManager->find("full_screen"));
-
-    k->barGrid->addAction(k->actionManager->find("group"));
-    k->barGrid->addAction(k->actionManager->find("ungroup"));
+    // k->barGrid->addAction(k->actionManager->find("group"));
+    // k->barGrid->addAction(k->actionManager->find("ungroup"));
 
     TCONFIG->beginGroup("OnionParameters");
     int preview = TCONFIG->value("PreviousFrames", -1).toInt();
@@ -1030,6 +1129,8 @@
 
     k->barGrid->addAction(k->actionManager->find("camera"));
 
+    k->barGrid->addAction(k->actionManager->find("papagayo"));
+
     addToolBarBreak();
 
     QLabel *dirLabel = new QLabel(tr("Direction") + ": ");
@@ -1109,25 +1210,6 @@
     k->paintArea->setNextFramesOnionSkinCount(level);
 }
 
-/*
-void TupDocumentView::showGrid()
-{
-    k->paintArea->drawGrid(!k->paintArea->gridFlag());
-}
-*/
-
-void TupDocumentView::updateScaleVars(double factor)
-{
-    k->status->updateZoomFactor(factor);
-    k->verticalRuler->setRulerZoom(factor);
-    k->horizontalRuler->setRulerZoom(factor);
-
-    if (k->currentTool) {
-        if (k->currentTool->name().compare(tr("Object Selection")) == 0)
-            k->currentTool->resizeNodes(factor);
-    }
-}
-
 void TupDocumentView::changeRulerOrigin(const QPointF &zero)
 {
     k->verticalRuler->setOrigin(zero.y());
@@ -1229,9 +1311,9 @@
 
    if (k->currentTool) {
        k->currentTool->init(k->paintArea->graphicsScene()); 
-       if ((k->currentTool->toolType() == TupToolInterface::Tweener) && (mode != TupProject::FRAMES_EDITION)) {
-           QAction *pencil = k->brushesMenu->actions().at(0);
-           pencil->trigger();
+       if (((k->currentTool->toolType() == TupToolInterface::Tweener) || (k->currentTool->toolType() == TupToolInterface::LipSync))
+           && (mode != TupProject::FRAMES_EDITION)) {
+           k->pencilAction->trigger();
        }
    }
 
@@ -1324,7 +1406,7 @@
 
 void TupDocumentView::showFullScreen()
 {
-    if (k->fullScreenOn || k->currentTool->toolType() == TupToolInterface::Tweener)
+    if (k->fullScreenOn || k->currentTool->toolType() == TupToolInterface::Tweener || k->currentTool->toolType() == TupToolInterface::LipSync)
         return;
 
     k->fullScreenOn = true;
@@ -1333,25 +1415,35 @@
     int screenW = desktop.screenGeometry().width();
     int screenH = desktop.screenGeometry().height();
 
-    double scale = 1;
+    k->cacheScaleFactor = k->nodesScaleFactor;
+
+    qreal scaleFactor = 1;
 
     QSize projectSize = k->project->dimension();
     if (projectSize.width() < projectSize.height())
-        scale = (double) (screenW - 50) / (double) projectSize.width();
+        scaleFactor = (double) (screenW - 50) / (double) projectSize.width();
     else
-        scale = (double) (screenH - 50) / (double) projectSize.height();
+        scaleFactor = (double) (screenH - 50) / (double) projectSize.height();
 
     k->fullScreen = new TupCanvas(this, Qt::Window|Qt::FramelessWindowHint, k->paintArea->graphicsScene(), 
-                                 k->paintArea->centerPoint(), QSize(screenW, screenH), k->project, scale,
+                                 k->paintArea->centerPoint(), QSize(screenW, screenH), k->project, scaleFactor,
                                  k->viewAngle, brushManager(), k->isNetworked, k->onLineUsers); 
 
     k->fullScreen->updateCursor(k->currentTool->cursor());
+
+    QString toolName = k->currentTool->name();
+    if (toolName.compare(tr("Shift")) == 0)
+        k->currentTool->setActiveView("FULL_SCREEN");
+
     k->fullScreen->showFullScreen();
+    k->nodesScaleFactor = 1;
+    updateNodesScale(scaleFactor);
 
     connect(this, SIGNAL(openColorDialog(const QColor &)), k->fullScreen, SLOT(colorDialog(const QColor &)));
     connect(k->fullScreen, SIGNAL(updateColorFromFullScreen(const QColor &)), this, SIGNAL(updateColorFromFullScreen(const QColor &)));
     connect(k->fullScreen, SIGNAL(updatePenThicknessFromFullScreen(int)), this, SLOT(updatePenThickness(int)));
     connect(k->fullScreen, SIGNAL(updateOnionOpacityFromFullScreen(double)), this, SLOT(updateOnionOpacity(double)));
+    connect(k->fullScreen, SIGNAL(updateZoomFactorFromFullScreen(qreal)), this, SLOT(updateNodesScale(qreal)));
     connect(k->fullScreen, SIGNAL(callAction(int, int)), this, SLOT(loadPlugin(int, int)));
     connect(k->fullScreen, SIGNAL(requestTriggered(const TupProjectRequest *)), this, SIGNAL(requestTriggered(const TupProjectRequest *)));
     connect(k->fullScreen, SIGNAL(localRequestTriggered(const TupProjectRequest *)), this, SIGNAL(localRequestTriggered(const TupProjectRequest *)));
@@ -1381,6 +1473,7 @@
         disconnect(k->fullScreen, SIGNAL(updateColorFromFullScreen(const QColor &)), this, SIGNAL(updateColorFromFullScreen(const QColor &)));
         disconnect(k->fullScreen, SIGNAL(updatePenThicknessFromFullScreen(int)), this, SLOT(updatePenThickness(int))); 
         disconnect(k->fullScreen, SIGNAL(updateOnionOpacityFromFullScreen(double)), this, SLOT(updateOnionOpacity(double)));
+        disconnect(k->fullScreen, SIGNAL(updateZoomFactorFromFullScreen(qreal)), this, SLOT(updateNodesScale(qreal)));
         disconnect(k->fullScreen, SIGNAL(callAction(int, int)), this, SLOT(loadPlugin(int, int)));
         disconnect(k->fullScreen, SIGNAL(requestTriggered(const TupProjectRequest *)), this, SIGNAL(requestTriggered(const TupProjectRequest *)));
         disconnect(k->fullScreen, SIGNAL(localRequestTriggered(const TupProjectRequest *)), this, SIGNAL(localRequestTriggered(const TupProjectRequest *)));
@@ -1391,7 +1484,15 @@
         k->fullScreen->close();
         k->fullScreenOn = false;
         k->currentTool->init(k->paintArea->graphicsScene());
+
         k->fullScreen = 0;
+
+        QString toolName = k->currentTool->name();
+        if (toolName.compare(tr("Shift")) == 0) 
+            k->currentTool->setActiveView("WORKSPACE");
+
+        k->nodesScaleFactor = k->cacheScaleFactor;
+        updateNodesScale(1);
     }
 }
 
@@ -1413,7 +1514,7 @@
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export Frame As"), QDir::homePath(),
                                                         tr("Images") + " (*.png *.jpg)");
     if (!fileName.isNull()) {
-        bool isOk = k->imagePlugin->exportFrame(frameIndex, k->project->bgColor(), fileName, k->project->scene(sceneIndex), k->project->dimension()); 
+        bool isOk = k->imagePlugin->exportFrame(frameIndex, k->project->bgColor(), fileName, k->project->scene(sceneIndex), k->project->dimension(), k->project->library()); 
         updatePaintArea();
         if (isOk)
             TOsd::self()->display(tr("Information"), tr("Frame has been exported successfully"));
@@ -1455,7 +1556,7 @@
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
     TupStoryBoardDialog *storySettings = new TupStoryBoardDialog(k->isNetworked, k->imagePlugin, k->project->bgColor(), k->project->dimension(), 
-                                                                 k->project->scene(sceneIndex), currentSceneIndex(), this);
+                                                                 k->project->scene(sceneIndex), currentSceneIndex(), k->project->library(), this);
     connect(storySettings, SIGNAL(updateStoryboard(TupStoryboard *, int)), this, SLOT(sendStoryboard(TupStoryboard *, int)));
 
     if (k->isNetworked)
@@ -1472,7 +1573,12 @@
 {
     if (k->isNetworked) {
         #ifdef K_DEBUG
-               tWarning() << "TupDocumentView::sendStoryboard() - Sending storyboard...";
+            QString msg = "TupDocumentView::sendStoryboard() - Sending storyboard...";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
         emit updateStoryboard(storyboard, sceneIndex);
     } else {
@@ -1536,6 +1642,9 @@
 {
    if (k->currentTool->name().compare(tr("PolyLine")) == 0)
        emit closePolyLine();
+
+   if (k->currentTool->name().compare(tr("Line")) == 0)
+       emit closeLine();
 }
 
 void TupDocumentView::cameraInterface()
@@ -1561,10 +1670,25 @@
                 }
         }
 
+        /* SQA: This lines should be enabled in some point at the future
         QByteArray cameraDevice = cameraDevices[0];
         QCamera *camera = new QCamera(cameraDevice);
+        camera->load();
+        tError() << "TupDocumentView::cameraInterface() - Camera status: " << camera->status();
         QCameraImageCapture *imageCapture = new QCameraImageCapture(camera);
         QList<QSize> resolutions = imageCapture->supportedResolutions();
+        */
+
+        QList<QSize> resolutions;    
+        resolutions << QSize(1280, 1024);
+        resolutions << QSize(1280, 960);
+        resolutions << QSize(1224, 768);
+        resolutions << QSize(800, 600);
+        resolutions << QSize(640, 480);
+        resolutions << QSize(352, 288);
+        resolutions << QSize(320, 240);
+        resolutions << QSize(176, 144);
+        resolutions << QSize(160, 120);
 
         QDesktopWidget desktop;
         QSize projectSize = k->project->dimension();
@@ -1623,13 +1747,13 @@
         proportion = (double) height / (double) pHeight;
 
     if (proportion <= 0.5) {
-        setZoomView("20");
+        setZoomPercent("20");
     } else if (proportion > 0.5 && proportion <= 0.75) {
-               setZoomView("25");
+               setZoomPercent("25");
     } else if (proportion > 0.75 && proportion <= 1.5) {
-               setZoomView("50");
+               setZoomPercent("50");
     } else if (proportion > 1.5 && proportion < 2) {
-               setZoomView("75");
+               setZoomPercent("75");
     }
 
     emit projectSizeHasChanged(dimension);
@@ -1696,3 +1820,191 @@
         k->photoCounter = id + 1;
     }
 }
+
+void TupDocumentView::importPapagayoLipSync()
+{
+    TupPapagayoDialog *dialog = new TupPapagayoDialog();
+    dialog->show();
+
+    if (dialog->exec() != QDialog::Rejected) {
+        QString file = dialog->getPGOFile();
+        QFileInfo info(file);
+        QString folder = info.fileName().toLower();
+
+        int sceneIndex = k->paintArea->currentSceneIndex();
+        TupScene *scene = k->project->scene(sceneIndex);
+        if (scene->lipSyncExists(folder)) {
+            TOsd::self()->display(tr("Error"), tr("Papagayo project already exists!\nPlease, rename the project's file"), TOsd::Error);
+            #ifdef K_DEBUG
+                   QString msg = "TupDocumentView::importPapagayoLipSync() - Fatal Error: Papagayo file is invalid!";
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
+            #endif
+            return;
+        }
+
+        QString imagesDir = dialog->getImagesFile();
+        QFile project(file);
+        if (project.exists()) {
+            if (project.size() > 0) {
+                QDir dir(imagesDir);
+                QStringList imagesList = dir.entryList(QStringList() << "*.png" << "*.jpg" << "*.jpeg" << "*.gif" << "*.svg");
+                if (imagesList.count() > 0) {
+                    QSize mouthSize;
+                    QString extension = ".svg";
+                    QString firstImage = imagesList.at(0);
+                    QString pic = imagesDir + QDir::separator() + firstImage;
+                    if (firstImage.endsWith(".svg")) {
+                        QSvgRenderer *renderer = new QSvgRenderer(pic);
+                        QRect rect = renderer->viewBox();
+                        mouthSize = rect.size();
+                    } else {
+                        QImage *image = new QImage(pic);
+                        mouthSize = image->size();
+                        int dot = firstImage.lastIndexOf(".");
+                        extension = firstImage.mid(dot);
+                    }
+
+                    int currentIndex = k->paintArea->currentFrameIndex();
+                    TupPapagayoImporter *parser = new TupPapagayoImporter(file, k->project->dimension(), mouthSize, extension, currentIndex);
+                    if (parser->fileIsValid()) {
+                        int layerIndex = k->paintArea->currentLayerIndex();
+                        QString mouthPath = imagesDir;
+                        QDir mouthDir = QDir(mouthPath);
+
+                        // Creating Papagayo folder in the library
+                        TupProjectRequest request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::Add, folder, TupLibraryObject::Folder);
+                        emit requestTriggered(&request);
+
+                        // Adding mouth images in the library
+                        foreach (QString fileName, imagesList) {
+                                 QString key = fileName.toLower();
+                                 QFile f(mouthPath + QDir::separator() + fileName);
+                                 if (f.open(QIODevice::ReadOnly)) {
+                                     QByteArray data = f.readAll();
+                                     f.close();
+                                     request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::Add, key, TupLibraryObject::Image, k->project->spaceContext(), data, folder,
+                                                                                       sceneIndex, layerIndex, currentIndex);
+                                     emit requestTriggered(&request);
+                                 }
+                        }
+
+                        // Adding lip-sync sound file
+                        QString soundFile = dialog->getSoundFile();
+                        QFile f(soundFile);
+                        QFileInfo info(soundFile);
+                        QString soundKey = info.fileName().toLower();
+
+                        if (f.open(QIODevice::ReadOnly)) {
+                            QByteArray data = f.readAll();
+                            f.close();
+                            request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::Add, soundKey, TupLibraryObject::Sound, k->project->spaceContext(), data, folder,
+                                                                              sceneIndex, layerIndex, currentIndex);
+                            emit requestTriggered(&request);
+                        }
+
+                        // Adding Papagayo project
+                        parser->setSoundFile(soundKey);
+                        QString xml = parser->file2Text();
+                        request = TupRequestBuilder::createLayerRequest(sceneIndex, layerIndex, TupProjectRequest::AddLipSync, xml);
+                        emit requestTriggered(&request);
+
+                        // Adding frames if they are required
+                        TupScene *scene = k->project->scene(sceneIndex);
+                        if (scene) {
+                            int sceneFrames = scene->framesTotal();
+                            int lipSyncFrames = currentIndex + parser->framesTotal();
+
+                            if (lipSyncFrames > sceneFrames) {
+                                int layersTotal = scene->layersTotal();
+                                for (int i = sceneFrames; i < lipSyncFrames; i++) {
+                                     for (int j = 0; j < layersTotal; j++) {
+                                          request = TupRequestBuilder::createFrameRequest(sceneIndex, j, i, TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
+                                          emit requestTriggered(&request);
+                                     }
+                                }
+                                request = TupRequestBuilder::createFrameRequest(sceneIndex, layerIndex, currentIndex, TupProjectRequest::Select, "1");
+                                emit requestTriggered(&request);
+                            }
+                        }
+
+                        if (k->currentTool->name().compare(tr("Papagayo Lip-sync")) != 0)
+                            k->papagayoAction->trigger();
+
+                        emit updateFPS(parser->fps()); 
+
+                        TOsd::self()->display(tr("Information"), tr("Papagayo file has been imported successfully"));
+                    } else {
+                        TOsd::self()->display(tr("Error"), tr("Papagayo file is invalid!"), TOsd::Error);
+                        #ifdef K_DEBUG
+                            QString msg = "TupDocumentView::importPapagayoLipSync() - Fatal Error: Papagayo file is invalid!";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
+                        #endif
+                    }
+                } else {
+                    TOsd::self()->display(tr("Error"), tr("Images directory is empty!"), TOsd::Error);
+                    #ifdef K_DEBUG
+                        QString msg = "TupDocumentView::importPapagayoLipSync() - Fatal Error: Images directory is empty!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif
+                }
+            } else {
+                TOsd::self()->display(tr("Error"), tr("Papagayo project is invalid!"), TOsd::Error);
+                #ifdef K_DEBUG
+                    QString msg = "TupDocumentView::importPapagayoLipSync() - Fatal Error: Papagayo file is invalid!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
+                #endif
+            }
+        } else {
+            TOsd::self()->display(tr("Error"), tr("Papagayo project is invalid!"), TOsd::Error);
+            #ifdef K_DEBUG
+                QString msg = "TupDocumentView::importPapagayoLipSync() - Fatal Error: Papagayo file doesn't exist!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+        }
+    }
+}
+
+void TupDocumentView::papagayoManager()
+{
+    if (k->currentTool->name().compare(tr("Papagayo Lip-sync")) != 0) {
+        TupProject::Mode mode = TupProject::Mode(k->spaceMode->currentIndex());
+        if (mode != TupProject::FRAMES_EDITION)
+            k->spaceMode->setCurrentIndex(TupProject::FRAMES_EDITION);
+        k->papagayoAction->trigger();
+    }
+}
+
+void TupDocumentView::updatePerspective()
+{
+    if (k->currentTool) {
+        if (k->currentTool->name().compare(tr("Papagayo Lip-sync")) == 0)
+            k->currentTool->updateWorkSpaceContext();
+    }
+}
+
+void TupDocumentView::resetWorkSpaceTransformations()
+{
+    k->paintArea->resetWorkSpaceCenter(k->project->dimension());
+    k->status->setRotationAngle("0");
+    k->status->setZoomPercent("100");
+}
diff -Nru tupi-0.2+git04/src/components/paintarea/tupdocumentview.h tupi-0.2+git05/src/components/paintarea/tupdocumentview.h
--- tupi-0.2+git04/src/components/paintarea/tupdocumentview.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupdocumentview.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,16 +36,39 @@
 #ifndef TUPDOCUMENTVIEW_H
 #define TUPDOCUMENTVIEW_H
 
+#include "tglobal.h"
 #include "tupdocumentruler.h"
 #include "tactionmanager.h"
 #include "tosd.h"
 #include "tupfilterinterface.h"
 #include "tuptoolinterface.h"
 #include "tupconfigurationarea.h"
-#include "tupglobal.h"
 #include "tupstoryboard.h"
 
 #include <QMainWindow>
+#include <QLayout>
+#include <QStatusBar>
+#include <QMenuBar>
+#include <QPixmap>
+#include <QActionGroup>
+#include <QDockWidget>
+#include <QTimer>
+#include <QApplication>
+#include <QCursor>
+#include <QAction>
+#include <QActionGroup>
+#include <QToolBar>
+#include <QMenu>
+#include <QDir>
+#include <QPluginLoader>
+#include <QSpinBox>
+#include <QFrame>
+#include <QGridLayout>
+#include <QComboBox>
+#include <QDesktopWidget>
+#include <QMessageBox>
+#include <QCamera>
+#include <QCameraImageCapture>
 
 class TupProjectRequest;
 class TupProject;
@@ -58,7 +81,7 @@
  * @author Jorge Cuadrado
 */
 
-class TupDocumentView : public QMainWindow
+class TUPI_EXPORT TupDocumentView : public QMainWindow
 {
     Q_OBJECT
 
@@ -73,7 +96,7 @@
         void setOpenGL(bool useIt);
 
         QPainter::RenderHints renderHints() const;
-        void setZoom(qreal factor);
+        void setZoomFactor(qreal factor);
 
         TupBrushManager *brushManager() const;
         TupPaintAreaCommand *createCommand(const TupPaintAreaEvent *event);
@@ -82,17 +105,19 @@
         TupProject *project();
         int currentFramesTotal();
         int currentSceneIndex();
-        void setZoomView(const QString &percent);
+        void setZoomPercent(const QString &percent);
         void setRotationAngle(int angle);
         QSize workSpaceSize() const;
         void updateUsersOnLine(const QString &login, int state);
         void resizeProjectDimension(const QSize dimension);
+        void updatePerspective();
 
     private slots:
         void setNextOnionSkin(int n);
         void setPreviousOnionSkin(int n);
-        // void setZoomFactor(int porcent);
-        void updateScaleVars(double factor);
+        void updateZoomVars(qreal factor);
+        void applyZoomIn();
+        void applyZoomOut();
         void updateRotationVars(int angle);
         void changeRulerOrigin(const QPointF &zero);
         void saveTimer();
@@ -108,6 +133,7 @@
         void fullScreenRightClick();
         void cameraInterface();
         void insertPictureInFrame(int id, const QString path);
+        void papagayoManager();
 
     private:
         struct Private;
@@ -115,7 +141,7 @@
         void setupDrawActions();
         void createToolBar();
         void createMenu();
-        void createTools();
+        void createLateralToolBar();
         void updateRotationAngleFromRulers(int angle);
 
     private slots: 
@@ -135,7 +161,6 @@
     private slots:
         void showPos(const QPointF &point);	
         void setCursor(const QCursor &cursor);
-        void updateZoomFactor(double factor);
         void selectToolFromMenu(QAction *action);
         void callAutoSave();
         void sendStoryboard(TupStoryboard *storyboard, int sceneIndex);
@@ -148,6 +173,9 @@
         void drawGrid();
         void drawActionSafeArea();
         bool handleProjectResponse(TupProjectResponse *event);
+        void updateNodesScale(qreal factor);
+        void importPapagayoLipSync();
+        void resetWorkSpaceTransformations();
 
     signals:
         void requestTriggered(const TupProjectRequest *event);
@@ -163,7 +191,9 @@
         void postStoryboard(int sceneIndex);
         // void projectHasChanged();
         void closePolyLine();
+        void closeLine();
         void projectSizeHasChanged(const QSize dimension);
+        void updateFPS(int fps);
 
     // protected:
     // void closeEvent(QCloseEvent *e);
diff -Nru tupi-0.2+git04/src/components/paintarea/tupexposuredialog.cpp tupi-0.2+git05/src/components/paintarea/tupexposuredialog.cpp
--- tupi-0.2+git04/src/components/paintarea/tupexposuredialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupexposuredialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,23 +34,6 @@
  ***************************************************************************/
 
 #include "tupexposuredialog.h"
-#include "tupexposurescene.h"
-#include "tdebug.h"
-#include "tapplicationproperties.h"
-#include "tseparator.h"
-#include "timagebutton.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-#include "tpushbutton.h"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QDialogButtonBox>
-#include <QPushButton>
-#include <QGroupBox>
-#include <QListWidget>
-#include <QDesktopWidget>
 
 struct TupExposureDialog::Private
 {
@@ -127,7 +110,6 @@
     k->sceneColumn = new QVBoxLayout;
 
     for (int i=0; i < k->project->scenesTotal(); i++) {
-
          // List of scene buttons
          TPushButton *sceneButton = new TPushButton(this, tr("Scene") + " " + QString::number(i+1), 0, i);
          sceneButton->setFixedSize(100, 70);
@@ -184,11 +166,16 @@
 void TupExposureDialog::goToScene(int column, int sceneIndex)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureDialog::goToScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
+
     Q_UNUSED(column);
 
-    tError() << "TupExposureDialog::goToScene() - sceneIndex: " << sceneIndex;
+    // tError() << "TupExposureDialog::goToScene() - sceneIndex: " << sceneIndex;
 
     TupExposureScene *oldScene = k->sceneGroupList.at(k->currentScene);
     oldScene->hide();
@@ -209,7 +196,7 @@
     TupExposureScene *sceneTable = k->sceneGroupList.at(sceneIndex);
     sceneTable->show();
     int newFramesTotal = sceneTable->framesTotal();
-    int newLayersTotal = sceneTable->layersTotal();
+    int newLayersTotal = sceneTable->layersTotal(); 
 
     emit goToScene(k->currentScene);
     emit goToFrame(sceneTable->currentFrame(), sceneTable->currentLayer(), k->currentScene);
@@ -226,7 +213,11 @@
 void TupExposureDialog::refreshUI(int frame, int layer)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupExposureDialog::refreshUI()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     for(int i=0; i<k->sceneList.size(); i++) {
@@ -235,7 +226,7 @@
 
     k->currentLayer = layer;
 
-    tError() << "TupExposureDialog::refreshUI() - Going to frame -> " << frame;
+    // tError() << "TupExposureDialog::refreshUI() - Going to frame -> " << frame;
 
     emit goToFrame(frame, layer, k->currentScene);
 }
@@ -282,8 +273,8 @@
     k->sceneColumn->addWidget(sceneButton);
     k->sceneList << sceneButton;
 
-    tError() << "TupExposureDialog::createScene() - Scenes Total: " << scene;
-    tError() << "TupExposureDialog::createScene() - Last index: " << oldIndex;
+    // tError() << "TupExposureDialog::createScene() - Scenes Total: " << scene;
+    // tError() << "TupExposureDialog::createScene() - Last index: " << oldIndex;
 
     TupExposureScene *sceneGroup = new TupExposureScene(tr("Scene") + " " + QString::number(scene), k->project->scene(scene-1), 0, 0);
     connect(sceneGroup, SIGNAL(updateUI(int, int)), this, SLOT(refreshUI(int, int)));
diff -Nru tupi-0.2+git04/src/components/paintarea/tupexposuredialog.h tupi-0.2+git05/src/components/paintarea/tupexposuredialog.h
--- tupi-0.2+git04/src/components/paintarea/tupexposuredialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupexposuredialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,10 +36,27 @@
 #ifndef TUPEXPOSUREDIALOG_H
 #define TUPEXPOSUREDIALOG_H
 
+#include "tglobal.h"
 #include "tupproject.h"
+#include "tupexposurescene.h"
+#include "tapplicationproperties.h"
+#include "tseparator.h"
+#include "timagebutton.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+#include "tpushbutton.h"
+
 #include <QDialog>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QListWidget>
+#include <QDesktopWidget>
 
-class TupExposureDialog : public QDialog
+class TUPI_EXPORT TupExposureDialog : public QDialog
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupexposurescene.cpp tupi-0.2+git05/src/components/paintarea/tupexposurescene.cpp
--- tupi-0.2+git04/src/components/paintarea/tupexposurescene.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupexposurescene.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -36,10 +36,6 @@
 #include "tupexposurescene.h"
 #include "tpushbutton.h"
 #include "tuplayer.h"
-#include "tdebug.h"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
 
 struct TupExposureScene::Private
 {
@@ -65,7 +61,6 @@
     k->frameCounter = k->scene->framesTotal();
 
     for (int j=0; j< scene->layersTotal(); j++) {
-
          if (j < 4) { // SQA: Temporary condition
              QGroupBox *layerGroup = new QGroupBox(tr("Layer") + " " + QString::number(j+1));
              QHBoxLayout *layerLayout = new QHBoxLayout;
@@ -142,8 +137,8 @@
 
 void TupExposureScene::addNewFrame()
 {
-    tError() << "TupExposureScene::addNewFrame() - frameList size: " << k->frameList.size();
-    tError() << "TupExposureScene::addNewFrame() - current layer: " << k->currentLayer;
+    // tError() << "TupExposureScene::addNewFrame() - frameList size: " << k->frameList.size();
+    // tError() << "TupExposureScene::addNewFrame() - current layer: " << k->currentLayer;
 
     for(int j=0; j<k->frameList.size(); j++) {
         k->frameList.at(j)->setChecked(false);
@@ -176,18 +171,18 @@
 
         k->frameList.insert(position, frameButton);
  
-        tError() << "TupExposureScene::addNewFrame() -> inserting frame at position: " << position;
+        // tError() << "TupExposureScene::addNewFrame() -> inserting frame at position: " << position;
     }
 }
 
 void TupExposureScene::goToFrame(int frame, int layer)
 {
-    tError() << "TupExposureScene::goToFrame(int, int) - frame: " << frame << " - layer: " << layer;
+    // tError() << "TupExposureScene::goToFrame(int, int) - frame: " << frame << " - layer: " << layer;
 
     // int oneRow = k->scene->framesTotal();
     int index = frame + k->frameCounter*layer;
 
-    tError() << "TupExposureScene::goToFrame(int, int) - index: " << index;
+    // tError() << "TupExposureScene::goToFrame(int, int) - index: " << index;
 
     for(int i=0; i<k->frameList.size(); i++) {
         if (i == index) {
diff -Nru tupi-0.2+git04/src/components/paintarea/tupexposurescene.h tupi-0.2+git05/src/components/paintarea/tupexposurescene.h
--- tupi-0.2+git04/src/components/paintarea/tupexposurescene.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupexposurescene.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,9 +36,12 @@
 #ifndef TUPEXPOSURESCENE_H
 #define TUPEXPOSURESCENE_H 
 
+#include "tglobal.h"
 #include "tupscene.h" 
 
 #include <QGroupBox>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 
 class TupExposureScene : public QGroupBox 
 {
diff -Nru tupi-0.2+git04/src/components/paintarea/tupimagedevice.cpp tupi-0.2+git05/src/components/paintarea/tupimagedevice.cpp
--- tupi-0.2+git04/src/components/paintarea/tupimagedevice.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupimagedevice.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,15 +34,15 @@
  ***************************************************************************/
 
 #include "tupimagedevice.h"
-#include "tdebug.h"
-
-#include <QPainter>
-#include <QPaintEngine>
 
 TupImageDevice::TupImageDevice(QWidget *parent) : QWidget(parent)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupImageDevice()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     m_image = QImage(300,300, QImage::Format_RGB32);
@@ -57,20 +57,24 @@
 TupImageDevice::~TupImageDevice()
 {
     #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupImageDevice()]";
+        #else
            TEND;
+        #endif
     #endif
 }
 
 QPaintEngine *TupImageDevice::paintEngine() const
 {
-    qDebug("TupImageDevice: paint engine *****************************************");
+    // qDebug("TupImageDevice: paint engine *****************************************");
 
     return QWidget::paintEngine();
 }
 
 void TupImageDevice::paintEvent(QPaintEvent *)
 {
-    qDebug("TupImageDevice: Paint event #####################################################");
+    // qDebug("TupImageDevice: Paint event #####################################################");
     QPainter p(this);
     p.drawImage(0, 0, m_image);
 }
diff -Nru tupi-0.2+git04/src/components/paintarea/tupimagedevice.h tupi-0.2+git05/src/components/paintarea/tupimagedevice.h
--- tupi-0.2+git04/src/components/paintarea/tupimagedevice.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupimagedevice.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,18 @@
 #ifndef TUPIMAGEDEVICE_H
 #define TUPIMAGEDEVICE_H
 
+#include "tglobal.h"
+
 #include <QWidget>
 #include <QImage>
+#include <QPainter>
+#include <QPaintEngine>
 
 /**
  * @author David Cuadrado
 */
 
-class TupImageDevice : public QWidget
+class TUPI_EXPORT TupImageDevice : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupimagedialog.cpp tupi-0.2+git05/src/components/paintarea/tupimagedialog.cpp
--- tupi-0.2+git04/src/components/paintarea/tupimagedialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupimagedialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,19 +34,6 @@
  ***************************************************************************/
 
 #include "tupimagedialog.h"
-#include "tapplicationproperties.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "tdebug.h"
-
-#include <QDialog>
-#include <QVBoxLayout>
-#include <QIcon>
-#include <QLabel>
-#include <QLineEdit>
-#include <QTextEdit>
-#include <QPushButton>
-#include <QLocale>
 
 struct TupImageDialog::Private
 {
diff -Nru tupi-0.2+git04/src/components/paintarea/tupimagedialog.h tupi-0.2+git05/src/components/paintarea/tupimagedialog.h
--- tupi-0.2+git04/src/components/paintarea/tupimagedialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupimagedialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,9 +36,20 @@
 #ifndef TUPIMAGEDIALOG_H
 #define TUPIMAGEDIALOG_H
 
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+#include "tconfig.h"
+
 #include <QDialog>
+#include <QVBoxLayout>
+#include <QIcon>
+#include <QLabel>
+#include <QLineEdit>
+#include <QTextEdit>
+#include <QPushButton>
+#include <QLocale>
 
-class TupImageDialog : public QDialog
+class TUPI_EXPORT TupImageDialog : public QDialog
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupinfowidget.cpp tupi-0.2+git05/src/components/paintarea/tupinfowidget.cpp
--- tupi-0.2+git04/src/components/paintarea/tupinfowidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupinfowidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,25 +34,6 @@
  ***************************************************************************/
 
 #include "tupinfowidget.h"
-#include "tdebug.h"
-#include "tapplicationproperties.h"
-#include "tseparator.h"
-#include "timagebutton.h"
-#include "tpushbutton.h"
-#include "tupwebhunter.h"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QComboBox>
-#include <QLineEdit>
-#include <QDialogButtonBox>
-#include <QPushButton>
-#include <QGroupBox>
-#include <QDesktopWidget>
-#include <QTableWidget>
-#include <QHeaderView>
-#include <QFileDialog>
 
 struct TupInfoWidget::Private
 {
@@ -130,8 +111,11 @@
 
     k->table->setMaximumWidth(250);
     k->table->setMaximumHeight((k->currencyList.count() - 1)*30);
-    k->table->verticalHeader()->setResizeMode(QHeaderView::Stretch);
-    k->table->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+
+    // k->table->verticalHeader()->setResizeMode(QHeaderView::Stretch);
+    // k->table->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+    k->table->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    k->table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 
     QBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->setContentsMargins(1, 1, 1, 1);
diff -Nru tupi-0.2+git04/src/components/paintarea/tupinfowidget.h tupi-0.2+git05/src/components/paintarea/tupinfowidget.h
--- tupi-0.2+git04/src/components/paintarea/tupinfowidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupinfowidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,9 +36,28 @@
 #ifndef TUPINFOWIDGET_H
 #define TUPINFOWIDGET_H
 
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+#include "tseparator.h"
+#include "timagebutton.h"
+#include "tpushbutton.h"
+#include "tupwebhunter.h"
+
 #include <QWidget>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QDesktopWidget>
+#include <QTableWidget>
+#include <QHeaderView>
+#include <QFileDialog>
 
-class TupInfoWidget : public QWidget
+class TUPI_EXPORT TupInfoWidget : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tuplibrarydialog.cpp tupi-0.2+git05/src/components/paintarea/tuplibrarydialog.cpp
--- tupi-0.2+git04/src/components/paintarea/tuplibrarydialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuplibrarydialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,17 +34,6 @@
  ***************************************************************************/
 
 #include "tuplibrarydialog.h"
-#include "tupitempreview.h"
-#include "tformfactory.h"
-#include "tapplicationproperties.h"
-
-#include <QVBoxLayout>
-#include <QDialogButtonBox>
-#include <QToolBox>
-#include <QGraphicsItem>
-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QMap>
 
 struct TupLibraryDialog::Private
 {
diff -Nru tupi-0.2+git04/src/components/paintarea/tuplibrarydialog.h tupi-0.2+git05/src/components/paintarea/tuplibrarydialog.h
--- tupi-0.2+git04/src/components/paintarea/tuplibrarydialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuplibrarydialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,25 @@
 #ifndef TUPLIBRARYDIALOG_H
 #define TUPLIBRARYDIALOG_H
 
+#include "tglobal.h"
+#include "tupitempreview.h"
+#include "tformfactory.h"
+#include "tapplicationproperties.h"
+
 #include <QDialog>
-class QGraphicsItem;
+#include <QVBoxLayout>
+#include <QDialogButtonBox>
+#include <QToolBox>
+#include <QGraphicsItem>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QMap>
 
 /**
  * @author David Cuadrado
 **/
 
-class TupLibraryDialog : public QDialog
+class TUPI_EXPORT TupLibraryDialog : public QDialog
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tuponionopacitydialog.cpp tupi-0.2+git05/src/components/paintarea/tuponionopacitydialog.cpp
--- tupi-0.2+git04/src/components/paintarea/tuponionopacitydialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuponionopacitydialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,17 +34,6 @@
  ***************************************************************************/
 
 #include "tuponionopacitydialog.h"
-#include "tdebug.h"
-#include "tapplicationproperties.h"
-#include "tseparator.h"
-#include "tuppenthicknesswidget.h"
-#include "timagebutton.h"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QDialogButtonBox>
-#include <cmath>
 
 struct TupOnionOpacityDialog::Private
 {
diff -Nru tupi-0.2+git04/src/components/paintarea/tuponionopacitydialog.h tupi-0.2+git05/src/components/paintarea/tuponionopacitydialog.h
--- tupi-0.2+git04/src/components/paintarea/tuponionopacitydialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuponionopacitydialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,10 +36,20 @@
 #ifndef TUPONIONOPACITYDIALOG_H
 #define TUPONIONOPACITYDIALOG_H
 
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+#include "tseparator.h"
+#include "tuppenthicknesswidget.h"
+#include "timagebutton.h"
+
 #include <QDialog>
 #include <QColor>
+#include <QBoxLayout>
+#include <QLabel>
+#include <QDialogButtonBox>
+#include <cmath>
 
-class TupOnionOpacityDialog : public QDialog
+class TUPI_EXPORT TupOnionOpacityDialog : public QDialog
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppaintareacommand.cpp tupi-0.2+git05/src/components/paintarea/tuppaintareacommand.cpp
--- tupi-0.2+git04/src/components/paintarea/tuppaintareacommand.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppaintareacommand.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,13 +34,6 @@
  ***************************************************************************/
 
 #include "tuppaintareacommand.h"
-#include "tuppaintarea.h"
-#include "tuppaintareaevent.h"
-#include "tupbrushmanager.h"
-
-#include "tdebug.h" 
-
-#include <QVariant>
 
 /**
  * This class defines the undo/redo functions for the paint area
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppaintareacommand.h tupi-0.2+git05/src/components/paintarea/tuppaintareacommand.h
--- tupi-0.2+git04/src/components/paintarea/tuppaintareacommand.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppaintareacommand.h	2014-12-15 14:21:32.000000000 +0000
@@ -33,19 +33,25 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef TUPAINTAREACOMMAND_H
+#ifndef TUPPAINTAREACOMMAND_H
 #define TUPPAINTAREACOMMAND_H
 
+#include "tglobal.h"
+#include "tuppaintarea.h"
+#include "tuppaintareaevent.h"
+#include "tupbrushmanager.h"
+
 #include <QUndoCommand>
+#include <QVariant>
 
-class TupPaintArea;
-class TupPaintAreaEvent;
+// class TupPaintArea;
+// class TupPaintAreaEvent;
 
 /**
  * @author David Cuadrado
 */
 
-class TupPaintAreaCommand : public QUndoCommand
+class TUPI_EXPORT TupPaintAreaCommand : public QUndoCommand
 {
     public:
         TupPaintAreaCommand(TupPaintArea *area, const TupPaintAreaEvent *event);
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppaintarea.cpp tupi-0.2+git05/src/components/paintarea/tuppaintarea.cpp
--- tupi-0.2+git04/src/components/paintarea/tuppaintarea.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppaintarea.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -1,4 +1,4 @@
-/***************************************************************************
+/*y**************************************************************************
  *   Project TUPI: Magia 2D                                                *
  *   Project Contact: info@maefloresta.com                                 *
  *   Project Website: http://www.maefloresta.com                           *
@@ -34,41 +34,6 @@
  ***************************************************************************/
 
 #include "tuppaintarea.h"
-#include "tupbrushmanager.h"
-#include "tupinputdeviceinformation.h"
-
-#include "tuppaintareaevent.h"
-#include "tuppaintarearotator.h"
-#include "tupimagedevice.h"
-#include "tupgraphicsscene.h"
-#include "tconfig.h"
-#include "tapplication.h"
-#include "tdebug.h"
-#include "tuptextitem.h"
-#include "tuplibrarydialog.h"
-#include "tuplibraryobject.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tupprojectresponse.h"
-
-#include "tupscene.h"
-#include "tuplayer.h"
-#include "tupsvgitem.h"
-#include "tuppixmapitem.h"
-#include "node.h"
-#include "tcontrolnode.h"
-#include "tupproject.h"
-#include "tosd.h"
-
-#include <QGraphicsScene>
-#include <QMouseEvent>
-#include <QGraphicsRectItem>
-#include <QPolygon>
-#include <QApplication>
-// #include <QTimer>
-#include <QStyleOptionGraphicsItem>
-#include <QClipboard>
-#include <QMenu>
 
 /**
  * This class defines the behavior of the main paint area when ilustration module is on
@@ -94,9 +59,15 @@
 TupPaintArea::TupPaintArea(TupProject *project, QWidget * parent) : TupPaintAreaBase(parent, project->dimension()), k(new Private)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
+    setAccessibleName("WORKSPACE");
+
     k->canvasEnabled = false;
 
     k->project = project;
@@ -105,26 +76,39 @@
     k->deleteMode = false;
     k->menuOn = false;
 
-    setCurrentScene(0);
     k->currentTool = tr("Pencil");
 
-    if (graphicsScene()->scene())
+    if (graphicsScene()->scene()) {
         graphicsScene()->setCurrentFrame(0, 0);
+        graphicsScene()->setLibrary(project->library());
+    }
+
+    setCurrentScene(0);
 }
 
 TupPaintArea::~TupPaintArea()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupPaintArea()]";
+        #else
+            TEND;
+        #endif
     #endif
 
+    graphicsScene()->clear();
+
     delete k;
 }
 
 void TupPaintArea::setCurrentScene(int index)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::setCurrentScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->project->scenesTotal() > 0) {
@@ -139,8 +123,15 @@
                 graphicsScene()->setCurrentScene(0);
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupPaintArea::setCurrentScene() - [ Fatal Error ] -  No scenes available. Invalid index -> " << index;
-                       tError() << "TupPaintArea::setCurrentScene() - Scenes total -> " << k->project->scenesTotal();
+                    QString msg1 = "TupPaintArea::setCurrentScene() - [ Fatal Error ] -  No scenes available. Invalid index -> " + QString::number(index);
+                    QString msg2 = "TupPaintArea::setCurrentScene() - Scenes total -> " + QString::number(k->project->scenesTotal()); 
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg1;
+                        qDebug() << msg2;
+                    #else
+                        tError() << msg1;
+                        tError() << msg2;
+                    #endif
                 #endif
             }
         }
@@ -150,7 +141,11 @@
 void TupPaintArea::mousePressEvent(QMouseEvent *event)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::mousePressEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (!k->canvasEnabled)
@@ -158,33 +153,46 @@
 
     if (graphicsScene()->currentFrame()->isLocked()) {
         #ifdef K_DEBUG
-               tFatal() << "TupPaintArea::mousePressEvent() - Frame is locked!";
+            QString msg = "TupPaintArea::mousePressEvent() - Frame is locked!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
         return;
     }
 
-    if (k->currentTool.compare(tr("Line Selection")) == 0) {
+    if (k->currentTool.compare(tr("Nodes Selection")) == 0) {
         // If a node is the target... abort!
         if (event->buttons() == Qt::RightButton) {
-            if (qgraphicsitem_cast<TControlNode *>(scene()->itemAt(mapToScene(event->pos()))))
+            // if (qgraphicsitem_cast<TControlNode *>(scene()->itemAt(mapToScene(event->pos()))))
+            if (qgraphicsitem_cast<TControlNode *>(scene()->itemAt(mapToScene(event->pos()), QTransform())))
                 return;
         }
     }
 
-    if (k->currentTool.compare(tr("PolyLine")) == 0) {
-        if (event->buttons() == Qt::RightButton) {
+    if (event->buttons() == Qt::RightButton) {
+        if (k->currentTool.compare(tr("PolyLine")) == 0) {
             emit closePolyLine();
             return;
         }
+
+        if (k->currentTool.compare(tr("Line")) == 0) {
+            emit closeLine();
+            return;
+        }
     }
 
     if (k->currentTool.compare(tr("Object Selection")) == 0) {
         if (event->buttons() == Qt::RightButton) {
             // If a node is the target... abort!
-            if (qgraphicsitem_cast<Node *>(scene()->itemAt(mapToScene(event->pos()))))
+            // if (qgraphicsitem_cast<Node *>(scene()->itemAt(mapToScene(event->pos()))))
+            if (qgraphicsitem_cast<Node *>(scene()->itemAt(mapToScene(event->pos()), QTransform())))
                 return;
 
-            if (QGraphicsItem *item = scene()->itemAt(mapToScene(event->pos()))) {
+            // if (QGraphicsItem *item = scene()->itemAt(mapToScene(event->pos()))) {
+            if (QGraphicsItem *item = scene()->itemAt(mapToScene(event->pos()), QTransform())) {
                 if (item->opacity() == 1) {
                     item->setFlag(QGraphicsItem::ItemIsSelectable, true);
                     // item->setSelected(true);
@@ -282,7 +290,12 @@
 void TupPaintArea::frameResponse(TupFrameResponse *event)
 {
     #ifdef K_DEBUG
-           tDebug() << "TupPaintArea::frameResponse() - [" << event->sceneIndex() << ", " << event->layerIndex() << ", " << event->frameIndex() << "]";
+        QString msg = "TupPaintArea::frameResponse() - [" + QString::number(event->sceneIndex()) + ", " + QString::number(event->layerIndex()) + ", " + QString::number(event->frameIndex()) + "]";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tDebug() << msg;
+        #endif
     #endif
 
     TupGraphicsScene *guiScene = graphicsScene();
@@ -314,11 +327,12 @@
                             guiScene->drawPhotogram(event->frameIndex(), true);
                         } else {
                             guiScene->cleanWorkSpace();
-                            guiScene->drawBackground(guiScene->currentFrameIndex());
+                            guiScene->drawSceneBackground(guiScene->currentFrameIndex());
                         }
 
                         if (guiScene->currentTool()->toolType() == TupToolInterface::Selection)
-                            guiScene->currentTool()->init(graphicsScene());
+                            guiScene->resetCurrentTool();
+                            // guiScene->currentTool()->init(graphicsScene());
                     }
                 break;
                 case TupProjectRequest::Lock:
@@ -340,7 +354,12 @@
         }
     } else {
         #ifdef K_DEBUG
-               tFatal() << "TupPaintArea::frameResponse() - isDrawing() == true! - No action taken!";
+            QString msg = "TupPaintArea::frameResponse() - isDrawing() == true! - No action taken!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
     }
 
@@ -350,63 +369,102 @@
 void TupPaintArea::layerResponse(TupLayerResponse *event)
 {
     #ifdef K_DEBUG
-           tDebug() << "TupPaintArea::layerResponse() - [" << event->sceneIndex() << ", " << event->layerIndex() << "]";
+        QString msg = "TupPaintArea::layerResponse() - [" + QString::number(event->sceneIndex()) + ", " + QString::number(event->layerIndex()) + "]";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tDebug() << msg;
+        #endif
     #endif
 
-    if (event->action() == TupProjectRequest::Add)
-        return;
-
     TupGraphicsScene *guiScene = graphicsScene();
-
     if (!guiScene->scene())
         return;
 
     int frameIndex = guiScene->currentFrameIndex();
 
-    if (event->action() == TupProjectRequest::View)
-        guiScene->setLayerVisible(event->layerIndex(), event->arg().toBool());
-
-    if (event->action() != TupProjectRequest::Add && event->action() != TupProjectRequest::Remove) {
-        if (k->spaceMode == TupProject::FRAMES_EDITION) {
-            guiScene->drawCurrentPhotogram();
-        } else {
-            guiScene->cleanWorkSpace();
-            guiScene->drawBackground(frameIndex);
-        }
+    switch (event->action()) {
+            case TupProjectRequest::Add:
+                {
+                    return;
+                }
+            break;
+            /*
+            case TupProjectRequest::AddLipSync:
+                {
+                    return;
+                }
+            break;
+            */
+            case TupProjectRequest::Remove:
+                {
+                    TupScene *scene = k->project->scene(k->currentSceneIndex);
 
-        viewport()->update(scene()->sceneRect().toRect());
-    } else {
-        if (event->action() == TupProjectRequest::Remove) {
-            TupScene *scene = k->project->scene(k->currentSceneIndex);
+                    if (scene->layersTotal() > 1) {
+                        if (event->layerIndex() != 0)
+                            guiScene->setCurrentFrame(event->layerIndex() - 1, frameIndex);
+                        else
+                            guiScene->setCurrentFrame(event->layerIndex() + 1, frameIndex);
 
-            if (scene->layersTotal() > 1) {
-                if (event->layerIndex() != 0)
-                    guiScene->setCurrentFrame(event->layerIndex() - 1, frameIndex);
-                else 
-                    guiScene->setCurrentFrame(event->layerIndex() + 1, frameIndex);
+                        if (k->spaceMode == TupProject::FRAMES_EDITION) {
+                            guiScene->drawCurrentPhotogram();
+                        } else {
+                            guiScene->cleanWorkSpace();
+                            guiScene->drawSceneBackground(frameIndex);
+                        }
+                    } else {
+                        if (scene->layersTotal() == 1) {
+                            // QList<int> indexes = scene->layerIndexes();
+                            // guiScene->setCurrentFrame(indexes.at(0), frameIndex);
+
+                            guiScene->setCurrentFrame(0, frameIndex);
+                            if (k->spaceMode == TupProject::FRAMES_EDITION) {
+                                guiScene->drawCurrentPhotogram();
+                            } else {
+                                guiScene->cleanWorkSpace();
+                                guiScene->drawSceneBackground(frameIndex);
+                            }
+                        }
+                    }
 
-                if (k->spaceMode == TupProject::FRAMES_EDITION) {
-                    guiScene->drawCurrentPhotogram();
-                } else {
-                    guiScene->cleanWorkSpace();
-                    guiScene->drawBackground(frameIndex);
+                    viewport()->update();
                 }
-            } else {
-                if (scene->layersTotal() == 1) {
-                    QList<int> indexes = scene->layerIndexes();
-
-                    guiScene->setCurrentFrame(indexes.at(0), frameIndex);                
+            break;
+            case TupProjectRequest::TupProjectRequest::View:
+                {
+                    guiScene->setLayerVisible(event->layerIndex(), event->arg().toBool());
                     if (k->spaceMode == TupProject::FRAMES_EDITION) {
                         guiScene->drawCurrentPhotogram();
                     } else {
                         guiScene->cleanWorkSpace();
-                        guiScene->drawBackground(frameIndex);
+                        guiScene->drawSceneBackground(frameIndex);
                     }
-                } 
-            }
-
-            viewport()->update();
-        }
+                    viewport()->update(scene()->sceneRect().toRect());
+                }
+            break;
+            case TupProjectRequest::TupProjectRequest::Move:
+                {
+                    guiScene->setCurrentFrame(event->arg().toInt(), frameIndex);
+                    if (k->spaceMode == TupProject::FRAMES_EDITION) {
+                        guiScene->drawCurrentPhotogram();
+                    } else {
+                        guiScene->cleanWorkSpace();
+                        guiScene->drawSceneBackground(frameIndex);
+                    }
+                    viewport()->update(scene()->sceneRect().toRect());
+                }
+            break;
+            default:
+                {
+                    if (k->spaceMode == TupProject::FRAMES_EDITION) {
+                        guiScene->drawCurrentPhotogram();
+                    } else {
+                        guiScene->cleanWorkSpace();
+                        guiScene->drawSceneBackground(frameIndex);
+                    }
+                    viewport()->update(scene()->sceneRect().toRect());
+                }
+            break;
     }
 
     guiScene->layerResponse(event);
@@ -415,7 +473,12 @@
 void TupPaintArea::sceneResponse(TupSceneResponse *event)
 {
     #ifdef K_DEBUG
-           tDebug() << "TupPaintArea::sceneResponse() - [" << event->sceneIndex() << "]";
+        QString msg = "TupPaintArea::sceneResponse() - [" + QString::number(event->sceneIndex()) + "]";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tDebug() << msg;
+        #endif
     #endif
 
     TupGraphicsScene *guiScene = graphicsScene();
@@ -459,14 +522,24 @@
             default: 
                 {
                     #ifdef K_DEBUG
-                           tFatal() << "TupPaintArea::sceneResponse <- TupProjectRequest::Default";
+                        QString msg = "TupPaintArea::sceneResponse <- TupProjectRequest::Default";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tFatal() << msg;
+                        #endif
                     #endif
                 }
                 break;
         }
     } else {
         #ifdef K_DEBUG
-               tFatal() << "TupPaintArea::sceneResponse() - isDrawing() == true! - No action taken!";
+            QString msg = "TupPaintArea::sceneResponse() - isDrawing() == true! - No action taken!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
     }
 
@@ -476,7 +549,12 @@
 void TupPaintArea::itemResponse(TupItemResponse *event)
 {
     #ifdef K_DEBUG
-           tDebug() << "TupPaintArea::itemResponse() - [" << event->sceneIndex() << ", " << event->layerIndex() << ", " << event->frameIndex() << "]";
+        QString msg = "TupPaintArea::itemResponse() - [" + QString::number(event->sceneIndex()) + ", " + QString::number(event->layerIndex()) + ", " + QString::number(event->frameIndex()) + "]";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tDebug() << msg;
+        #endif
     #endif
 
     TupGraphicsScene *guiScene = graphicsScene();
@@ -499,7 +577,7 @@
                              guiScene->drawCurrentPhotogram();
                          } else {
                              guiScene->cleanWorkSpace();
-                             guiScene->drawBackground(guiScene->currentFrameIndex());
+                             guiScene->drawSceneBackground(guiScene->currentFrameIndex());
                          }
 
                          viewport()->update(scene()->sceneRect().toRect());
@@ -507,25 +585,36 @@
                 }
                 break;
 
+           case TupProjectRequest::Move:
+                {
+                     // Do nothing
+                }
+                break;
            default:
                 {
                      if (k->spaceMode == TupProject::FRAMES_EDITION) {
-                        guiScene->drawCurrentPhotogram();
+                         guiScene->drawCurrentPhotogram();
                      } else {
                         guiScene->cleanWorkSpace();
-                        guiScene->drawBackground(guiScene->currentFrameIndex());
+                        guiScene->drawSceneBackground(guiScene->currentFrameIndex());
                      }
 
                      viewport()->update(scene()->sceneRect().toRect());
 
                      if (guiScene->currentTool()->toolType() != TupToolInterface::Tweener && k->currentTool.compare(tr("PolyLine")) != 0)
-                         guiScene->currentTool()->init(graphicsScene());          
+                         guiScene->resetCurrentTool();
+                         // guiScene->currentTool()->init(graphicsScene());          
                 }
                 break;
             }
     } else {
         #ifdef K_DEBUG
-               tFatal() << "TupPaintArea::itemResponse() - isDrawing() == true! - No action taken!";
+            QString msg = "TupPaintArea::itemResponse() - isDrawing() == true! - No action taken!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
     }
 
@@ -539,7 +628,12 @@
 void TupPaintArea::libraryResponse(TupLibraryResponse *request)
 {
     #ifdef K_DEBUG
-           tDebug() << "TupPaintArea::libraryResponse() - Request Action: " << request->action();
+        QString msg = "TupPaintArea::libraryResponse() - Request Action: " + QString::number(request->action());
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tDebug() << msg;
+        #endif
     #endif
 
     TupGraphicsScene *guiScene = graphicsScene();
@@ -556,7 +650,7 @@
                              guiScene->drawCurrentPhotogram();
                          } else {
                              guiScene->cleanWorkSpace();
-                             guiScene->drawBackground(frameIndex);
+                             guiScene->drawSceneBackground(frameIndex);
                          }
 
                          viewport()->update(scene()->sceneRect().toRect());
@@ -572,7 +666,7 @@
                              guiScene->drawCurrentPhotogram();
                          } else {
                              guiScene->cleanWorkSpace();
-                             guiScene->drawBackground(frameIndex);
+                             guiScene->drawSceneBackground(frameIndex);
                          }
 
                          viewport()->update(scene()->sceneRect().toRect());
@@ -581,7 +675,12 @@
         } 
     } else {
         #ifdef K_DEBUG
-               tFatal() << "TupPaintArea::libraryResponse() - isDrawing() == true! - No action taken!";
+            QString msg = "TupPaintArea::libraryResponse() - isDrawing() == true! - No action taken!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
     }
 }
@@ -601,10 +700,14 @@
 void TupPaintArea::deleteItems()
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("paintarea");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::deleteItems()]";
+        #else
+            T_FUNCINFOX("paintarea");
+        #endif
     #endif
 
-    if (k->currentTool.compare(tr("Object Selection")) != 0 && k->currentTool.compare(tr("Line Selection")) != 0)
+    if (k->currentTool.compare(tr("Object Selection")) != 0 && k->currentTool.compare(tr("Nodes Selection")) != 0)
         return;
 
     QList<QGraphicsItem *> selected = scene()->selectedItems();
@@ -637,12 +740,22 @@
                                             itemIndex = frame->indexOf(svg);
                                         } else {
                                             #ifdef K_DEBUG
-                                                   tError() << "TupPaintArea::deleteItems() - Fatal Error: Background frame is NULL!";
+                                                QString msg = "TupPaintArea::deleteItems() - Fatal Error: Background frame is NULL!";
+                                                #ifdef Q_OS_WIN32
+                                                    qDebug() << msg;
+                                                #else
+                                                    tError() << msg;
+                                                #endif
                                             #endif
                                         }
                                     } else {
                                         #ifdef K_DEBUG
-                                               tError() << "TupPaintArea::deleteItems() - Fatal Error: Scene has no background element!";
+                                            QString msg = "TupPaintArea::deleteItems() - Fatal Error: Scene has no background element!";
+                                            #ifdef Q_OS_WIN32
+                                                qDebug() << msg;
+                                            #else
+                                                tError() << msg;
+                                            #endif
                                         #endif
                                     }
                          } else if (k->spaceMode == TupProject::DYNAMIC_BACKGROUND_EDITION) {
@@ -653,17 +766,32 @@
                                             itemIndex = frame->indexOf(svg);
                                         } else {
                                             #ifdef K_DEBUG
-                                                   tError() << "TupPaintArea::deleteItems() - Fatal Error: Background frame is NULL!";
+                                                QString msg = "TupPaintArea::deleteItems() - Fatal Error: Background frame is NULL!";
+                                                #ifdef Q_OS_WIN32
+                                                    qDebug() << msg;
+                                                #else
+                                                    tError() << msg;
+                                                #endif
                                             #endif
                                         }
                                     } else {
                                         #ifdef K_DEBUG
-                                               tError() << "TupPaintArea::deleteItems() - Fatal Error: Scene has no background element!";
+                                            QString msg = "TupPaintArea::deleteItems() - Fatal Error: Scene has no background element!";
+                                            #ifdef Q_OS_WIN32
+                                                qDebug() << msg;
+                                            #else
+                                                tError() << msg;
+                                            #endif
                                         #endif
                                     }
                          } else {
                              #ifdef K_DEBUG
-                                    tError() << "TupPaintArea::deleteItems() - Fatal Error: invalid spaceMode!";
+                                 QString msg = "TupPaintArea::deleteItems() - Fatal Error: invalid spaceMode!";
+                                 #ifdef Q_OS_WIN32
+                                     qDebug() << msg;
+                                 #else
+                                     tError() << msg;
+                                 #endif
                              #endif
                          }
                      } else {
@@ -678,12 +806,22 @@
                                             itemIndex = frame->indexOf(item);
                                         } else {
                                             #ifdef K_DEBUG
-                                                   tError() << "TupPaintArea::deleteItems() - Fatal Error: Background frame is NULL!";
+                                                QString msg = "TupPaintArea::deleteItems() - Fatal Error: Background frame is NULL!";
+                                                #ifdef Q_OS_WIN32
+                                                    qDebug() << msg;
+                                                #else
+                                                    tError() << msg;
+                                                #endif
                                             #endif
                                         }
                                     } else {
                                         #ifdef K_DEBUG
-                                               tError() << "TupPaintArea::deleteItems() - Fatal Error: Scene has no background element!";
+                                            QString msg = "TupPaintArea::deleteItems() - Fatal Error: Scene has no background element!";
+                                            #ifdef Q_OS_WIN32
+                                                qDebug() << msg;
+                                            #else
+                                                tError() << msg;
+                                            #endif
                                         #endif
                                     }
                          } else if (k->spaceMode == TupProject::DYNAMIC_BACKGROUND_EDITION) {
@@ -694,17 +832,32 @@
                                             itemIndex = frame->indexOf(item);
                                         } else {
                                             #ifdef K_DEBUG
-                                                   tError() << "TupPaintArea::deleteItems() - Fatal Error: Background frame is NULL!";
+                                                QString msg = "TupPaintArea::deleteItems() - Fatal Error: Background frame is NULL!";
+                                                #ifdef Q_OS_WIN32
+                                                    qDebug() << msg;
+                                                #else
+                                                    tError() << msg;
+                                                #endif
                                             #endif
                                         }
                                     } else {
                                         #ifdef K_DEBUG
-                                               tError() << "TupPaintArea::deleteItems() - Fatal Error: Scene has no background element!";
+                                            QString msg = "TupPaintArea::deleteItems() - Fatal Error: Scene has no background element!";
+                                            #ifdef Q_OS_WIN32
+                                                qDebug() << msg;
+                                            #else
+                                                tError() << msg;
+                                            #endif
                                         #endif
                                     }
                          } else {
                              #ifdef K_DEBUG
-                                    tError() << "TupPaintArea::deleteItems() - Fatal Error: invalid spaceMode!";
+                                 QString msg = "TupPaintArea::deleteItems() - Fatal Error: invalid spaceMode!";
+                                 #ifdef Q_OS_WIN32
+                                     qDebug() << msg;
+                                 #else
+                                     tError() << msg;
+                                 #endif
                              #endif
                          }
                      }
@@ -718,7 +871,12 @@
                          emit requestTriggered(&event);
                      } else {
                          #ifdef K_DEBUG
-                                tFatal() << "TupPaintArea::deleteItems() - Fatal Error: Invalid item index";
+                             QString msg = "TupPaintArea::deleteItems() - Fatal Error: Invalid item index";
+                             #ifdef Q_OS_WIN32
+                                 qDebug() << msg;
+                             #else
+                                 tFatal() << msg;
+                             #endif
                          #endif
                      }
 
@@ -729,41 +887,7 @@
     }
 }
 
-void TupPaintArea::groupItems()
-{
-    // T_FUNCINFO;
-    QList<QGraphicsItem *> selected = scene()->selectedItems();
-
-    if (!selected.isEmpty()) {
-        QString strItems= "";
-        TupGraphicsScene *currentScene = graphicsScene();
-        int firstItem = -1;
-
-        if (currentScene) {
-            foreach (QGraphicsItem *item, selected) {
-                     if (currentScene->currentFrame()->indexOf(item) != -1) {
-                         if (strItems.isEmpty()) {
-                             strItems +="("+ QString::number(currentScene->currentFrame()->indexOf(item));
-                             firstItem = currentScene->currentFrame()->indexOf(item);
-                         } else {
-                             strItems += " , " + 
-                             QString::number(currentScene->currentFrame()->indexOf(item));
-                         }
-                     }
-            }
-            strItems+= ")";
-        }
-
-        if (strItems != ")") {
-            TupProjectRequest event = TupRequestBuilder::createItemRequest(currentScene->currentSceneIndex(), 
-                                     currentScene->currentLayerIndex(),
-                                     currentScene->currentFrameIndex(), firstItem, QPointF(), k->spaceMode,
-                                     TupLibraryObject::Item, TupProjectRequest::Group, strItems);
-            emit requestTriggered(&event);
-        }
-    }
-}
-
+/*
 void TupPaintArea::ungroupItems()
 {
     QList<QGraphicsItem *> selected = scene()->selectedItems();
@@ -783,11 +907,16 @@
         }
     }
 }
+*/
 
 void TupPaintArea::copyItems()
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("paintarea");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::copyItems()]";
+        #else
+            T_FUNCINFOX("paintarea");
+        #endif
     #endif
 
     k->copiesXml.clear();
@@ -838,14 +967,17 @@
 void TupPaintArea::pasteItems()
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("paintarea");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::pasteItems()]";
+        #else
+            T_FUNCINFOX("paintarea");
+        #endif
     #endif
 
     TupGraphicsScene* currentScene = graphicsScene();
 
-    if (!k->menuOn) {
+    if (!k->menuOn)
         k->position = viewPosition();
-    }
     
     // QPointF point = k->position - k->oldPosition;
 
@@ -889,7 +1021,11 @@
 void TupPaintArea::multipasteObject(int pasteTotal)
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("paintarea");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::multipasteObject()]";
+        #else
+            T_FUNCINFOX("paintarea");
+        #endif
     #endif
 
     TupGraphicsScene* currentScene = graphicsScene();
@@ -967,8 +1103,13 @@
 void TupPaintArea::cutItems()
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("paintarea");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::cutItems()]";
+        #else
+            T_FUNCINFOX("paintarea");
+        #endif
     #endif
+
     copyItems();
     deleteItems();
 }
@@ -976,7 +1117,11 @@
 void TupPaintArea::setNextFramesOnionSkinCount(int n)
 {
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::setNextFramesOnionSkinCount()]";
+        #else
+            T_FUNCINFOX("paintarea");
+        #endif
     #endif
 
     if (TupGraphicsScene* currentScene = graphicsScene())
@@ -986,7 +1131,11 @@
 void TupPaintArea::setPreviousFramesOnionSkinCount(int n)
 {
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::setPreviousFramesOnionSkinCount()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (TupGraphicsScene* currentScene = graphicsScene())
@@ -996,7 +1145,11 @@
 void TupPaintArea::addSelectedItemsToLibrary()
 {
     #ifdef K_DEBUG
-           tDebug("paintarea") << "Adding to library";
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::addSelectedItemsToLibrary()]";
+        #else
+            tDebug("paintarea") << "TupPaintArea::addSelectedItemsToLibrary()";
+        #endif
     #endif
 
     QList<QGraphicsItem *> selected = scene()->selectedItems();
@@ -1021,7 +1174,7 @@
                  doc.appendChild(itemSerializable->toXml(doc));
 
                  TupProjectRequest request = TupRequestBuilder::createLibraryRequest(TupProjectRequest::Add, 
-                                            symName, TupLibraryObject::Item, k->spaceMode, doc.toString().toLocal8Bit(), QString());
+                                             symName, TupLibraryObject::Item, k->spaceMode, doc.toString().toLocal8Bit(), QString());
                  emit requestTriggered(&request);
              }
     }
@@ -1030,7 +1183,11 @@
 void TupPaintArea::requestItemMovement(QAction *action)
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("paintarea");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::requestItemMovement()]";
+        #else
+            T_FUNCINFOX("paintarea");
+        #endif
     #endif
 
     QList<QGraphicsItem *> selected = scene()->selectedItems();
@@ -1067,12 +1224,22 @@
                      emit requestTriggered(&event);
                  } else {
                      #ifdef K_DEBUG
-                            tError() << "TupPaintArea::requestItemMovement() - Fatal error: Invalid action [ " << moveType << " ]";
+                         QString msg = "TupPaintArea::requestItemMovement() - Fatal error: Invalid action [ " + QString::number(moveType) + " ]";
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError() << msg;
+                         #endif
                      #endif
                  }
              } else {
                  #ifdef K_DEBUG
-                        tError() << "TupPaintArea::requestItemMovement() - Fatal error: Invalid object index [ " << index << " ]";
+                     QString msg = "TupPaintArea::requestItemMovement() - Fatal error: Invalid object index [ " + QString::number(index) + " ]";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
              }
     }
@@ -1081,7 +1248,11 @@
 void TupPaintArea::updatePaintArea() 
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::updatePaintArea()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->spaceMode == TupProject::FRAMES_EDITION) {
@@ -1095,19 +1266,28 @@
 void TupPaintArea::paintBackground()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::paintBackground()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TupGraphicsScene* currentScene = graphicsScene();
     currentScene->cleanWorkSpace();
-    currentScene->drawBackground(currentScene->currentFrameIndex());
+    currentScene->drawSceneBackground(currentScene->currentFrameIndex());
 }
 
 void TupPaintArea::setCurrentTool(QString tool) 
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-           SHOW_VAR(tool);
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::setCurrentTool()]";
+            qDebug() << "SHOW_VAR : " << tool;
+        #else
+            T_FUNCINFO;
+            SHOW_VAR(tool);
+        #endif
     #endif
 
     k->currentTool = tool;
@@ -1117,7 +1297,11 @@
 void TupPaintArea::updateSpaceContext()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::updateSpaceContext()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TupGraphicsScene* currentScene = graphicsScene();
@@ -1134,13 +1318,31 @@
 void TupPaintArea::keyPressEvent(QKeyEvent *event)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        QString msg1 = "TupPaintArea::keyPressEvent() - Current tool: " + k->currentTool;
+        QString msg2 = "TupPaintArea::keyPressEvent() - Key: " + QString::number(event->key());
+        QString msg3 = "TupPaintArea::keyPressEvent() - Key: " + event->text(); 
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintArea::keyPressEvent()]";
+            qDebug() << msg1;
+            qDebug() << msg2;
+            qDebug() << msg3;
+        #else
+            T_FUNCINFO;
+            tDebug() << msg1;
+            tDebug() << msg2;
+            tDebug() << msg3;
+        #endif
     #endif
 
-    #ifdef K_DEBUG
-           tWarning() << "TupPaintArea::keyPressEvent() - Current tool: " << k->currentTool;
-           tWarning() << "TupPaintArea::keyPressEvent() - Key: " << event->key();
-    #endif
+    if (event->key() == Qt::Key_1 || event->key() == Qt::Key_Plus) {
+        emit zoomIn();
+        return;
+    }
+
+    if (event->key() == Qt::Key_2 || event->key() == Qt::Key_Minus) {
+        emit zoomOut();
+        return;
+    }
 
     if (k->currentTool.compare(tr("PolyLine")) == 0) {
         if (event->key() == Qt::Key_X)
@@ -1305,3 +1507,14 @@
     return graphicsScene()->currentFrameIndex();
 }
 
+void TupPaintArea::resetWorkSpaceCenter(const QSize projectSize)
+{
+    int centerX = projectSize.width()/2;
+    int centerY = projectSize.height()/2;
+
+    foreach (QGraphicsView *view, graphicsScene()->views()) {
+             view->centerOn(QPointF(centerX, centerY));
+             view->setSceneRect(0, 0, projectSize.width(), projectSize.height());
+    }
+}
+
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppaintarea.h tupi-0.2+git05/src/components/paintarea/tuppaintarea.h
--- tupi-0.2+git04/src/components/paintarea/tuppaintarea.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppaintarea.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,44 @@
 #ifndef TUPPAINTAREA_H
 #define TUPPAINTAREA_H
 
+#include "tglobal.h"
 #include "tuppaintareabase.h"
 #include "tupabstractprojectresponsehandler.h"
 #include "tupgraphicsscene.h"
+#include "tupbrushmanager.h"
+#include "tupinputdeviceinformation.h"
+#include "tuppaintareaevent.h"
+#include "tuppaintarearotator.h"
+#include "tupimagedevice.h"
+#include "tupgraphicsscene.h"
+#include "tconfig.h"
+#include "tapplication.h"
+#include "tuptextitem.h"
+#include "tuplibrarydialog.h"
+#include "tuplibraryobject.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tupprojectresponse.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+#include "tupsvgitem.h"
+#include "tuppixmapitem.h"
+#include "node.h"
+#include "tcontrolnode.h"
+#include "tupproject.h"
+#include "tosd.h"
+
+#include <QGraphicsScene>
+#include <QMouseEvent>
+#include <QGraphicsRectItem>
+#include <QPolygon>
+#include <QApplication>
+// #include <QTimer>
+#include <QStyleOptionGraphicsItem>
+#include <QClipboard>
+#include <QMenu>
 
-// #include <QTabletEvent>
-
-class QGraphicsRectItem;
+// class QGraphicsRectItem;
 class TupBrushManager;
 class TupInputDeviceInformation;
 class TupProject;
@@ -53,7 +84,7 @@
  * @author Jorge Cuadrado - David Cuadrado
 */
 
-class TupPaintArea : public TupPaintAreaBase, public TupAbstractProjectResponseHandler
+class TUPI_EXPORT TupPaintArea : public TupPaintAreaBase, public TupAbstractProjectResponseHandler
 {
     Q_OBJECT
 
@@ -78,6 +109,7 @@
         int currentSceneIndex();
         int currentLayerIndex();
         int currentFrameIndex();
+        void resetWorkSpaceCenter(const QSize projectSize);
 
     public slots:
         void setNextFramesOnionSkinCount(int n);
@@ -90,12 +122,14 @@
         void itemAddedOnSelection(TupGraphicsScene *);
         void frameChanged(int);
         void closePolyLine();
+        void closeLine();
         void updateStatusBgColor(const QColor color);
+        void zoomIn();
+        void zoomOut();
 
     public slots:
         void deleteItems();
-        void groupItems();
-        void ungroupItems();
+        // void ungroupItems();
         void copyItems();
         void pasteItems();
         void pasteNextFive();
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppaintareastatus.cpp tupi-0.2+git05/src/components/paintarea/tuppaintareastatus.cpp
--- tupi-0.2+git04/src/components/paintarea/tuppaintareastatus.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppaintareastatus.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,23 +34,6 @@
  ***************************************************************************/
 
 #include "tuppaintareastatus.h"
-#include "tseparator.h"
-#include "tdebug.h"
-#include "tupglobal.h"
-#include "tupbrushmanager.h"
-#include "tupcolorwidget.h"
-#include "tupbrushstatus.h"
-#include "tuptoolstatus.h"
-
-#include <QPushButton>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QIntValidator>
-#include <QObject>
-#include <QLineEdit>
-#include <QDir>
 
 ////////////////
 
@@ -88,6 +71,14 @@
 
     addPermanentWidget(k->positionLabel, 1);
 
+    QPushButton *resetWSButton = new QPushButton(QIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "reset_workspace.png")), "");
+    resetWSButton->setIconSize(QSize(16, 16));
+    resetWSButton->setToolTip(tr("Reset WorkSpace"));
+    resetWSButton->setShortcut(QKeySequence(tr("+")));
+    connect(resetWSButton, SIGNAL(clicked()), k->documentView, SLOT(resetWorkSpaceTransformations()));
+
+    addPermanentWidget(resetWSButton);
+
     QPushButton *actionSafeAreaButton = new QPushButton(QIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "safe_area.png")), "");
     actionSafeAreaButton->setIconSize(QSize(16, 16));
     actionSafeAreaButton->setToolTip(tr("Action Safe Area"));
@@ -225,6 +216,8 @@
 
     k->toolStatus = new TupToolStatus;
     addPermanentWidget(k->toolStatus);
+
+    setMinimumWidth(700);
 }
 
 TupPaintAreaStatus::~TupPaintAreaStatus()
@@ -271,14 +264,20 @@
     int input = text.toInt();
     qreal factor = (qreal)input / (qreal)k->scaleFactor;
 
-    k->documentView->setZoom(factor);
+    k->documentView->setZoomFactor(factor);
     k->scaleFactor = input;
 }
 
-void TupPaintAreaStatus::setZoomFactor(const QString &text)
+void TupPaintAreaStatus::setZoomPercent(const QString &percent)
+{
+    updateZoomField(percent);
+    applyZoom(percent);
+}
+
+void TupPaintAreaStatus::setRotationAngle(const QString &angle)
 {
-    updateZoomField(text);
-    applyZoom(text);
+    updateRotationField(angle);
+    applyRotation(angle);
 }
 
 void TupPaintAreaStatus::updateZoomField(const QString &text)
@@ -290,6 +289,15 @@
         k->zoom->setEditText(text);
 }
 
+void TupPaintAreaStatus::updateRotationField(const QString &text)
+{
+    int index = k->rotation->findText(text);
+    if (index != -1)
+        k->rotation->setCurrentIndex(index);
+    else
+        k->rotation->setEditText(text);
+}
+
 qreal TupPaintAreaStatus::currentZoomFactor()
 {
     return k->scaleFactor;
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppaintareastatus.h tupi-0.2+git05/src/components/paintarea/tuppaintareastatus.h
--- tupi-0.2+git04/src/components/paintarea/tuppaintareastatus.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppaintareastatus.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,30 @@
 #ifndef TUPPAINTAREASTATUS_H
 #define TUPPAINTAREASTATUS_H
 
+#include "tglobal.h"
 #include "tupdocumentview.h"
+#include "tseparator.h"
+#include "tupbrushmanager.h"
+#include "tupcolorwidget.h"
+#include "tupbrushstatus.h"
+#include "tuptoolstatus.h"
+
 #include <QStatusBar>
+#include <QPushButton>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QIntValidator>
+#include <QObject>
+#include <QLineEdit>
+#include <QDir>
 
 /**
  * @author David Cuadrado
 */
 
-class TupPaintAreaStatus : public QStatusBar
+class TUPI_EXPORT TupPaintAreaStatus : public QStatusBar
 {
     Q_OBJECT
 
@@ -51,7 +67,8 @@
         TupPaintAreaStatus(TupDocumentView *parent);
         ~TupPaintAreaStatus();
         void updateTool(const QString &label, const QPixmap &pixmap);
-        void setZoomFactor(const QString &text);
+        void setZoomPercent(const QString &percent);
+        void setRotationAngle(const QString &angle);
         void updateZoomFactor(double factor);
         qreal currentZoomFactor();
         void updateRotationAngle(int angle);
@@ -62,11 +79,11 @@
     public slots:
         void applyZoom(const QString &text);
         void setPen(const QPen &pen);
+        void applyRotation(const QString &text);
 
     private slots:
         void selectAntialiasingHint();
         void selectRenderer(int id);
-        void applyRotation(const QString &text);
         void updateFrameIndex(int index);
         void updateFramePointer();
 
@@ -77,6 +94,7 @@
 
     private:
         void updateZoomField(const QString &text);
+        void updateRotationField(const QString &angle);
         struct Private;
         Private *const k;
 };
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppapagayodialog.cpp tupi-0.2+git05/src/components/paintarea/tuppapagayodialog.cpp
--- tupi-0.2+git04/src/components/paintarea/tuppapagayodialog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppapagayodialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,151 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tuppapagayodialog.h"
+
+struct TupPapagayoDialog::Private
+{
+    QLineEdit *filePath;
+    QLineEdit *imagesPath;
+    QLineEdit *soundPath;
+};
+
+TupPapagayoDialog::TupPapagayoDialog() : QDialog(), k(new Private)
+{
+    setWindowTitle(tr("Import Papagayo project"));
+    setWindowIcon(QIcon(QPixmap(THEME_DIR + "icons/papagayo.png")));
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+
+    QHBoxLayout *blockLayout = new QHBoxLayout;
+    QVBoxLayout *buttonsLayout = new QVBoxLayout;
+    QVBoxLayout *textLayout = new QVBoxLayout;
+
+    QPushButton *fileButton = new QPushButton(QIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "papagayo.png")), " " + tr("&Load PGO File"), this); 
+    connect(fileButton, SIGNAL(clicked()), this, SLOT(openFileDialog()));
+
+    QPushButton *imagesButton = new QPushButton(QIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "bitmap_array.png")), " " + tr("Load &Images"), this);
+    connect(imagesButton, SIGNAL(clicked()), this, SLOT(openImagesDialog()));
+
+    QPushButton *soundButton = new QPushButton(QIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "bitmap_array.png")), " " + tr("Load &Sound"), this);
+    connect(soundButton, SIGNAL(clicked()), this, SLOT(openSoundDialog()));
+
+    buttonsLayout->addWidget(fileButton);
+    buttonsLayout->addWidget(imagesButton);
+    buttonsLayout->addWidget(soundButton);
+
+    k->filePath = new QLineEdit();
+    k->filePath->setReadOnly(true);
+    k->imagesPath = new QLineEdit();
+    k->imagesPath->setReadOnly(true);
+    k->soundPath = new QLineEdit();
+    k->soundPath->setReadOnly(true);
+
+    textLayout->addWidget(k->filePath);
+    textLayout->addWidget(k->imagesPath);
+    textLayout->addWidget(k->soundPath);
+
+    blockLayout->addLayout(buttonsLayout);
+    blockLayout->addLayout(textLayout);
+
+    layout->addLayout(blockLayout);
+
+    QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok 
+                                | QDialogButtonBox::Cancel, Qt::Horizontal);
+    connect(buttons, SIGNAL(accepted()), this, SLOT(checkRecords()));
+    connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
+
+    layout->addWidget(buttons, 0, Qt::AlignCenter);
+}
+
+TupPapagayoDialog::~TupPapagayoDialog()
+{
+    delete k;
+}
+
+void TupPapagayoDialog::openFileDialog()
+{
+    QString file = QFileDialog::getOpenFileName(this, tr("Load Papagayo project"), QDir::homePath(), tr("Papagayo Project (*.pgo)"));
+    k->filePath->setText(file);
+}
+
+void TupPapagayoDialog::openImagesDialog()
+{
+    QString path = QFileDialog::getExistingDirectory(this, tr("Choose the images directory..."), getenv("HOME"), 
+                                                     QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+    k->imagesPath->setText(path);
+}
+
+void TupPapagayoDialog::openSoundDialog()
+{
+    QString file = QFileDialog::getOpenFileName(this, tr("Load sound file"), QDir::homePath(), tr("Sound file (*.ogg *.wav *.mp3)"));
+    k->soundPath->setText(file);
+}
+
+void TupPapagayoDialog::checkRecords()
+{
+    if (k->filePath->text().length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("PGO path is unset!"), TOsd::Error);
+        return;
+    }
+
+    if (k->imagesPath->text().length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Images directory is unset!"), TOsd::Error);
+        return;
+    }
+
+    if (k->soundPath->text().length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Sound path is unset!"), TOsd::Error);
+        return;
+    }
+
+    accept();
+}
+
+QString TupPapagayoDialog::getPGOFile() const
+{
+    return k->filePath->text();
+}
+
+QString TupPapagayoDialog::getImagesFile() const
+{
+    return k->imagesPath->text();
+}
+
+QString TupPapagayoDialog::getSoundFile() const
+{
+    return k->soundPath->text();
+}
+
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppapagayodialog.h tupi-0.2+git05/src/components/paintarea/tuppapagayodialog.h
--- tupi-0.2+git04/src/components/paintarea/tuppapagayodialog.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppapagayodialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,77 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TUPPAPAGAYODIALOG_H
+#define TUPPAPAGAYODIALOG_H
+
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+#include "tosd.h"
+
+#include <QDialog>
+#include <QBoxLayout>
+#include <QDialogButtonBox>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QFileDialog>
+
+/**
+ * @author David Cuadrado
+**/
+
+class TUPI_EXPORT TupPapagayoDialog : public QDialog
+{
+    Q_OBJECT
+
+    public:
+        TupPapagayoDialog();
+        ~TupPapagayoDialog();
+        QString getPGOFile() const;
+        QString getImagesFile() const;
+        QString getSoundFile() const;
+
+    private slots:
+        void openFileDialog();
+        void openImagesDialog();
+        void openSoundDialog();
+        void checkRecords();
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppapagayoimporter.cpp tupi-0.2+git05/src/components/paintarea/tuppapagayoimporter.cpp
--- tupi-0.2+git04/src/components/paintarea/tuppapagayoimporter.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppapagayoimporter.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,222 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     *
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tuppapagayoimporter.h" 
+
+struct TupPapagayoImporter::Private
+{
+    bool isValid;
+    int framesTotal;
+    int fps;
+    TupLipSync *lipsync;
+};
+
+TupPapagayoImporter::TupPapagayoImporter(const QString &file, const QSize &projectSize, 
+                                         const QSize &mouthSize, const QString &extension, int initFrame) : QObject(), k(new Private)
+{
+    k->framesTotal = 0;
+    k->isValid = true;
+    QFile input(file);
+
+    QFileInfo info(file);
+    QString name = info.fileName().toLower();
+    k->lipsync = new TupLipSync();
+    k->lipsync->setName(name);
+    k->lipsync->setInitFrame(initFrame);
+    k->lipsync->setPicsExtension(extension);
+
+    if (input.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QTextStream stream(&input);
+        int i = 0;
+        int voicesNumber = 0;
+        QString line;
+        while (i < 5) {
+               line = stream.readLine(); 
+               switch (i) {
+                   case 0:
+                   {
+                       if (!line.startsWith("lipsync version")) {
+                           k->isValid = false;      
+                           return;
+                       }
+                   } 
+                   break;
+                   /*
+                   case 1:
+                   {
+                       // Load audio file
+                       k->lipsync->setSoundFile(line.trimmed());
+                   }
+                   break;
+                   */
+                   case 2:
+                   {
+                       // FPS 
+                       k->fps = line.trimmed().toInt();
+                       k->lipsync->setFPS(k->fps);
+                   }
+                   break;
+                   case 4:
+                   {
+                       // Total of voices 
+                       voicesNumber = line.trimmed().toInt();
+                   }
+                   break;
+               }
+               i++;
+        }
+
+        int x = projectSize.width()/(voicesNumber+1) - (mouthSize.width()/2);
+        int y = projectSize.height()/2 - (mouthSize.height()/2); 
+
+        for(int j=1; j<=voicesNumber; j++) {
+            TupVoice *voice = new TupVoice(); 
+            x = x*j;
+            voice->setMouthPos(QPoint(x, y));
+            voice->setVoiceTitle(stream.readLine().trimmed());
+            voice->setText(stream.readLine().trimmed());
+            int numPhrases = stream.readLine().toInt();
+            int numPhonemes = 0;
+            int numWords;
+            QString str;
+            for (int p = 0; p < numPhrases; p++) {
+                 QString text = stream.readLine().trimmed();
+                 int initFrame = stream.readLine().toInt();
+                 // int endFrame = stream.readLine().toInt();
+                 stream.readLine();
+                 TupPhrase *phrase = new TupPhrase(initFrame);
+                 numWords = stream.readLine().toInt();
+                 for (int w = 0; w < numWords; w++) {
+                      QString str = stream.readLine().trimmed();
+                      QStringList strList = str.split(' ', QString::SkipEmptyParts);
+                      QString strWord; 
+                      int firstFrame = 0;
+                      int lastFrame = 0;
+                      TupWord *word = 0;
+                      if (strList.size() >= 4) {
+                          strWord = strList.at(0);   
+                          firstFrame = strList.at(1).toInt();
+                          word = new TupWord(firstFrame);
+                          lastFrame = strList.at(2).toInt();
+                          numPhonemes = strList.at(3).toInt();
+                      }
+                      QList<int> frames;
+                      QList<QString> blocks;
+                      for (int ph = 0; ph < numPhonemes; ph++) {
+                           str = stream.readLine().trimmed();
+                           QStringList strList = str.split(' ', QString::SkipEmptyParts);
+                           if (strList.size() >= 2) {
+                               frames << strList.at(0).toInt();
+                               blocks << strList.at(1).toLower();
+                           }
+                      } // for ph
+
+                      for (int ph = 0; ph < numPhonemes-1; ph++) {
+                           int total = frames.at(ph+1) - frames.at(ph);
+                           TupPhoneme *phoneme = new TupPhoneme(blocks.at(ph), total);
+                           word->addPhoneme(phoneme);
+                      } // for ph
+
+                      int total = (lastFrame - frames.at(numPhonemes-1)) + 1;
+                      TupPhoneme *phoneme = new TupPhoneme(blocks.at(numPhonemes-1), total);
+                      word->addPhoneme(phoneme);
+
+                      if (w == numWords - 1) {
+                          if (lastFrame > k->framesTotal)
+                              k->framesTotal = lastFrame;
+                      }
+                      phrase->addWord(word);
+                 } // for w
+                 voice->addPhrase(phrase); 
+            }
+            k->lipsync->addVoice(voice);
+        }
+        k->framesTotal++;
+        k->lipsync->setFramesTotal(k->framesTotal);
+    } else {
+        k->isValid = false;
+        #ifdef K_DEBUG
+            QString msg = "TupPapagayoImporter() - Fatal Error: Insufficient permissions to load file! -> " + file;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return;
+    }
+
+    input.close();
+}
+
+TupPapagayoImporter::~TupPapagayoImporter()
+{
+}
+
+void TupPapagayoImporter::setSoundFile(const QString &soundFile)
+{
+    k->lipsync->setSoundFile(soundFile);
+}
+
+bool TupPapagayoImporter::fileIsValid()
+{
+    return k->isValid;
+}
+
+QString TupPapagayoImporter::file2Text() const
+{
+    QDomDocument document;
+    QDomElement root = k->lipsync->toXml(document);
+
+    QString xml;
+    {
+      QTextStream ts(&xml);
+      ts << root;
+    }
+
+    return xml;
+}
+
+int TupPapagayoImporter::framesTotal()
+{
+    return k->framesTotal;
+}
+
+int TupPapagayoImporter::fps()
+{
+    return k->fps;
+}
+
+
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppapagayoimporter.h tupi-0.2+git05/src/components/paintarea/tuppapagayoimporter.h
--- tupi-0.2+git04/src/components/paintarea/tuppapagayoimporter.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppapagayoimporter.h	2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,65 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     *
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TUPPAPAGAYOIMPORTER_H
+#define TUPPAPAGAYOIMPORTER_H
+
+#include "tglobal.h"
+#include "tuplipsync.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QSize>
+
+class TUPI_EXPORT TupPapagayoImporter : public QObject
+{
+    Q_OBJECT
+
+    public:
+        TupPapagayoImporter(const QString &file, const QSize &projectSize, const QSize &mouthSize, const QString &extension, int initFrame);
+        ~TupPapagayoImporter();
+        void setSoundFile(const QString &soundFile);
+        bool fileIsValid();
+        QString file2Text() const;
+        int framesTotal();
+        int fps();
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppendialog.cpp tupi-0.2+git05/src/components/paintarea/tuppendialog.cpp
--- tupi-0.2+git04/src/components/paintarea/tuppendialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppendialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,16 +34,6 @@
  ***************************************************************************/
 
 #include "tuppendialog.h"
-#include "tdebug.h"
-#include "tapplicationproperties.h"
-#include "tseparator.h"
-#include "tuppenthicknesswidget.h"
-#include "timagebutton.h"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QDialogButtonBox>
 
 struct TupPenDialog::Private
 {
diff -Nru tupi-0.2+git04/src/components/paintarea/tuppendialog.h tupi-0.2+git05/src/components/paintarea/tuppendialog.h
--- tupi-0.2+git04/src/components/paintarea/tuppendialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuppendialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,10 +36,20 @@
 #ifndef TUPPENDIALOG_H
 #define TUPPENDIALOG_H
 
+#include "tglobal.h"
 #include "tupbrushmanager.h"
+#include "tapplicationproperties.h"
+#include "tseparator.h"
+#include "tuppenthicknesswidget.h"
+#include "timagebutton.h"
+
 #include <QDialog>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QDialogButtonBox>
 
-class TupPenDialog : public QDialog
+class TUPI_EXPORT TupPenDialog : public QDialog
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupruler.cpp tupi-0.2+git05/src/components/paintarea/tupruler.cpp
--- tupi-0.2+git04/src/components/paintarea/tupruler.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupruler.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,9 +34,6 @@
  ***************************************************************************/
 
 #include "tupruler.h" 
-#include "tdebug.h"
-
-#include <cmath>
 
 struct TupRuler::Private
 {
@@ -222,6 +219,9 @@
 
     int counter = fabs(k->origin)/step;
 
+    if (step < 0)
+        step *= -1;
+
     for (qreal current = startMark + delta; current <= endMark; current += step) {
          startPosition = 16;
          if (counter % 5 == 0)
diff -Nru tupi-0.2+git04/src/components/paintarea/tupruler.h tupi-0.2+git05/src/components/paintarea/tupruler.h
--- tupi-0.2+git04/src/components/paintarea/tupruler.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupruler.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,6 +36,8 @@
 #ifndef TUPRULER_H
 #define TUPRULER_H
 
+#include "tglobal.h"
+
 #include <QWidget>
 #include <QMouseEvent>
 #include <QPaintEvent>
@@ -43,10 +45,11 @@
 #include <QRectF>
 #include <QPoint>
 #include <QSize>
+#include <cmath>
 
 #define RULER_BREADTH 20
 
-class TupRuler : public QWidget
+class TUPI_EXPORT TupRuler : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(qreal origin READ origin WRITE setOrigin)
diff -Nru tupi-0.2+git04/src/components/paintarea/tupstoryboarddialog.cpp tupi-0.2+git05/src/components/paintarea/tupstoryboarddialog.cpp
--- tupi-0.2+git04/src/components/paintarea/tupstoryboarddialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupstoryboarddialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,36 +34,6 @@
  ***************************************************************************/
 
 #include "tupstoryboarddialog.h"
-#include "tupstoryboard.h"
-#include "tapplicationproperties.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "tseparator.h"
-#include "tupscene.h"
-#include "talgorithm.h"
-#include "tosd.h"
-#include "tdebug.h"
-
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QIcon>
-#include <QPixmap>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QListWidget>
-#include <QLabel>
-#include <QLineEdit>
-#include <QTextEdit>
-#include <QDir>
-#include <QPushButton>
-#include <QPainter>
-#include <QFileDialog>
-#include <QDesktopWidget>
-#include <QLocale>
-#include <QPrinter>
-#include <QPrintDialog>
-#include <QTextBrowser>
-#include <QComboBox>
 
 struct TupStoryBoardDialog::Private
 {
@@ -99,10 +69,11 @@
     QTextEdit *sceneDescriptionEdit;
 
     QLocale utf;
+    TupLibrary *library;
 };
 
 TupStoryBoardDialog::TupStoryBoardDialog(bool isNetworked, TupExportInterface *imagePlugin, const QColor &color, 
-                                         const QSize &size, TupScene *scene, int sceneIndex, QWidget *parent) : QDialog(parent), k(new Private)
+                                         const QSize &size, TupScene *scene, int sceneIndex, TupLibrary *library, QWidget *parent) : QDialog(parent), k(new Private)
 {
     k->isNetworked = isNetworked;
     k->imagePlugin = imagePlugin;
@@ -111,6 +82,7 @@
     k->scene = scene;
     k->sceneIndex = sceneIndex;
     k->storyboard = k->scene->storyboard();
+    k->library = library;
     k->utf = QLocale(QLocale::AnyLanguage, QLocale::AnyCountry);
 
     QDesktopWidget desktop;
@@ -372,7 +344,7 @@
 
     for (int i=0; i < framesTotal; i++) {
          QString fileName = k->path + "scene" + QString::number(i);
-         bool isOk = k->imagePlugin->exportFrame(i, k->bgColor, fileName, k->scene, k->size);
+         bool isOk = k->imagePlugin->exportFrame(i, k->bgColor, fileName, k->scene, k->size, k->library);
          fileName += ".png";
          QPixmap resized(fileName);
          resized = resized.scaledToWidth(k->scaledSize.width(), Qt::SmoothTransformation);
@@ -465,7 +437,7 @@
     k->screenLabel->setPixmap(pixmap);
 }
 
-void TupStoryBoardDialog::createHTMLFiles(const QString &path)
+void TupStoryBoardDialog::createHTMLFiles(const QString &path, DocType type)
 {
     if (k->scaledSize.width() <= 520) {
         QDir directory(k->path);
@@ -497,8 +469,12 @@
         }
     }
 
-    QFile::copy(kAppProp->shareDir() + "data" + QDir::separator() + "storyboard" + QDir::separator() + "tupi.css", 
-                path + QDir::separator() + "tupi.css");
+    QString base = kAppProp->shareDir() + "data" + QDir::separator() + "storyboard" + QDir::separator();
+
+    if (type == HTML) 
+        QFile::copy(base + "tupi.html.css", path + QDir::separator() + "tupi.css");
+    else
+        QFile::copy(base + "tupi.pdf.css", path + QDir::separator() + "tupi.css");
 
     QString index = path + QDir::separator() + "index.html";
 
@@ -510,41 +486,78 @@
     QTextStream out(&file);
     out << "<html>\n";
     out << "<head>\n";
-    out << "<title>" << k->storyboard->storyTitle() << "</title>\n";
+    QString record = k->storyboard->storyTitle();
+    if (record.length() == 0)
+        record = "&nbsp;";
+    out << "<title>" << record << "</title>\n";
     out << "<link rel=\"stylesheet\" type=\"text/css\" href=\"tupi.css\" media=\"screen\" />\n";
     out << "</head>\n";
     out << "<body>\n";
     out << "<div id=\"header\">\n";
     out << "<div id=\"title\">Storyboard</div>\n";
-    out << "<div id=\"item\"><div id=\"item-header\">Title:</div>\n";
-    out << "<div id=\"item-data\">" << k->storyboard->storyTitle() << "</div></div>\n";
-    out << "<div id=\"item\"><div id=\"item-header\">Author:</div>\n";
-    out << "<div id=\"item-data\">" << k->storyboard->storyAuthor() << "</div></div>\n";
-    out << "<div id=\"item\"><div id=\"item-header\">Summary:</div>\n";
-    out << "<div id=\"item-data\">" << k->storyboard->storySummary() << "</div></div>\n";
-    out << "<div id=\"item\"><div id=\"item-header\">Scenes Total:</div>\n";
-    out << "<div id=\"item-data\">" << QString::number(k->storyboard->size()) << "</div></div>\n";
+    out << "<div id=\"item\">\n";
+    out << "     <div id=\"item-header\">Title:</div>\n";
+    out << "     <div id=\"item-data\">" << record << "</div>\n";
+    out << "     </div>\n";
+    out << "<div id=\"item\">\n";
+    out << "     <div id=\"item-header\">Author:</div>\n";
+    record = k->storyboard->storyAuthor();
+    if (record.length() == 0)
+        record = "&nbsp;";
+    out << "     <div id=\"item-data\">" << record << "</div>\n";
+    out << "</div>\n";
+    out << "<div id=\"item\">\n";
+    out << "     <div id=\"item-header\">Summary:</div>\n";
+    record = k->storyboard->storySummary();
+    if (record.length() == 0)
+        record = "&nbsp;";
+    out << "     <div id=\"item-data\">" << record << "</div>\n";
+    out << "</div>\n";
+    out << "<div id=\"item\">\n";
+    out << "     <div id=\"item-header\">Scenes Total:</div>\n";
+    out << "     <div id=\"item-data\">" << QString::number(k->storyboard->size()) << "</div>\n";
+    out << "</div>\n";
     out << "</div>\n";
+    if (type == PDF) {
+        out << "<div id=\"page-break\">\n";
+        out << "</div>\n";
+    }
 
-    for (int i=0; i < k->storyboard->size(); i++) {
+    int scenes = k->storyboard->size();
+    for (int i=0; i < scenes; i++) {
          out << "<div id=\"scene\">\n";
          QString image = "<img src=\"scene" + QString::number(i) + ".png\" />\n";
          out << image;
          out << "<div id=\"paragraph\">\n";
          out << "<div id=\"scene-item\">\n";
          out << " <div id=\"scene-header\">Title:</div>\n";
-         out << " <div id=\"scene-data\">" << k->storyboard->sceneTitle(i) << "</div>\n";
+         record = k->storyboard->sceneTitle(i);
+         if (record.length() == 0)
+             record = "&nbsp;";
+         out << " <div id=\"scene-data\">" << record << "</div>\n";
          out << "</div>\n";
          out << "<div id=\"scene-item\">\n";
          out << " <div id=\"scene-header\">Duration:</div>\n";
-         out << " <div id=\"scene-data\">" << k->storyboard->sceneDuration(i) << "</div>\n";
+         record = k->storyboard->sceneDuration(i);
+         if (record.length() == 0)
+             record = "&nbsp;";
+         out << " <div id=\"scene-data\">" << record << "</div>\n";
          out << "</div>\n";
          out << "<div id=\"scene-item\">\n";
          out << " <div id=\"scene-header\">Description:</div>\n";
-         out << " <div id=\"scene-data\">" << k->storyboard->sceneDescription(i)  << "</div>\n";
+         record = k->storyboard->sceneDescription(i);
+         if (record.length() == 0)
+             record = "&nbsp;";
+         out << " <div id=\"scene-data\">" << record << "</div>\n";
          out << "</div>\n";
          out << "</div>\n";
          out << "</div>\n";
+         if (type == PDF) {
+             if (i < (k->storyboard->size() - 1)) {
+                 out << "<div id=\"page-break\">\n";
+                 out << "</div>\n";
+             }
+         }
     }
     out << "</body>\n";
     out << "</html>";
@@ -559,7 +572,7 @@
     QString path = QFileDialog::getExistingDirectory(this, tr("Choose a directory..."), QDir::homePath(),
                                                      QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
     if (!path.isEmpty()) {
-        createHTMLFiles(path);
+        createHTMLFiles(path, HTML);
         TOsd::self()->display(tr("Info"), tr("Storyboard exported successfully!"), TOsd::Info);
     }
 }
@@ -571,7 +584,7 @@
     QString path = QDir::tempPath() + QDir::separator() + TAlgorithm::randomString(8) + QDir::separator();
     QDir().mkpath(path);
     if (!path.isEmpty())
-        createHTMLFiles(path);
+        createHTMLFiles(path, PDF);
 
     QString pdfPath = QFileDialog::getSaveFileName(this, tr("Save PDF file"), QDir::homePath(), tr("PDF file (*.pdf)"));
 
@@ -605,7 +618,12 @@
 void TupStoryBoardDialog::postStoryboardAtServer()
 {
     #ifdef K_DEBUG
-           tWarning() << "TupStoryBoardDialog::postStoryBoardAtServer() - Posting in Tupitube!";
+        QString msg = "TupStoryBoardDialog::postStoryBoardAtServer() - Posting in Tupitube!";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
     #endif
 
     saveLastComponent();
diff -Nru tupi-0.2+git04/src/components/paintarea/tupstoryboarddialog.h tupi-0.2+git05/src/components/paintarea/tupstoryboarddialog.h
--- tupi-0.2+git04/src/components/paintarea/tupstoryboarddialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupstoryboarddialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,9 +36,15 @@
 #ifndef TUPSTORYBOARDDIALOG_H
 #define TUPSTORYBOARDDIALOG_H
 
+#include "tglobal.h"
 #include "tupscene.h"
 #include "tupstoryboard.h"
 #include "tupexportinterface.h"
+#include "tapplicationproperties.h"
+#include "tconfig.h"
+#include "tseparator.h"
+#include "talgorithm.h"
+#include "tosd.h"
 
 #include <QDialog>
 #include <QColor>
@@ -46,15 +52,33 @@
 #include <QIcon>
 #include <QListWidgetItem>
 #include <QPrinter>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QPixmap>
+#include <QBoxLayout>
+#include <QListWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QTextEdit>
+#include <QDir>
+#include <QPushButton>
+#include <QPainter>
+#include <QFileDialog>
+#include <QDesktopWidget>
+#include <QLocale>
+#include <QPrintDialog>
+#include <QTextBrowser>
+#include <QComboBox>
 
-class TupStoryBoardDialog : public QDialog
+class TUPI_EXPORT TupStoryBoardDialog : public QDialog
 {
     Q_OBJECT
 
     public:
         TupStoryBoardDialog(bool isNetworked, TupExportInterface *imagePlugin, const QColor &color, 
-                            const QSize &size, TupScene *scene, int sceneIndex, QWidget *parent);
+                            const QSize &size, TupScene *scene, int sceneIndex, TupLibrary *library, QWidget *parent);
         ~TupStoryBoardDialog();
+        enum DocType { HTML = 1, PDF };
 
     private slots:
         void updateForm(QListWidgetItem *current, QListWidgetItem *previous);
@@ -87,7 +111,7 @@
         QString getSceneTitle() const;
         QString getSceneDuration() const;
         QString getSceneDescription() const;
-        void createHTMLFiles(const QString &path);
+        void createHTMLFiles(const QString &path, DocType type);
         void cleanDirectory(const QString &path);
  
         struct Private;
diff -Nru tupi-0.2+git04/src/components/paintarea/tuptoolsdialog.cpp tupi-0.2+git05/src/components/paintarea/tuptoolsdialog.cpp
--- tupi-0.2+git04/src/components/paintarea/tuptoolsdialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuptoolsdialog.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,13 +34,6 @@
  ***************************************************************************/
 
 #include "tuptoolsdialog.h"
-#include "tapplicationproperties.h"
-#include "tuptoolplugin.h"
-#include "timagebutton.h"
-#include "tdebug.h"
-
-#include <QHBoxLayout>
-#include <QPixmap>
 
 struct TupToolsDialog::Private
 {
@@ -112,7 +105,7 @@
 
         if (tools.at(i).compare("NodesTool") == 0) {
             TImageButton *nodes = new TImageButton(QPixmap(THEME_DIR + "icons/nodes_big.png"), 60, this, true);
-            nodes->setToolTip(tr("Line Selection"));
+            nodes->setToolTip(tr("Nodes Selection"));
             connect(nodes, SIGNAL(clicked()), this, SLOT(wakeUpNodeSelection()));
 
             k->layout->addWidget(nodes);
diff -Nru tupi-0.2+git04/src/components/paintarea/tuptoolsdialog.h tupi-0.2+git05/src/components/paintarea/tuptoolsdialog.h
--- tupi-0.2+git04/src/components/paintarea/tuptoolsdialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuptoolsdialog.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,10 +36,17 @@
 #ifndef TUPTOOLSDIALOG_H
 #define TUPTOOLSDIALOG_H 
 
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+#include "tuptoolplugin.h"
+#include "timagebutton.h"
+
 #include <QDialog>
 #include <QList>
+#include <QHBoxLayout>
+#include <QPixmap>
 
-class TupToolsDialog : public QDialog 
+class TUPI_EXPORT TupToolsDialog : public QDialog 
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tuptoolstatus.cpp tupi-0.2+git05/src/components/paintarea/tuptoolstatus.cpp
--- tupi-0.2+git04/src/components/paintarea/tuptoolstatus.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuptoolstatus.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,12 +34,6 @@
  ***************************************************************************/
 
 #include "tuptoolstatus.h"
-#include "tdebug.h"
-#include "tconfig.h"
-
-#include <QLabel>
-#include <QDir>
-#include <QHBoxLayout>
 
 TupToolStatus::TupToolStatus()
 {
diff -Nru tupi-0.2+git04/src/components/paintarea/tuptoolstatus.h tupi-0.2+git05/src/components/paintarea/tuptoolstatus.h
--- tupi-0.2+git04/src/components/paintarea/tuptoolstatus.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tuptoolstatus.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,19 @@
 #ifndef TUPTOOLSTATUS_H
 #define TUPTOOLSTATUS_H
 
+#include "tglobal.h"
+#include "tconfig.h"
 #include "tupcolorwidget.h"
 #include "tapplicationproperties.h"
 
 #include <QLabel>
+#include <QLabel>
+#include <QDir>
+#include <QHBoxLayout>
 
-class TupColorWidget;
+// class TupColorWidget;
 
-class TupToolStatus : public QWidget
+class TUPI_EXPORT TupToolStatus : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/paintarea/tupvideosurface.cpp tupi-0.2+git05/src/components/paintarea/tupvideosurface.cpp
--- tupi-0.2+git04/src/components/paintarea/tupvideosurface.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupvideosurface.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,4 @@
 #include "tupvideosurface.h"
-#include "tdebug.h"
 
 struct TupVideoSurface::Private
 {
diff -Nru tupi-0.2+git04/src/components/paintarea/tupvideosurface.h tupi-0.2+git05/src/components/paintarea/tupvideosurface.h
--- tupi-0.2+git04/src/components/paintarea/tupvideosurface.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/paintarea/tupvideosurface.h	2014-12-15 14:21:32.000000000 +0000
@@ -1,17 +1,20 @@
 #ifndef TUPVIDEOSURFACE_H
 #define TUPVIDEOSURFACE_H
 
+#include "tglobal.h"
+
 #include <QtGui>
+#include <QWidget>
 #include <QAbstractVideoSurface>
 #include <QVideoRendererControl>
 #include <QVideoSurfaceFormat>
 
-class VideoIF {
+class TUPI_EXPORT VideoIF {
     public:
         virtual void updateVideo() = 0;
 };
 
-class TupVideoSurface: public QAbstractVideoSurface
+class TUPI_EXPORT TupVideoSurface: public QAbstractVideoSurface
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/pen/pen.pri tupi-0.2+git05/src/components/pen/pen.pri
--- tupi-0.2+git04/src/components/pen/pen.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/pen/pen.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$PEN_DIR
-LIBS += -L$$PEN_DIR -ltupipen
+
+unix {
+    LIBS += -L$$PEN_DIR -ltupipen
+}
+
+win32 {
+    LIBS += -L$$PEN_DIR/release/ -ltupipen
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$PEN_DIR/libtupipen.so
diff -Nru tupi-0.2+git04/src/components/pen/pen.pro tupi-0.2+git05/src/components/pen/pen.pro
--- tupi-0.2+git04/src/components/pen/pen.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/pen/pen.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/pen
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += target
 target.path = /lib/
@@ -18,9 +15,43 @@
 *:!macx{
     CONFIG += dll warn_on
 }
+
 TEMPLATE = lib
 TARGET = tupipen
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+	LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+	LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/pen/tuppenwidget.cpp tupi-0.2+git05/src/components/pen/tuppenwidget.cpp
--- tupi-0.2+git04/src/components/pen/tuppenwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/pen/tuppenwidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,14 +34,6 @@
  ***************************************************************************/
 
 #include "tuppenwidget.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "tconfig.h"
-
-#include "tuppaintareaevent.h"
-#include "tuppenthicknesswidget.h"
-
-#include <QListWidget>
 
 struct TupPenWidget::Private
 {
@@ -86,12 +78,25 @@
     
     k->style = new QComboBox();
     k->style->setIconSize(QSize(140, 13));
-    
+
+    int flag = Qt::SolidLine;
+    k->style->addItem(QIcon(THEME_DIR + "icons/line_style01.png"), tr("Solid"), QVariant(flag));
+    flag = Qt::DashLine;
+    k->style->addItem(QIcon(THEME_DIR + "icons/line_style02.png"), tr("Dash"), QVariant(flag));
+    flag = Qt::DotLine;
+    k->style->addItem(QIcon(THEME_DIR + "icons/line_style03.png"), tr("Dot"), QVariant(flag));
+    flag = Qt::DashDotLine;
+    k->style->addItem(QIcon(THEME_DIR + "icons/line_style04.png"), tr("Dash dot"), QVariant(flag));
+    flag = Qt::DashDotDotLine;
+    k->style->addItem(QIcon(THEME_DIR + "icons/line_style05.png"), tr("Dash dot dot"), QVariant(flag));
+
+/*    
     k->style->addItem(QIcon(THEME_DIR + "icons/line_style01.png"), tr("Solid"), Qt::SolidLine);
     k->style->addItem(QIcon(THEME_DIR + "icons/line_style02.png"), tr("Dash"), Qt::DashLine);
     k->style->addItem(QIcon(THEME_DIR + "icons/line_style03.png"), tr("Dot"), Qt::DotLine);
     k->style->addItem(QIcon(THEME_DIR + "icons/line_style04.png"), tr("Dash dot"), Qt::DashDotLine);
     k->style->addItem(QIcon(THEME_DIR + "icons/line_style05.png"), tr("Dash dot dot"), Qt::DashDotDotLine);
+*/
     
     addChild(k->style);
     connect(k->style, SIGNAL(currentIndexChanged(int)), this, SLOT(setStyle(int)));
@@ -146,9 +151,13 @@
 TupPenWidget::~TupPenWidget()
 {
     #ifdef K_DEBUG
-           TEND;
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupPenWidget()]";
+        #else
+            TEND;
+        #endif
+    #endif 
+		
     delete k;
 }
 
diff -Nru tupi-0.2+git04/src/components/pen/tuppenwidget.h tupi-0.2+git05/src/components/pen/tuppenwidget.h
--- tupi-0.2+git04/src/components/pen/tuppenwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/pen/tuppenwidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,18 @@
 #ifndef TUPPENWIDGET_H
 #define TUPPENWIDGET_H
 
+#include "tglobal.h"
 #include "tupmodulewidgetbase.h"
 #include "teditspinbox.h"
+#include "tconfig.h"
+#include "tuppaintareaevent.h"
+#include "tuppenthicknesswidget.h"
 
 #include <QPen>
 #include <QListWidgetItem>
 #include <QComboBox>
 #include <QLabel>
+#include <QListWidget>
 
 class TupPaintAreaEvent;
 
@@ -50,7 +55,7 @@
  * @author David Cuadrado
 */
 
-class TupPenWidget : public TupModuleWidgetBase
+class TUPI_EXPORT TupPenWidget : public TupModuleWidgetBase
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/scenes/scenes.pri tupi-0.2+git05/src/components/scenes/scenes.pri
--- tupi-0.2+git04/src/components/scenes/scenes.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/scenes/scenes.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$SCENES_DIR
-LIBS += -L$$SCENES_DIR -ltupiscenes
+
+unix {
+    LIBS += -L$$SCENES_DIR -ltupiscenes
+}
+
+win32 {
+    LIBS += -L$$SCENES_DIR/release/ -ltupiscenes
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$SCENES_DIR/libtupiscenes.so
diff -Nru tupi-0.2+git04/src/components/scenes/scenes.pro tupi-0.2+git05/src/components/scenes/scenes.pro
--- tupi-0.2+git04/src/components/scenes/scenes.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/scenes/scenes.pro	2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/scenes
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += target
 target.path = /lib/
@@ -26,4 +23,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/ -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/scenes/tupscenesdelegate.cpp tupi-0.2+git05/src/components/scenes/tupscenesdelegate.cpp
--- tupi-0.2+git04/src/components/scenes/tupscenesdelegate.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/scenes/tupscenesdelegate.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,9 +34,6 @@
  ***************************************************************************/
 
 #include "tupscenesdelegate.h"
-#include "tdebug.h"
-
-#include <QtGui>
 
 TupScenesDelegate::TupScenesDelegate(QObject *parent)
     : QItemDelegate(parent)
diff -Nru tupi-0.2+git04/src/components/scenes/tupscenesdelegate.h tupi-0.2+git05/src/components/scenes/tupscenesdelegate.h
--- tupi-0.2+git04/src/components/scenes/tupscenesdelegate.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/scenes/tupscenesdelegate.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,10 +36,14 @@
 #ifndef TUPSCENESDELEGATE_H
 #define TUPSCENESDELEGATE_H
 
+#include "tglobal.h"
+
+#include <QtGui>
+#include <QLineEdit>
 #include <QItemDelegate>
 #include <QRegExp>
 
-class TupScenesDelegate : public QItemDelegate
+class TUPI_EXPORT TupScenesDelegate : public QItemDelegate
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/scenes/tupsceneslist.cpp tupi-0.2+git05/src/components/scenes/tupsceneslist.cpp
--- tupi-0.2+git04/src/components/scenes/tupsceneslist.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/scenes/tupsceneslist.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "tupsceneslist.h"
-#include "tdebug.h"
-
-#include <QTreeWidgetItem>
-#include <QHeaderView>
 
 // SQA: Add support for renaming and moving objects from the list
 
@@ -50,7 +46,8 @@
 {
     k->scenesTotal = 0;
     setHeaderLabels(QStringList() << "");
-    header()->setResizeMode(QHeaderView::ResizeToContents);
+    // header()->setResizeMode(QHeaderView::ResizeToContents);
+    header()->setSectionResizeMode(QHeaderView::ResizeToContents);
     setColumnCount(1);
 
     setItemDelegate(new TupScenesDelegate(this));
@@ -181,7 +178,11 @@
 void TupScenesList::resetUI()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScenesList::resetUI()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     blockSignals(true);
diff -Nru tupi-0.2+git04/src/components/scenes/tupsceneslist.h tupi-0.2+git05/src/components/scenes/tupsceneslist.h
--- tupi-0.2+git04/src/components/scenes/tupsceneslist.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/scenes/tupsceneslist.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,18 +36,20 @@
 #ifndef TUPSCENESLIST_H
 #define TUPSCENESLIST_H
 
+#include "tglobal.h"
 #include "treelistwidget.h"
 #include "tupscenesdelegate.h"
 
 #include <QMouseEvent>
 #include <QKeyEvent>
 #include <QTreeWidgetItem>
+#include <QHeaderView>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupScenesList : public TreeListWidget
+class TUPI_EXPORT TupScenesList : public TreeListWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/scenes/tupsceneswidget.cpp tupi-0.2+git05/src/components/scenes/tupsceneswidget.cpp
--- tupi-0.2+git04/src/components/scenes/tupsceneswidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/scenes/tupsceneswidget.cpp	2014-12-15 14:21:32.000000000 +0000
@@ -34,22 +34,6 @@
  ***************************************************************************/
 
 #include "tupsceneswidget.h"
-#include "tupprojectrequest.h"
-#include "tupprojectactionbar.h"
-#include "tuprequestbuilder.h"
-
-#include "tglobal.h"
-#include "tdebug.h"
-#include "timagebutton.h"
-#include "toptionaldialog.h"
-#include "tconfig.h"
-
-#include <QToolTip>
-#include <QMessageBox>
-#include <QPixmap>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QToolButton>
 
 struct TupScenesWidget::Private
 {
@@ -63,7 +47,11 @@
 TupScenesWidget::TupScenesWidget(QWidget *parent) : TupModuleWidgetBase(parent, "TupScenesWidget"), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScenesWidget()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     setWindowTitle(tr("Scenes Manager"));
@@ -75,8 +63,13 @@
 TupScenesWidget::~TupScenesWidget()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupScenesWidget()]";
+        #else
+            TEND;
+        #endif
     #endif
+
     delete k;
 }
 
@@ -135,7 +128,11 @@
 void TupScenesWidget::selectScene(int index)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScenesWidget::selectScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TupProjectRequest event = TupRequestBuilder::createSceneRequest(index, TupProjectRequest::Select);
@@ -146,7 +143,11 @@
 void TupScenesWidget::emitRequestInsertScene()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScenesWidget::emitRequestInsertScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     int index = k->scenesTable->scenesCount();
@@ -175,7 +176,11 @@
 void TupScenesWidget::emitRequestRemoveScene()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScenesWidget::emitRequestRemoveScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     int index = k->scenesTable->currentSceneIndex();
@@ -202,7 +207,11 @@
 void TupScenesWidget::closeAllScenes()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScenesWidget::closeAllScenes()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     k->scenesTable->resetUI();
@@ -211,8 +220,13 @@
 void TupScenesWidget::sceneResponse(TupSceneResponse *e)
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("scenes");
-           SHOW_VAR(e->action());
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScenesWidget::sceneResponse()]";
+            qDebug() << "SHOW_VAR: " << e->action();
+        #else
+            T_FUNCINFOX("scenes");
+            SHOW_VAR(e->action());
+        #endif
     #endif
 
     int index = e->sceneIndex();
diff -Nru tupi-0.2+git04/src/components/scenes/tupsceneswidget.h tupi-0.2+git05/src/components/scenes/tupsceneswidget.h
--- tupi-0.2+git04/src/components/scenes/tupsceneswidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/scenes/tupsceneswidget.h	2014-12-15 14:21:32.000000000 +0000
@@ -36,9 +36,16 @@
 #ifndef TUPSCENESWIDGET_H
 #define TUPSCENESWIDGET_H
 
+#include "tglobal.h"
 #include "tupmodulewidgetbase.h"
 #include "tupsceneslist.h"
 #include "treewidgetsearchline.h"
+#include "tupprojectrequest.h"
+#include "tupprojectactionbar.h"
+#include "tuprequestbuilder.h"
+#include "timagebutton.h"
+#include "toptionaldialog.h"
+#include "tconfig.h"
 
 #include <QGroupBox>
 #include <QPushButton>
@@ -47,10 +54,14 @@
 #include <QPixmap>
 #include <QList>
 #include <QTreeWidgetItem>
+#include <QToolTip>
+#include <QMessageBox>
+#include <QHBoxLayout>
+#include <QToolButton>
 
 class TupSceneResponse;
 
-class TupScenesWidget : public TupModuleWidgetBase
+class TUPI_EXPORT TupScenesWidget : public TupModuleWidgetBase
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/components/timeline/timeline.pri tupi-0.2+git05/src/components/timeline/timeline.pri
--- tupi-0.2+git04/src/components/timeline/timeline.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/timeline.pri	2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$TIMELINE_DIR
-LIBS += -L$$TIMELINE_DIR -ltupitimeline
+
+unix {
+    LIBS += -L$$TIMELINE_DIR -ltupitimeline
+}
+
+win32 {
+    LIBS += -L$$TIMELINE_DIR\release -ltupitimeline
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$TIMELINE_DIR/libtupitimeline.so
diff -Nru tupi-0.2+git04/src/components/timeline/timeline.pro tupi-0.2+git05/src/components/timeline/timeline.pro
--- tupi-0.2+git04/src/components/timeline/timeline.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/timeline.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/timeline
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += target
 target.path = /lib/
@@ -11,18 +8,17 @@
 }
 
 HEADERS += tuptimeline.h \
-           tuplayermanager.h \
-           tuptlruler.h \
-           tupframestable.h \ 
-           tuplayerindex.h \
-           tuplayercontrols.h
+           tuptimelineruler.h \
+           tuptimelinetable.h \ 
+           # tuplayerindex.h \
+           tuptimelineheader.h
 
 SOURCES += tuptimeline.cpp \
-           tuplayermanager.cpp \
-           tuptlruler.cpp \
-           tupframestable.cpp \
-           tuplayerindex.cpp \
-           tuplayercontrols.cpp
+           tuptimelineruler.cpp \
+           tuptimelinetable.cpp \
+           # tuplayerindex.cpp \
+           tuptimelineheader.cpp
+
 *:!macx{
     CONFIG += dll warn_on
 }
@@ -32,4 +28,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/components/timeline/tupframestable.cpp tupi-0.2+git05/src/components/timeline/tupframestable.cpp
--- tupi-0.2+git04/src/components/timeline/tupframestable.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tupframestable.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,514 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tupframestable.h"
-
-#include <QPainter>
-#include <QPaintEvent>
-#include <QItemSelectionModel>
-#include <QPainterPath>
-#include <QScrollBar>
-#include <QHeaderView>
-
-#include "tdebug.h"
-#include "tuptlruler.h"
-//#include "tupprojectrequest.h"
-#include "tupprojectactionbar.h"
-
-////////// TupFramesTableItemDelegate ///////////
-
-class TupFramesTableItemDelegate : public QAbstractItemDelegate
-{
-    public:
-        TupFramesTableItemDelegate(QObject * parent = 0);
-        ~TupFramesTableItemDelegate();
-        virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
-        virtual QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
-};
-
-TupFramesTableItemDelegate::TupFramesTableItemDelegate(QObject * parent) : QAbstractItemDelegate(parent)
-{
-}
-
-TupFramesTableItemDelegate::~TupFramesTableItemDelegate()
-{
-}
-
-void TupFramesTableItemDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const
-{
-    Q_ASSERT(index.isValid());
-    
-    TupFramesTable *table = qobject_cast<TupFramesTable *>(index.model()->parent());
-    TupFramesTableItem *item = dynamic_cast<TupFramesTableItem *>(table->itemFromIndex(index));
-    
-    QVariant value;
-    QStyleOptionViewItem opt = option;
-    
-    // draw the background color
-    value = index.data(Qt::BackgroundColorRole);
-    
-    if (value.isValid()) {
-
-        painter->save();
-        
-        bool sound = table->isSoundLayer(index.row());
-        
-        if (!sound)
-            painter->fillRect(option.rect, value.value<QColor>());
-        
-        painter->restore();
-
-    } else {
-
-        painter->save();
-        
-        bool sound = table->isSoundLayer(index.row());
-        
-        if (!sound) {
-            int counter = index.column() + 1;
-            if (counter == 1 || counter % 5 == 0) 
-                painter->fillRect(option.rect, QColor(230, 230, 230));
-            else 
-                painter->fillRect(option.rect, Qt::white);
-        } else {
-
-        }
-        
-        painter->restore();
-    }
-    
-    // Selection!
-    if (option.showDecorationSelected && (option.state & QStyle::State_Selected)) {
-
-        QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled;
-        painter->save();
-        painter->setPen(QPen(option.palette.brush(cg, QPalette::Highlight), 3));
-        painter->fillRect(option.rect, QColor(250, 209, 132, 255));
-        painter->restore();
-
-    }
-    
-    // Draw attributes
-    
-    int offset = option.rect.width() - 5;
-    
-    if (item && index.isValid()) {
-
-        if (item->isUsed()) {
-            painter->save();
-            painter->setBrush(Qt::black);
-            painter->setRenderHint(QPainter::Antialiasing, true);
-            
-            if (!item->isSound()) {
-                painter->drawEllipse(option.rect.x() + ((option.rect.width() - offset)/2), 
-                                     option.rect.y() + ((option.rect.height() + offset)/2), 
-                                     offset, offset);
-            } else {
-                painter->setBrush(Qt::blue);
-                painter->drawRect(option.rect.left(), option.rect.bottom() - offset, offset - 2, offset - 2);
-            }
-            
-            painter->restore();
-        }
-        
-        if (item->isLocked()) {
-            painter->save();
-            painter->setBrush(Qt::red);
-            painter->drawEllipse(option.rect.left(), option.rect.bottom() - offset, offset, offset);
-            painter->restore();
-        }
-    }
-}
-
-QSize TupFramesTableItemDelegate::sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const
-{
-    Q_ASSERT(index.isValid());
-    const QAbstractItemModel *model = index.model();
-    Q_ASSERT(model);
-
-    QVariant value = model->data(index, Qt::FontRole);
-    QFont fnt = value.isValid() ? qvariant_cast<QFont>(value) : option.font;
-    QString text = model->data(index, Qt::DisplayRole).toString();
-    QRect pixmapRect;
-    if (model->data(index, Qt::DecorationRole).isValid())
-        pixmapRect = QRect(0, 0, option.decorationSize.width(), option.decorationSize.height());
-
-    QFontMetrics fontMetrics(fnt);
-    
-    return (pixmapRect).size();
-}
-
-////////// TupFramesTableItem ////////
-
-TupFramesTableItem::TupFramesTableItem()
-{
-}
-
-TupFramesTableItem::~TupFramesTableItem()
-{
-}
-
-bool TupFramesTableItem::isUsed()
-{
-    return data(IsUsed).toBool();
-}
-
-bool TupFramesTableItem::isLocked()
-{
-    return data(IsLocked).toBool();
-}
-
-bool TupFramesTableItem::isSound()
-{
-    QVariant data = this->data(IsSound);
-    
-    if (data.canConvert<bool>()) {
-        return data.toBool();
-    }
-
-    return false;
-}
-
-//// TupFramesTable
-
-struct TupFramesTable::Private
-{
-    struct LayerItem {
-        LayerItem() : lastItem(-1), sound(false) {};
-        int lastItem;
-        bool sound;
-    };
-    
-    int rectWidth;
-    int rectHeight;
-    int sceneIndex;
-    int layerIndex;
-    int frameIndex;
-    QList<LayerItem> layers;
-    TupTLRuler *ruler;
-};
-
-TupFramesTable::TupFramesTable(int sceneIndex, QWidget *parent) : QTableWidget(0, 100, parent), k(new Private)
-{
-    k->sceneIndex = sceneIndex;
-    k->frameIndex = 0;
-    k->layerIndex = 0;
-    k->ruler = new TupTLRuler;
-    setup();
-}
-
-TupFramesTable::~TupFramesTable()
-{
-    delete k;
-}
-
-void TupFramesTable::setup()
-{
-    setItemDelegate(new TupFramesTableItemDelegate(this));
-    setSelectionBehavior(QAbstractItemView::SelectItems);
-    setSelectionMode(QAbstractItemView::SingleSelection);
-    
-    setHorizontalHeader(k->ruler);
-
-    connect(this, SIGNAL(currentCellChanged(int, int, int, int)), this, SLOT(emitRequestSelectFrame(int, int, int, int)));
-
-    connect(k->ruler, SIGNAL(logicalSectionSelected(int)), this, SLOT(emitFrameSelected(int)));
-
-    // connect(this, SIGNAL(itemSelectionChanged()), this, SLOT(emitFrameSelectionChanged()));
-
-    connect(this, SIGNAL(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *)), this, 
-            SLOT(emitFrameSelected(QTableWidgetItem *, QTableWidgetItem *)));
-
-    verticalHeader()->hide();
-    
-    setItemSize(10, 25);
-    
-    horizontalHeader()->setResizeMode(QHeaderView::Custom);
-    verticalHeader()->setResizeMode(QHeaderView::Custom);
-
-    // horizontalHeader()->setSectionResizeMode(QHeaderView::Custom);
-    // verticalHeader()->setSectionResizeMode(QHeaderView::Custom);
-}
-
-void TupFramesTable::emitFrameSelected(int col)
-{
-    selectColumn(col);
-    
-    TupFramesTableItem *item = dynamic_cast<TupFramesTableItem *>(this->item(currentRow(), col));
-    
-    if (item) {
-        if (item->isUsed())
-            emit emitRequestChangeFrame(k->sceneIndex, verticalHeader()->visualIndex(this->row(item)), this->column(item));
-            //emit frameRequest(TupProjectActionBar::SelectFrame, this->column(item), verticalHeader()->visualIndex(this->row(item)), -1);
-    } 
-}
-
-/*
-void TupFramesTable::emitFrameSelectionChanged()
-{
-    TupFramesTableItem *item = dynamic_cast<TupFramesTableItem *>(this->item(currentRow(), currentColumn()));
-
-    if (!item)
-        emit frameRequest(TupProjectActionBar::InsertFrame, currentColumn(), currentRow(), k->sceneIndex);
-}
-*/
-
-void TupFramesTable::emitFrameSelected(QTableWidgetItem *current, QTableWidgetItem *prev)
-{
-    Q_UNUSED(prev);
-
-    TupFramesTableItem *item = dynamic_cast<TupFramesTableItem *>(current);
-    
-    if (item) {
-        if (item->isUsed())
-            emit emitRequestChangeFrame(k->sceneIndex, verticalHeader()->visualIndex(this->row(item)), this->column(item));
-            // emit frameRequest(TupProjectActionBar::SelectFrame, this->column(item), verticalHeader()->visualIndex(this->row(item)), -1);
-        else
-            tFatal() << "TupFramesTable::emitFrameSelected <- item exists but isn't used right now";
-    } else { 
-        emit frameRequest(TupProjectActionBar::InsertFrame, currentColumn(), currentRow(), k->sceneIndex);
-    }
-}
-
-void TupFramesTable::setItemSize(int w, int h)
-{
-    k->rectHeight = h;
-    k->rectWidth = w;
-    
-    fixSize();
-}
-
-bool TupFramesTable::isSoundLayer(int row)
-{
-    if (row < 0 && row >= k->layers.count())
-        return false;
-    
-    return k->layers[row].sound;
-}
-
-void TupFramesTable::insertLayer(int pos, const QString &name)
-{
-    Q_UNUSED(name);
-
-    insertRow(pos);
-    
-    Private::LayerItem layer;
-    layer.sound = false;
-    k->layers.insert(pos, layer);
-    
-    fixSize();
-}
-
-void TupFramesTable::insertSoundLayer(int layerPos, const QString &name)
-{
-    Q_UNUSED(name);
-
-    insertRow(layerPos);
-    
-    Private::LayerItem layer;
-    layer.sound = true;
-    k->layers.insert(layerPos, layer);
-    
-    fixSize();
-}
-
-void TupFramesTable::removeCurrentLayer()
-{
-    int pos = verticalHeader()->logicalIndex(currentRow());
-    removeLayer(pos);
-}
-
-void TupFramesTable::removeLayer(int pos)
-{
-    pos = verticalHeader()->logicalIndex(pos);
-    removeRow( pos );
-    k->layers.removeAt(pos);
-}
-
-void TupFramesTable::moveLayer(int position, int newPosition)
-{
-    if (position < 0 || position >= rowCount() || newPosition < 0 || newPosition >= rowCount()) 
-        return;
-    
-    blockSignals(true);
-    
-    verticalHeader()->moveSection(position, newPosition);
-    
-    blockSignals(false);
-
-    /*
-    
-     TupFramesTableItem *item1 = takeItem(position, 0);
-     
-     bool up = true;
-     if (position > newPosition) {
-         up = false; // down
-     }
-     
-     if (up) {
-         for (int i = position+1; i <= newPosition; i++) {
-              setItem(i-1, 0, takeItem(i, 0));
-         }
-     } else {
-         for (int i = position-1;i >= newPosition;i--) {
-              setItem(i+1, 0, takeItem(i, 0));
-         }
-     }
-     
-     setItem(newPosition, 0, item1);
-     
-     setCurrentItem(item1);
-    */
-}
-
-int TupFramesTable::lastFrameByLayer(int layerPos)
-{
-    int pos = verticalHeader()->logicalIndex(layerPos);
-
-    if (pos < 0 || pos > k->layers.count()) {
-        return -1;
-    }
-
-    return k->layers[pos].lastItem;
-}
-
-// FRAMES
-
-
-void TupFramesTable::insertFrame(int layerPos, const QString &name)
-{
-    Q_UNUSED(name);
-
-    if (layerPos < 0 || layerPos >= k->layers.count()) 
-        return;
-    
-    layerPos = verticalHeader()->logicalIndex(layerPos);
-    
-    k->layers[layerPos].lastItem++;
-    
-    if (k->layers[layerPos].lastItem >= columnCount())
-        insertColumn(k->layers[layerPos].lastItem);
-    
-    setAttribute(layerPos, k->layers[layerPos].lastItem, TupFramesTableItem::IsUsed, true);
-    setAttribute(layerPos, k->layers[layerPos].lastItem, TupFramesTableItem::IsSound, k->layers[layerPos].sound);
-    
-    viewport()->update();
-}
-
-void TupFramesTable::setCurrentFrame(TupFramesTableItem *item)
-{
-    setCurrentItem(item);
-}
-
-void TupFramesTable::setCurrentLayer(int layerPos)
-{
-    setCurrentItem(item(verticalHeader()->logicalIndex(layerPos), 0));
-}
-
-void TupFramesTable::selectFrame(int index)
-{
-    setCurrentItem(item(currentRow(), index));
-}
-
-void TupFramesTable::removeFrame(int layerPos, int position)
-{
-    Q_UNUSED(position);
-
-    /*
-    for (int frameIndex = position; frameIndex < columnCount(); frameIndex++)
-         setAttribute( layerPos, position, TupFramesTableItem::IsUsed, false);
-    */
-    
-    if (layerPos < 0 || layerPos >= k->layers.count())
-        return;
-    
-    layerPos = verticalHeader()->logicalIndex(layerPos);
-    setAttribute(layerPos, k->layers[layerPos].lastItem, TupFramesTableItem::IsUsed, false);
-    k->layers[layerPos].lastItem--;
-    viewport()->update();
-}
-
-void TupFramesTable::lockFrame(int layerPos, int position, bool lock)
-{
-    if (layerPos < 0 || layerPos >= k->layers.count())
-        return;
-    
-    layerPos = verticalHeader()->logicalIndex(layerPos);
-    setAttribute(layerPos, position, TupFramesTableItem::IsLocked, lock);
-    viewport()->update();
-}
-
-void TupFramesTable::setAttribute(int row, int col, TupFramesTableItem::Attributes att, bool value)
-{
-    QTableWidgetItem *item = this->item(row, col);
-    
-    if (!item) {
-        item = new TupFramesTableItem;
-        setItem(row, col, item);
-    }
-    
-    item->setData(att, value);
-}
-
-void TupFramesTable::fixSize()
-{
-    for (int column = 0; column < columnCount(); column++) {
-        horizontalHeader()->resizeSection(column, k->rectWidth);
-    }
-
-    for (int row = 0; row < rowCount(); row++) {
-         verticalHeader()->resizeSection(row, k->rectHeight);
-    }
-}
-
-/*
-void TupFramesTable::fixSectionMoved(int logical, int visual, int newVisual)
-{
-     verticalHeader()->moveSection(newVisual, visual);
-}
-*/
-
-void TupFramesTable::emitRequestSelectFrame(int currentRow, int currentColumn, int previousRow, int previousColumn)
-{
-     Q_UNUSED(previousRow);
-     Q_UNUSED(previousColumn);
-
-     if (k->frameIndex != currentColumn || k->layerIndex != currentRow) {
-         k->frameIndex = currentColumn;
-         k->layerIndex = currentRow;
-         emit emitSelection(currentRow, currentColumn);
-     }
-}
-
diff -Nru tupi-0.2+git04/src/components/timeline/tupframestable.h tupi-0.2+git05/src/components/timeline/tupframestable.h
--- tupi-0.2+git04/src/components/timeline/tupframestable.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tupframestable.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TUPFRAMESTABLE_H
-#define TUPFRAMESTABLE_H
-
-#include <QTableWidget>
-#include <QTableWidgetItem>
-#include <QHash>
-
-class TupFramesTable;
-class TupFramesTableItemDelegate;
-
-class TupFramesTableItem : public QTableWidgetItem
-{
-    public:
-        enum Attributes
-        {
-            IsUsed = 0x01,
-            IsLocked,
-            IsSound
-        };
-        
-        TupFramesTableItem();
-        virtual ~TupFramesTableItem();
-        
-        bool isUsed();
-        bool isLocked();
-        bool isSound();
-};
-
-class TupTLRuler;
-
-/**
- * @author David Cuadrado
-*/
-class TupFramesTable : public QTableWidget
-{
-    Q_OBJECT;
-    
-    friend class TupFramesTableItemDelegate;
-    
-    public:
-        TupFramesTable(int sceneIndex = 0, QWidget *parent = 0);
-        ~TupFramesTable();
-        
-        bool isSoundLayer(int row);
-        
-    public slots:
-        // Layers
-        void insertLayer(int layerPos, const QString &name);
-        void insertSoundLayer(int layerPos, const QString &name);
-        
-        void removeCurrentLayer();
-        void removeLayer(int pos);
-        void moveLayer(int pos, int newPos);
-        
-        int lastFrameByLayer(int layerPos);
-        
-        // Frames
-        void insertFrame(int layerPos, const QString &name);
-        
-        void setCurrentFrame(TupFramesTableItem *);
-        void setCurrentLayer(int layerPos);
-        void selectFrame(int index);
-        
-        void setAttribute(int row, int col, TupFramesTableItem::Attributes att, bool value);
-        
-        void removeFrame(int layerPos, int position);
-        
-        void lockFrame(int layerPosition, int position, bool lock);
-        
-        void setItemSize(int w, int h);
-        
-    private:
-        void setup();
-        
-    protected:
-        void fixSize();
-        
-    private slots:
-        void emitFrameSelected(int col);
-        // void emitFrameSelectionChanged();
-        void emitFrameSelected(QTableWidgetItem *curr, QTableWidgetItem *prev);
-        void emitRequestSelectFrame(int currentRow, int currentColumn, int previousRow, int previousColumn);
-        
-    signals:
-        void frameRequest(int action, int frame, int layer, int scene, const QVariant &argument = QVariant());
-        void emitRequestChangeFrame(int sceneIndex, int layerIndex, int frameIndex);
-        void emitSelection(int currentRow, int currentColumn);
-        
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/components/timeline/tuplayercontrols.cpp tupi-0.2+git05/src/components/timeline/tuplayercontrols.cpp
--- tupi-0.2+git04/src/components/timeline/tuplayercontrols.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuplayercontrols.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,335 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tuplayercontrols.h"
-#include "tuprequestbuilder.h"
-
-#include <qlabel.h>
-#include <qlayout.h>
-
-#include <QPixmap>
-#include <QHeaderView>
-#include <QPainter>
-#include <QItemDelegate>
-
-#include "tseparator.h"
-#include "tapplication.h"
-#include "tdebug.h"
-
-const int LOCK_COLUMN = 0;
-const int VIEW_COLUMN = 1;
-
-// Header
-
-class TupLayerControlsHeader : public QHeaderView
-{
-    public:
-        TupLayerControlsHeader(QWidget * parent = 0);
-        ~TupLayerControlsHeader();
-        void paintSection(QPainter *painter, const QRect & rect, int logicalIndex) const;
-         
-    private:
-        QPixmap m_lockIcon;
-        QPixmap m_viewIcon;
-};
-
-TupLayerControlsHeader::TupLayerControlsHeader(QWidget * parent) : QHeaderView(Qt::Horizontal , parent)
-{
-    // setClickable(true);
-    setCascadingSectionResizes(true);
-    setFixedHeight(26);
-    
-    m_lockIcon = QPixmap(THEME_DIR + "icons/padlock.png");
-    m_viewIcon = QPixmap(THEME_DIR + "icons/show_hide_all_layers.png");
-}
-
-TupLayerControlsHeader::~TupLayerControlsHeader()
-{
-}
-
-void TupLayerControlsHeader::paintSection(QPainter * painter, const QRect & rect, int logicalIndex) const
-{
-    if (!rect.isValid()) 
-        return;
-    
-    QStyleOptionHeader headerOption;
-    headerOption.rect = rect;
-    headerOption.orientation = Qt::Horizontal;
-    headerOption.position = QStyleOptionHeader::Middle;
-    
-    QStyle::State state = QStyle::State_None;
-
-    if (isEnabled())
-        state |= QStyle::State_Enabled;
-
-    if (window()->isActiveWindow())
-        state |= QStyle::State_Active;
-    
-    style()->drawControl(QStyle::CE_HeaderSection, &headerOption, painter);
-    
-    switch (logicalIndex) {
-            case LOCK_COLUMN:
-            {
-                 painter->drawPixmap(QPointF(rect.x() + (rect.width()-10)/2, rect.y() + 6), m_lockIcon, QRectF(0, 0, 10, 13));
-            }
-            break;
-            case VIEW_COLUMN:
-            {
-                 painter->drawPixmap(QPointF(rect.x() + (rect.width()-16)/2, rect.y() + 5), m_viewIcon, QRectF(0, 0, 16, 16));
-            }
-            break;
-    }
-}
-
-// DELEGATE
-
-class TupLayerControlsItemDelegate : public QItemDelegate
-{
-    public:
-        TupLayerControlsItemDelegate(QObject * parent = 0);
-        ~TupLayerControlsItemDelegate();
-        virtual void drawCheck(QPainter *painter, const QStyleOptionViewItem &option, const QRect &, Qt::CheckState state) const;
-        virtual void drawFocus(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect) const;
-        virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
-};
-
-TupLayerControlsItemDelegate::TupLayerControlsItemDelegate(QObject * parent) :  QItemDelegate(parent)
-{
-}
-
-TupLayerControlsItemDelegate::~TupLayerControlsItemDelegate()
-{
-}
-
-void TupLayerControlsItemDelegate::drawCheck(QPainter *painter, const QStyleOptionViewItem &option,
-                                           const QRect &, Qt::CheckState state) const
-{
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(state);
-
-    // const int textMargin = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
-
-    /*
-    QRect checkRect = QStyle::alignedRect(option.direction, Qt::AlignCenter,
-                                          check(option, option.rect, Qt::Checked).size(),
-                                          QRect(option.rect.x() + textMargin, option.rect.y(),
-                                          option.rect.width() - (textMargin * 2), option.rect.height()));
-    QItemDelegate::drawCheck(painter, option, checkRect, state);
-    */
-}
-
-void TupLayerControlsItemDelegate::drawFocus(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect) const
-{
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(rect);
-}
-
-void TupLayerControlsItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & option, const QModelIndex & index) const
-{
-    QItemDelegate::paint(painter, option, index);
-}
-
-////////////////////////////////
-
-struct TupLayerControls::Private
-{
-    Private() : allSelected(false), allVisible(true), allLock(false), rowHeight(20), sceneIndex(0) {}
-    
-    bool allSelected, allVisible, allLock;
-    int rowHeight;
-    int sceneIndex;
-};
-
-TupLayerControls::TupLayerControls(int sceneIndex, QWidget *parent) : QTableWidget(0, 2, parent), k(new Private)
-{
-    #ifdef K_DEBUG
-        TINIT;
-    #endif
-
-    setItemDelegate(new TupLayerControlsItemDelegate(this));
-
-    k->sceneIndex = sceneIndex;
-    setSelectionMode(QAbstractItemView::SingleSelection);
-    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    
-    QTableWidgetItem *prototype = new QTableWidgetItem;
-    prototype->setTextAlignment(Qt::AlignCenter);
-    prototype->setBackgroundColor(palette().text().color());
-    prototype->setTextColor(palette().background().color());
-    
-    setItemPrototype(prototype);
-    setHorizontalHeader(new TupLayerControlsHeader(this));  
-    setHorizontalHeaderLabels(QStringList() << tr("") << tr(""));
-    verticalHeader()->hide();
-    
-    setHorizontalHeader(new TupLayerControlsHeader(this));
-
-    connect(this, SIGNAL(cellClicked(int, int)), this, SLOT(setLocalRequest(int, int)));
-}
-
-TupLayerControls::~TupLayerControls()
-{
-    #ifdef K_DEBUG
-        TEND;
-    #endif
-
-    delete k;
-}
-
-void TupLayerControls::insertLayer(int position)
-{
-    if (position >= 0 && position <= rowCount()) {
-
-        insertRow(position);
-
-        QTableWidgetItem *lockItem = new QTableWidgetItem;
-        lockItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-        lockItem->setCheckState(Qt::Unchecked);
-        
-        setItem(position, 0, lockItem);
-        
-        QTableWidgetItem *viewItem = new QTableWidgetItem;
-        viewItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-        viewItem->setCheckState(Qt::Checked);
-        
-        setItem(position, 1, viewItem);
-
-        fixSize();
-    }
-}
-
-void TupLayerControls::insertSoundLayer(int position, const QString &name)
-{
-    Q_UNUSED(name);
-
-    if (position >= 0 && position <= rowCount()) {
-        fixSize();
-    }
-}
-
-void TupLayerControls::removeLayer(int position)
-{
-    removeRow(verticalHeader()->logicalIndex(position));
-}
-
-void TupLayerControls::renameLayer(int position, const QString &name)
-{
-    QTableWidgetItem *item = this->item(0, verticalHeader()->logicalIndex(position));
-    
-    if (item)
-        item->setText(name);
-}
-
-void TupLayerControls::resizeEvent(QResizeEvent *)
-{
-    fixSize();
-}
-
-void TupLayerControls::fixSize()
-{
-    /*
-    int offset = 0;
-
-    if (verticalScrollBar()->isVisible())
-        offset = verticalScrollBar()->width()-2;
-    else
-        offset = -2;
-    */
-
-    // int width = this->width() - offset;
-    horizontalHeader()->resizeSection(0, 20);
-    horizontalHeader()->resizeSection(1, 20);
-
-    for (int row = 0; row < rowCount(); row++)
-         verticalHeader()->resizeSection(row, k->rowHeight);
-}
-
-void TupLayerControls::setRowHeight(int rowHeight)
-{
-    k->rowHeight = rowHeight;
-}
-
-void TupLayerControls::commitData(QWidget *editor)
-{
-    Q_UNUSED(editor);
-}
-
-void TupLayerControls::moveLayer(int position, int newPosition)
-{
-    if (position < 0 || position >= rowCount() || newPosition < 0 || newPosition >= rowCount()) 
-        return;
-    
-    verticalHeader()->moveSection((position), (newPosition));
-}
-
-void TupLayerControls::lockLayer(int position, bool locked)
-{
-    Q_UNUSED(locked);
-
-    if (position < 0 || position >= rowCount()) 
-        return;
-}
-
-void TupLayerControls::setLocalRequest(int layerIndex, int column)
-{
-    if (column == 0) {
-        tFatal() << "TupLayerControls::setLocalRequest -> Column 0!";
-    }
-
-    if (column == 1) {
-        QTableWidgetItem *item = this->item(verticalHeader()->logicalIndex(layerIndex), 1);
-
-        bool checked = false;
-        if (item->checkState() == Qt::Checked)
-            checked = true;
-
-        emit layerVisibility(k->sceneIndex, layerIndex, checked);
-    }
-
-    emit localRequest();
-}
-
-void TupLayerControls::setLayerVisibility(int layerIndex, const QString &isChecked)
-{
-    QTableWidgetItem *item = this->item(verticalHeader()->logicalIndex(layerIndex), 1);
-
-    if (isChecked.compare("true")==0) 
-        item->setCheckState(Qt::Checked);
-    else
-        item->setCheckState(Qt::Unchecked);
-}
diff -Nru tupi-0.2+git04/src/components/timeline/tuplayercontrols.h tupi-0.2+git05/src/components/timeline/tuplayercontrols.h
--- tupi-0.2+git04/src/components/timeline/tuplayercontrols.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuplayercontrols.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TUPLAYERCONTROLS_H
-#define TUPLAYERCONTROLS_H
-
-#include <QPushButton>
-#include <QToolTip>
-#include <QLabel>
-#include <QScrollBar>
-#include <QButtonGroup>
-#include <QTableWidget>
-
-#include "timagebutton.h"
-#include "tupprojectrequest.h"
-#include "tapplicationproperties.h"
-
-/**
- * @author David Cuadrado
-**/
-
-class TupLayerControls : public QTableWidget
-{
-    Q_OBJECT
-    
-    friend class TupLayerControlsItemDelegate;
-    
-    public:
-        enum Actions
-        {
-            NoAction = 0,
-            ShowOutlines,
-            LockLayers,
-            ToggleLayerView,
-            InsertLayer,
-            RemoveLayer,
-            MoveLayerUp,
-            MoveLayerDown
-        };
-        
-        /**
-         * Default constructor
-         * @param parent 
-         * @return 
-         */
-        TupLayerControls(int sceneIndex=0, QWidget *parent = 0);
-        ~TupLayerControls();
-        
-        void insertLayer(int position);
-        void insertSoundLayer(int position, const QString &name);
-        void removeLayer(int position);
-        void renameLayer(int position, const QString &name);
-        void moveLayer(int position, int newPosition);
-        void lockLayer(int position, bool locked);
-        void setRowHeight(int rowHeight);
-        void setLayerVisibility(int layerIndex, const QString &isChecked);
-        
-    protected:
-        void resizeEvent(QResizeEvent *e);
-        virtual void fixSize();
-        
-    protected slots:
-        void commitData(QWidget * editor);
-        void setLocalRequest(int row, int column);
-
-        //void emitSelectionSignal();
-        
-    signals:
-        void requestRenameEvent(int layerPosition, const QString &newName);
-        void localRequest();
-        void layerVisibility(int sceneIndex, int layerIndex, bool checked);
-
-        // void requestTriggered(const TupProjectRequest *event);
-        
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/components/timeline/tuplayerindex.cpp tupi-0.2+git05/src/components/timeline/tuplayerindex.cpp
--- tupi-0.2+git04/src/components/timeline/tuplayerindex.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuplayerindex.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,25 +34,12 @@
  ***************************************************************************/
 
 #include "tuplayerindex.h"
-#include "tuprequestbuilder.h"
 
-#include <qlabel.h>
-#include <qlayout.h>
-
-#include <QPixmap>
-#include <QHeaderView>
-#include <QPainter>
-#include <QItemDelegate>
-
-#include "tseparator.h"
-#include "tapplication.h"
-#include "tdebug.h"
-
-const int LAYER_COLUMN = 0;
+// const int LAYER_COLUMN = 0;
 
 // Header
 
-class TupLayerIndexHeader : public QHeaderView
+class TUPI_EXPORT TupLayerIndexHeader : public QHeaderView
 {
     public:
         TupLayerIndexHeader(QWidget * parent = 0);
@@ -160,7 +147,11 @@
 TupLayerIndex::TupLayerIndex(int sceneIndex, QWidget *parent) : QTableWidget(0, 1, parent), k(new Private)
 {
     #ifdef K_DEBUG
-        TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupLayerIndex()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     k->sceneIndex = sceneIndex;
@@ -187,7 +178,11 @@
 TupLayerIndex::~TupLayerIndex()
 {
     #ifdef K_DEBUG
-        TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupLayerIndex()]";
+        #else
+            TEND;
+        #endif
     #endif
 
     delete k;
@@ -196,7 +191,6 @@
 void TupLayerIndex::insertLayer(int position, const QString &name)
 {
     if (position >= 0 && position <= rowCount()) {
-
         QTableWidgetItem *newLayer = new QTableWidgetItem(name);
         newLayer->setFont(QFont("Arial", 8, QFont::Normal, false));
         newLayer->setTextAlignment(Qt::AlignCenter);
diff -Nru tupi-0.2+git04/src/components/timeline/tuplayerindex.h tupi-0.2+git05/src/components/timeline/tuplayerindex.h
--- tupi-0.2+git04/src/components/timeline/tuplayerindex.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuplayerindex.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,6 +36,10 @@
 #ifndef TUPLAYERINDEX_H
 #define TUPLAYERINDEX_H
 
+#include "tglobal.h"
+#include "tuprequestbuilder.h"
+#include "tseparator.h"
+#include "tapplication.h"
 #include "timagebutton.h"
 #include "tupprojectrequest.h"
 
@@ -45,12 +49,17 @@
 #include <QScrollBar>
 #include <QButtonGroup>
 #include <QTableWidget>
+#include <QLayout>
+#include <QPixmap>
+#include <QHeaderView>
+#include <QPainter>
+#include <QItemDelegate>
 
 /**
  * @author David Cuadrado
 **/
 
-class TupLayerIndex : public QTableWidget
+class TUPI_EXPORT TupLayerIndex : public QTableWidget
 {
     Q_OBJECT
     
diff -Nru tupi-0.2+git04/src/components/timeline/tuplayermanager.cpp tupi-0.2+git05/src/components/timeline/tuplayermanager.cpp
--- tupi-0.2+git04/src/components/timeline/tuplayermanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuplayermanager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tuplayermanager.h"
-#include "tapplication.h"
-#include "tdebug.h"
-
-////////////////////////////////
-
-struct TupLayerManager::Private
-{
-    Private() : allSelected(false), allVisible(true), allLock(false), rowHeight(20), sceneIndex(0) {}
-    
-    bool allSelected, allVisible, allLock;
-    int rowHeight;
-    int sceneIndex;
-    TupLayerIndex *layerIndex;
-    TupLayerControls *layerControls;
-};
-
-TupLayerManager::TupLayerManager(int sceneIndex, QWidget *parent) : QWidget(parent), k(new Private)
-{
-    #ifdef K_DEBUG
-        TINIT;
-    #endif
-
-    k->layerIndex = new TupLayerIndex(sceneIndex); 
-    k->layerIndex->setFixedWidth(200);
-    k->layerControls = new TupLayerControls(sceneIndex);
-    k->layerControls->setFixedWidth(44);
-
-    QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 16);
-    layout->setSpacing(0);
-    layout->addWidget(k->layerIndex);
-    layout->addWidget(k->layerControls);
-
-    setLayout(layout);
-
-
-}
-
-TupLayerManager::~TupLayerManager()
-{
-    #ifdef K_DEBUG
-        TEND;
-    #endif
-
-    delete k;
-}
-
-TupLayerIndex* TupLayerManager::getLayerIndex()
-{
-    return k->layerIndex;
-} 
-
-TupLayerControls* TupLayerManager::getLayerControls()
-{
-    return k->layerControls;
-}
-
-void TupLayerManager::insertLayer(int position, const QString &name)
-{
-    k->layerIndex->insertLayer(position, name);
-    k->layerControls->insertLayer(position);
-}
-
-void TupLayerManager::insertSoundLayer(int position, const QString &name)
-{
-    Q_UNUSED(position);
-    Q_UNUSED(name);
-}
-
-void TupLayerManager::removeLayer(int position)
-{
-    Q_UNUSED(position);
-}
-
-void TupLayerManager::renameLayer(int position, const QString &name)
-{
-    Q_UNUSED(position);
-    Q_UNUSED(name);
-}
-
-void TupLayerManager::resizeEvent(QResizeEvent *event)
-{
-    Q_UNUSED(event);
-
-    k->layerIndex->refresh();
-}
-
-void TupLayerManager::moveLayer(int position, int newPosition)
-{
-    Q_UNUSED(position);
-    Q_UNUSED(newPosition);
-}
-
-void TupLayerManager::lockLayer(int position, bool locked)
-{
-    Q_UNUSED(position);
-    Q_UNUSED(locked);
-}
diff -Nru tupi-0.2+git04/src/components/timeline/tuplayermanager.h tupi-0.2+git05/src/components/timeline/tuplayermanager.h
--- tupi-0.2+git04/src/components/timeline/tuplayermanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuplayermanager.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TUPLAYERMANAGER_H
-#define TUPLAYERMANAGER_H
-
-#include "tuplayerindex.h"
-#include "tuplayercontrols.h"
-
-/**
- * @author David Cuadrado
-**/
-
-class TupLayerManager : public QWidget
-{
-    Q_OBJECT
-    
-    public:
-        
-        /**
-         * Default constructor
-         * @param parent 
-         * @return 
-         */
-        TupLayerManager(int sceneIndex = 0, QWidget *parent = 0);
-        ~TupLayerManager();
-        TupLayerIndex* getLayerIndex();
-        TupLayerControls* getLayerControls();
-        
-        void insertLayer(int position, const QString &name);
-        void insertSoundLayer(int position, const QString &name);
-        void removeLayer(int position);
-        void renameLayer(int position, const QString &name);
-        void moveLayer(int position, int newPosition);
-        void lockLayer(int position, bool locked);
-        
-     protected:
-        void resizeEvent(QResizeEvent *event);
-        
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/components/timeline/tuptimeline.cpp tupi-0.2+git05/src/components/timeline/tuptimeline.cpp
--- tupi-0.2+git04/src/components/timeline/tuptimeline.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptimeline.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -33,27 +33,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#include <QList>
-#include <QHeaderView>
-
 #include "tuptimeline.h"
 
-// Tupi Framework 
-#include "tapplication.h"
-#include "tdebug.h"
-
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-
-#include "tupframestable.h"
-#include "tuplayermanager.h"
-
-#include "tupprojectactionbar.h"
-
-#include "tuprequestbuilder.h"
-
-#include "tuplibrary.h"
-
 #define RETURN_IF_NOT_LIBRARY if (!k->library) return;
 
 struct TupTimeLine::Private
@@ -63,27 +44,33 @@
     TTabWidget *container;
     TupProjectActionBar *actionBar;
     int selectedLayer; 
-    const TupLibrary *library;
+    TupProject *project;
+    TupLibrary *library;
 };
 
-TupTimeLine::TupTimeLine(QWidget *parent) : TupModuleWidgetBase(parent, "TupTimeLine"), k(new Private)
+TupTimeLine::TupTimeLine(TupProject *project, QWidget *parent) : TupModuleWidgetBase(parent, "TupTimeLine"), k(new Private)
 {
     #ifdef K_DEBUG
-        TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupTimeLine()]";
+        #else
+            TINIT;
+        #endif
     #endif
     
     setWindowTitle(tr("Time Line"));
     setWindowIcon(QPixmap(THEME_DIR + "icons/time_line.png"));
+
+    k->project = project;
+    k->library = k->project->library();
     
     k->actionBar = new TupProjectActionBar(QString("TimeLine"), TupProjectActionBar::InsertLayer |
                         TupProjectActionBar::RemoveLayer |
-                        // TupProjectActionBar::MoveLayerUp |
-                        // TupProjectActionBar::MoveLayerDown |
                         TupProjectActionBar::Separator |
                         TupProjectActionBar::InsertFrame |
                         TupProjectActionBar::RemoveFrame |
-                        TupProjectActionBar::MoveFrameUp |
-                        TupProjectActionBar::MoveFrameDown |
+                        TupProjectActionBar::MoveFrameBackward |
+                        TupProjectActionBar::MoveFrameForward |
                         TupProjectActionBar::LockFrame);
    
     addChild(k->actionBar, Qt::AlignCenter);
@@ -92,92 +79,52 @@
     addChild(k->container);
     
     connect(k->actionBar, SIGNAL(actionSelected(int)), this, SLOT(requestCommand(int)));
-    connect(k->container, SIGNAL(currentChanged(int)), this, SLOT(emitRequestChangeScene(int)));
-
+    connect(k->container, SIGNAL(currentChanged(int)), this, SLOT(requestSceneSelection(int)));
 }
 
 TupTimeLine::~TupTimeLine()
 {
     #ifdef K_DEBUG
-        TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupTimeLine()]";
+        #else
+            TEND;
+        #endif
     #endif
-    delete k;
-}
 
-TupLayerManager *TupTimeLine::layerManager(int sceneIndex)
-{
-    QSplitter *splitter = qobject_cast<QSplitter *>(k->container->widget(sceneIndex));
-    splitter->setMinimumHeight(146);
-
-    if (splitter)
-        return qobject_cast<TupLayerManager *>(splitter->widget(0));
-    
-    return 0;
+    delete k;
 }
 
-TupFramesTable *TupTimeLine::framesTable(int sceneIndex)
+TupTimeLineTable *TupTimeLine::framesTable(int sceneIndex)
 {
-    QSplitter *splitter = qobject_cast<QSplitter *>(k->container->widget(sceneIndex));
-    
-    if (splitter)
-        return qobject_cast<TupFramesTable *>(splitter->widget(1));
-    
+    TupTimeLineTable *framesTable = qobject_cast<TupTimeLineTable *>(k->container->widget(sceneIndex));
+    if (framesTable)
+        return framesTable;
+ 
     return 0;
 }
 
-void TupTimeLine::insertScene(int position, const QString &name)
+void TupTimeLine::insertScene(int sceneIndex, const QString &name)
 {
-    if (position < 0 || position > k->container->count())
+    if (sceneIndex < 0 || sceneIndex > k->container->count())
         return;
-    
-    QSplitter *splitter = new QSplitter(k->container);
-    splitter->setContentsMargins(1, 1, 1, 1);
-    
-    TupLayerManager *layerManager = new TupLayerManager(position, splitter);
-    layerManager->setFixedWidth(244);
-
-    splitter->addWidget(layerManager);
-
-    connect(layerManager->getLayerIndex(), SIGNAL(localRequest()), this, SLOT(emitSelectionSignal()));
-
-    // connect(layerManager, SIGNAL(requestRenameEvent(int, const QString&)), this,
-    //        SLOT(emitRequestRenameLayer(int, const QString &))); // FIXME
 
-    connect(layerManager->getLayerControls(), SIGNAL(layerVisibility(int, int, bool)), this, 
-            SLOT(emitLayerVisibility(int, int, bool)));
-
-    TupFramesTable *framesTable = new TupFramesTable(position, splitter);
-    splitter->addWidget(framesTable);
-    
+    TupTimeLineTable *framesTable = new TupTimeLineTable(sceneIndex, k->container);
     framesTable->setItemSize(10, 20);
 
-    connect(layerManager->getLayerIndex()->verticalScrollBar(), SIGNAL(valueChanged(int)), framesTable->verticalScrollBar(),
-            SLOT(setValue(int)));
-
-    connect(layerManager->getLayerControls()->verticalScrollBar(), SIGNAL(valueChanged(int)), framesTable->verticalScrollBar(),
-            SLOT(setValue(int)));
-
-    connect(framesTable, SIGNAL(frameRequest(int, int, int, int, const QVariant&)), this, 
-            SLOT(requestFrameAction(int, int, int, int, const QVariant&)));
-
-    connect(framesTable->verticalScrollBar(), SIGNAL(valueChanged(int)), layerManager->getLayerIndex()->verticalScrollBar(),
-            SLOT(setValue(int)));
-
-    connect(framesTable->verticalScrollBar(), SIGNAL(valueChanged(int)), layerManager->getLayerControls()->verticalScrollBar(),
-            SLOT(setValue(int)));
-
-    //connect(framesTable, SIGNAL(emitSelection(int, int)), this, SLOT(selectFrame(int, int)));
+    connect(framesTable, SIGNAL(frameSelected(int, int)), this, SLOT(selectFrame(int, int)));
+    connect(framesTable, SIGNAL(visibilityChanged(int, bool)), this, SLOT(requestLayerVisibilityAction(int, bool)));
+    connect(framesTable, SIGNAL(layerNameChanged(int, const QString &)), this, SLOT(requestLayerRenameAction(int, const QString &))); 
+    connect(framesTable, SIGNAL(layerMoved(int, int)), this, SLOT(requestLayerMove(int, int)));
 
-    k->container->insertTab(position, splitter, name);
+    k->container->insertTab(sceneIndex, framesTable, name);
 }
 
-void TupTimeLine::removeScene(int position)
+void TupTimeLine::removeScene(int sceneIndex)
 {
-    if (position >= 0 && position < k->container->count()) {
-        QWidget *w = k->container->widget(position);
-        // k->container->removeWidget(w);
-        k->container->removeTab(position);
-        
+    if (sceneIndex >= 0 && sceneIndex < k->container->count()) {
+        QWidget *w = k->container->widget(sceneIndex);
+        k->container->removeTab(sceneIndex);
         delete w;
     }
 }
@@ -188,18 +135,16 @@
            delete k->container->currentWidget();
 }
 
-void TupTimeLine::setLibrary(const TupLibrary *library)
-{
-    k->library = library;
-}
-
 void TupTimeLine::sceneResponse(TupSceneResponse *response)
 {
     Q_UNUSED(response);
 
-    /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupTimeLine::sceneResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     switch (response->action()) {
@@ -234,207 +179,247 @@
             }
             break;
             default:
-                 tFatal() << "TupTimeLine::sceneResponse : Unknown action :/";
+                 #ifdef K_DEBUG
+                     QString msg = "TupTimeLine::sceneResponse : Unknown action :/";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tFatal() << msg;
+                     #endif
+                 #endif
             break;
     }
-    */
 }
 
 void TupTimeLine::layerResponse(TupLayerResponse *response)
 {
     Q_UNUSED(response);
 
-    /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupTimeLine::layerResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
-    switch (response->action()) {
-            case TupProjectRequest::Add:
-            {
-            TupLayerManager *layerManager = this->layerManager(response->sceneIndex());
-            if (layerManager)
-                layerManager->insertLayer(response->layerIndex(), response->arg().toString());
-            
-            TupFramesTable *framesTable = this->framesTable(response->sceneIndex());
-            if (framesTable)
-                framesTable->insertLayer(response->layerIndex(), response->arg().toString());
-            }
-            
-            break;
-            case TupProjectRequest::Remove:
-            {
-                 tFatal() << "TupTimeLine::layerResponse -> Removing layer!";
-
-                 TupLayerManager *layerManager = this->layerManager(response->sceneIndex());
-                 if (layerManager)
-                     layerManager->removeLayer(response->layerIndex());
-            
-                 TupFramesTable *framesTable = this->framesTable(response->sceneIndex());
-                 if (framesTable)
+    TupTimeLineTable *framesTable = this->framesTable(response->sceneIndex());
+    if (framesTable) {
+        switch (response->action()) {
+                case TupProjectRequest::Add:
+                {
+                     framesTable->insertLayer(response->layerIndex(), response->arg().toString());
+                }
+                break;
+                case TupProjectRequest::Remove:
+                {
                      framesTable->removeLayer(response->layerIndex());
-            }
-            break;
-            case TupProjectRequest::Move:
-            {
-                 TupLayerManager *layerManager = this->layerManager(response->sceneIndex());
-                 if (layerManager)
-                     layerManager->moveLayer(response->layerIndex(), response->arg().toInt());
-            
-                 TupFramesTable *framesTable = this->framesTable(response->sceneIndex());
-                 if (framesTable)
+                     if (framesTable->layersTotal() == 0) {
+                         TupProjectRequest request = TupRequestBuilder::createLayerRequest(0, 0, TupProjectRequest::Add, tr("Layer %1").arg(1));
+                         emit requestTriggered(&request);
+
+                         request = TupRequestBuilder::createFrameRequest(0, 0, 0, TupProjectRequest::Add, tr("Frame %1").arg(1));
+                         emit requestTriggered(&request);
+                     }
+                }
+                break;
+                case TupProjectRequest::Move:
+                {
                      framesTable->moveLayer(response->layerIndex(), response->arg().toInt());
-            }
-            break;
-            case TupProjectRequest::Lock:
-            {
-                 TupLayerManager *layerManager = this->layerManager(response->sceneIndex());
-            
-                 if (layerManager)
-                     layerManager->lockLayer(response->layerIndex(), response->arg().toBool());
-            }
-            break;
-            case TupProjectRequest::Rename:
-            {
-                 TupLayerManager *layerManager = this->layerManager(response->sceneIndex());
-            
-                 if (layerManager)
-                     layerManager->renameLayer(response->layerIndex(), response->arg().toString());
-            }
-            break;
-            case TupProjectRequest::View:
-            {
-                 TupLayerManager *layerManager = this->layerManager(response->sceneIndex());
-                 layerManager->getLayerControls()->setLayerVisibility(response->layerIndex(), response->arg().toString());
-            }
-            break;
+                }
+                break;
+                case TupProjectRequest::Lock:
+                {
+                     // SQA: Pending for implementation
+                }
+                break;
+                case TupProjectRequest::Rename:
+                {
+                     framesTable->setLayerName(response->layerIndex(), response->arg().toString());
+                }
+                break;
+                case TupProjectRequest::View:
+                {
+                     framesTable->setLayerVisibility(response->layerIndex(), response->arg().toBool());
+                }
+                break;
+        }
     }
-
-    */
 }
 
 void TupTimeLine::frameResponse(TupFrameResponse *response)
 {
     Q_UNUSED(response);
 
-    /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupTimeLine::frameResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
-    switch (response->action()) {
-            case TupProjectRequest::Add:
-            {
-                 TupFramesTable *framesTable = this->framesTable(response->sceneIndex());
-
-                 if (framesTable)
+    TupTimeLineTable *framesTable = this->framesTable(response->sceneIndex());
+    if (framesTable) {
+        switch (response->action()) {
+                case TupProjectRequest::Add:
+                {
                      framesTable->insertFrame(response->layerIndex(), response->arg().toString());
-                 else
-                     tFatal() << "TupTimeLine::frameResponse -> NO FRAME TABLE AVAILABLE!";
-            }
-            break;
-            case TupProjectRequest::Remove:
-            {
-                 TupFramesTable *framesTable = this->framesTable(response->sceneIndex());
-            
-                 if (framesTable)
+                }
+                break;
+                case TupProjectRequest::Remove:
+                {
                      framesTable->removeFrame(response->layerIndex(), response->frameIndex());
-            }
-            break;
-            case TupProjectRequest::Move:
-            {
-            }
-            break;
-            case TupProjectRequest::Lock:
-            {
-                 TupFramesTable *framesTable = this->framesTable(response->sceneIndex());
-
-                 if (framesTable)
+                }
+                break;
+                case TupProjectRequest::Move:
+                {
+                     // No action taken
+                }
+                break;
+                case TupProjectRequest::Exchange:
+                {
+                     framesTable->exchangeFrame(response->frameIndex(), response->layerIndex(), response->arg().toInt(), response->layerIndex());
+                }
+                break;
+                case TupProjectRequest::Lock:
+                {
                      framesTable->lockFrame(response->layerIndex(), response->frameIndex(), response->arg().toBool());
-            }
-            break;
-            case TupProjectRequest::Rename:
-            {
-            }
-            break;
-            case TupProjectRequest::Select:
-            {
-                 tFatal() << "TupTimeLine::frameResponse() - Just tracing Selection!";
-
-                 int layerIndex = response->layerIndex();
-
-                 if (k->selectedLayer != layerIndex) {
-                     layerManager(response->sceneIndex())->getLayerIndex()->setCurrentCell(layerIndex, 0);
-                     k->selectedLayer = layerIndex; 
-                 }
-
-                 framesTable(response->sceneIndex())->blockSignals(true);
-                 framesTable(response->sceneIndex())->setCurrentCell(layerIndex, response->frameIndex());
-                 framesTable(response->sceneIndex())->blockSignals(false);
-            }
-            break;
+                }
+                break;
+                case TupProjectRequest::Rename:
+                {
+                }
+                break;
+                case TupProjectRequest::Select:
+                {
+                     int layerIndex = response->layerIndex();
+                     k->selectedLayer = layerIndex;
 
+                     framesTable->selectFrame(layerIndex, response->frameIndex());
+                }
+                break;
+        }
     }
-    */
 }
 
 void TupTimeLine::libraryResponse(TupLibraryResponse *response)
 {
     Q_UNUSED(response);
 
-    /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupTimeLine::libraryResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (response->action() == TupProjectRequest::InsertSymbolIntoFrame) {
         switch (response->symbolType()) {
                 case TupLibraryObject::Sound:
                 {
-                     TupLayerManager *layerManager = this->layerManager(response->sceneIndex());
-                     if (layerManager) {
-                         layerManager->insertSoundLayer(response->layerIndex()+1, 
-                                                        response->arg().toString());
-                    
-                         TupFramesTable *framesTable = this->framesTable(response->sceneIndex());
-                         if (framesTable) {
-                             framesTable->insertSoundLayer(response->layerIndex()+1, 
-                                                           response->arg().toString());
-                             framesTable->insertFrame(response->layerIndex()+1,"");
-                         }
+                     TupTimeLineTable *framesTable = this->framesTable(response->sceneIndex());
+                     if (framesTable) {
+                         framesTable->insertSoundLayer(response->layerIndex() + 1, response->arg().toString());
+                         framesTable->insertFrame(response->layerIndex() + 1, "");
                      }
                 }
                 break;
+                default:
+                    // Do nothing
+                break;
         };
     }
-
-    */
 }
 
 void TupTimeLine::requestCommand(int action)
 {
     int scenePos = k->container->currentIndex();
 
-    if (scenePos < 0)
+    if (scenePos < 0) {
+        #ifdef K_DEBUG
+            QString msg = "TupTimeLine::requestCommand() - Fatal Error: Scene index is invalid -> " + QString::number(scenePos);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal("timeline") << msg;
+            #endif
+        #endif
+
         return;
-    
-    int layerPos = layerManager(scenePos)->getLayerIndex()->verticalHeader()->visualIndex(
-                   layerManager(scenePos)->getLayerIndex()->currentRow());
+    }
 
-    int framePos = framesTable(scenePos)->lastFrameByLayer(layerPos) + 1;
+    int layerPos = framesTable(scenePos)->currentLayer();
+
+    if (layerPos < 0) {
+        #ifdef K_DEBUG
+            QString msg = "TupTimeLine::requestCommand() - Fatal Error: Layer index is invalid -> " + QString::number(layerPos);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal("timeline") << msg;
+            #endif
+        #endif
+
+        return;
+    }
+
+    int framePos = framesTable(scenePos)->lastFrameByLayer(layerPos);
+
+    if (framePos < 0) {
+        #ifdef K_DEBUG
+            QString msg = "TupTimeLine::requestCommand() - Fatal Error: Frame index is invalid -> " + QString::number(framePos);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal("timeline") << msg;
+            #endif
+        #endif
+
+        return;
+    }
+
+    if (TupProjectActionBar::FrameActions & action) {
+        if (!requestFrameAction(action, framePos, layerPos, scenePos)) {
+            #ifdef K_DEBUG
+                QString msg = "TupTimeLine::requestCommand() - Fatal Error: Frame action has failed!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tFatal("timeline") << msg;
+                #endif
+            #endif
+        }
+        return;
+    }
 
-    if (!requestFrameAction(action, framePos, layerPos, scenePos)) {
-        tFatal() << "TupTimeLine::requestCommand -> It isn't frame action";
-        layerPos = layerManager(scenePos)->getLayerIndex()->rowCount();
-        framePos = framesTable(scenePos)->lastFrameByLayer(layerPos);
+    if (TupProjectActionBar::LayerActions & action) {
         if (!requestLayerAction(action, layerPos, scenePos)) {
-            tFatal() << "TupTimeLine::requestCommand -> It isn't layer action";
-            if (!requestSceneAction(action, scenePos)) {
-                #ifdef K_DEBUG
-                    tFatal("timeline") << "Can't handle action";
+            #ifdef K_DEBUG
+                QString msg = "TupTimeLine::requestCommand() - Fatal Error: Layer action has failed!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tFatal("timeline") << msg;
                 #endif
-            }
+            #endif
         }
+        return;
+    }
+
+    if (TupProjectActionBar::SceneActions & action) {
+        if (!requestSceneAction(action, scenePos)) {
+            #ifdef K_DEBUG
+                QString msg = "TupTimeLine::requestCommand() - Fatal Error: Scene action has failed!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tFatal("timeline") << msg;
+                #endif
+            #endif
+        }
+        return;
     }
 }
 
@@ -442,79 +427,115 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupTimeLine::requestFrameAction()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
-    if (scenePos < 0)
-        scenePos = k->container->currentIndex();
+    Q_UNUSED(framePos);
+
+    TupProjectRequest request;
 
     switch (action) {
             case TupProjectActionBar::InsertFrame:
             {
-                 int layersTotal = layerManager(scenePos)->getLayerIndex()->rowCount();
-                 int usedFrames = framesTable(scenePos)->lastFrameByLayer(layerPos);
-
-                 if (layersTotal == 1) {
-                     for (int frame = usedFrames; frame < framePos; frame++) {
-                          TupProjectRequest event = TupRequestBuilder::createFrameRequest(scenePos, layerPos, frame + 1,
-                                                   TupProjectRequest::Add, tr("Frame %1").arg(frame + 2));
-                          emit requestTriggered(&event);
-                     }
+                 int lastFrame = framesTable(scenePos)->lastFrameByLayer(layerPos);
+                 int currentFrame = framesTable(scenePos)->currentColumn();
 
+                 if (currentFrame == lastFrame) {
+                     request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, lastFrame + 1,
+                                                TupProjectRequest::Add, tr("Frame %1").arg(lastFrame + 2));
+                     emit requestTriggered(&request);
                  } else {
-                     usedFrames++;
-
-                     for (int layer=0; layer < layersTotal; layer++) {
-                          for (int frame = usedFrames; frame <= framePos; frame++) {
-                               TupProjectRequest event = TupRequestBuilder::createFrameRequest(scenePos, layer, frame,
-                                                        TupProjectRequest::Add, tr("Frame %1").arg(frame + 1));
-                               emit requestTriggered(&event);
-                          }
+                     request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, currentFrame + 1,
+                                                TupProjectRequest::Add, tr("Frame %1").arg(currentFrame + 2));
+                     emit requestTriggered(&request);
+                     int target = currentFrame + 2;
+                     for (int index=target; index <= lastFrame+1; index++) {
+                          target++;
+                          request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, index, TupProjectRequest::Rename, tr("Frame %1").arg(target));
+                          emit requestTriggered(&request);
                      }
                  }
-            
+
                  return true;
             }
             break;
             case TupProjectActionBar::RemoveFrame:
             {
-                 TupProjectRequest event = TupRequestBuilder::createFrameRequest(scenePos, layerPos, framePos - 1,
-                                          TupProjectRequest::Remove, arg);
-                 emit requestTriggered(&event);
+                 int lastFrame = framesTable(scenePos)->lastFrameByLayer(layerPos);
+                 int currentFrame = framesTable(scenePos)->currentColumn(); 
+
+                 if (currentFrame > lastFrame)
+                     return false;
+
+                 if (lastFrame == 0) {
+                     TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, 0, TupProjectRequest::Reset);
+                     emit requestTriggered(&request);
+                     return true;
+                 }
+
+                 if (currentFrame == lastFrame) {
+                     TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, currentFrame, TupProjectRequest::Remove);
+                     emit requestTriggered(&request);
+
+                     if (currentFrame > 0)
+                         selectFrame(layerPos, currentFrame-1);
+                     else
+                         framesTable(scenePos)->clearSelection();
+                 } else {
+                     request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, currentFrame, TupProjectRequest::Remove, arg);
+                     emit requestTriggered(&request);
+
+                     selectFrame(layerPos, currentFrame);
+                 }
 
                  return true;
             }
             break;
-            case TupProjectActionBar::MoveFrameUp:
+            case TupProjectActionBar::MoveFrameBackward:
             {
-                 TupProjectRequest event = TupRequestBuilder::createFrameRequest(scenePos, layerPos, framePos,
-                                          TupProjectRequest::Move, framePos-1);
-                 emit requestTriggered(&event);
+                 int currentFrame = framesTable(scenePos)->currentColumn();
+
+                 TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, currentFrame, TupProjectRequest::Exchange, currentFrame - 1);
+                 emit requestTriggered(&request);
 
                  return true;
             }
             break;
-            case TupProjectActionBar::MoveFrameDown:
+            case TupProjectActionBar::MoveFrameForward:
             {
-                 TupProjectRequest event = TupRequestBuilder::createFrameRequest(scenePos, layerPos, framePos,
-                                          TupProjectRequest::Move, framePos+1);
-                 emit requestTriggered(&event);
+                 int currentFrame = framesTable(scenePos)->currentColumn();
+                 int lastFrame = framesTable(scenePos)->lastFrameByLayer(layerPos);
+
+                 if (currentFrame == lastFrame) {
+                     TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, lastFrame + 1, TupProjectRequest::Add, tr("Frame %1").arg(lastFrame + 2));
+                     emit requestTriggered(&request);
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, currentFrame, TupProjectRequest::Exchange, currentFrame + 1);
+                 emit requestTriggered(&request);
 
                  return true;
             }
             break;
-            /*
-            case TupProjectActionBar::SelectFrame:
+            case TupProjectActionBar::LockFrame:
             {
-                 TupProjectRequest event = TupRequestBuilder::createFrameRequest(scenePos, layerPos, framePos,
-                                          TupProjectRequest::Select, arg);
-                 emit localRequestTriggered(&event);
+                 int currentFrame = framesTable(scenePos)->currentColumn();
+                 bool locked = framesTable(scenePos)->frameIsLocked(layerPos, currentFrame);
+
+                 TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, layerPos, currentFrame, TupProjectRequest::Lock, !locked);
+                 emit requestTriggered(&request);
 
                  return true;
             }
             break;
-            */
+            default:
+                 // Do nothing
+            break;
     }
     
     return false;
@@ -522,32 +543,23 @@
 
 bool TupTimeLine::requestLayerAction(int action, int layerPos, int scenePos, const QVariant &arg)
 {
-    if (scenePos < 0)
-        scenePos = k->container->currentIndex();
-    
-    if (scenePos >= 0) {
-        if (layerPos < 0)
-            layerPos = layerManager(scenePos)->getLayerIndex()->verticalHeader()->visualIndex(
-                                    layerManager(scenePos)->getLayerIndex()->currentRow());
-    }
+    TupProjectRequest request;
 
     switch (action) {
             case TupProjectActionBar::InsertLayer:
             {
-                 TupProjectRequest event = TupRequestBuilder::createLayerRequest(scenePos, layerPos,
-                                          TupProjectRequest::Add, tr("Layer %1").arg(layerPos + 1));
-                 emit requestTriggered(&event);
-
-                 if (layerPos == 0) {
-                     event = TupRequestBuilder::createFrameRequest(scenePos, layerPos, 0,
-                                               TupProjectRequest::Add, tr("Frame %1").arg(1));
-                     emit requestTriggered(&event);
+                 int layerIndex = framesTable(scenePos)->layersTotal();
+                 request = TupRequestBuilder::createLayerRequest(scenePos, layerIndex, TupProjectRequest::Add, tr("Layer %1").arg(layerIndex + 1));
+                 emit requestTriggered(&request);
+
+                 if (layerIndex == 0) {
+                     request = TupRequestBuilder::createFrameRequest(scenePos, layerIndex, 0, TupProjectRequest::Add, tr("Frame %1").arg(1));
+                     emit requestTriggered(&request);
                  } else {
-                     int total = framesTable(scenePos)->lastFrameByLayer(layerPos-1);
+                     int total = framesTable(scenePos)->lastFrameByLayer(layerIndex - 1);
                      for (int j=0; j <= total; j++) {
-                          event = TupRequestBuilder::createFrameRequest(scenePos, layerPos, j,
-                                                                       TupProjectRequest::Add, tr("Frame %1").arg(j + 1));
-                          emit requestTriggered(&event);
+                          request = TupRequestBuilder::createFrameRequest(scenePos, layerIndex, j, TupProjectRequest::Add, tr("Frame %1").arg(j + 1));
+                          emit requestTriggered(&request);
                      }
                  }
 
@@ -556,31 +568,12 @@
             break;
             case TupProjectActionBar::RemoveLayer:
             {
-                 TupProjectRequest event = TupRequestBuilder::createLayerRequest(scenePos, layerPos-1, 
-                                          TupProjectRequest::Remove, arg);
-            
-                 emit requestTriggered(&event);
-
-                 return true;
-            }
-            break;
-            case TupProjectActionBar::MoveLayerUp:
-            {
-                 TupProjectRequest event = TupRequestBuilder::createLayerRequest(scenePos, layerPos, 
-                                          TupProjectRequest::Move, layerPos - 1);
-                 emit requestTriggered(&event);
+                 request = TupRequestBuilder::createLayerRequest(scenePos, layerPos, TupProjectRequest::Remove, arg);
+                 emit requestTriggered(&request);
 
                  return true;
             }
             break;
-            case TupProjectActionBar::MoveLayerDown:
-            {
-                 TupProjectRequest event = TupRequestBuilder::createLayerRequest(scenePos, layerPos, 
-                                          TupProjectRequest::Move, layerPos + 1);
-                 emit requestTriggered(&event);
-                 return true;
-            }
-            break;
     }
     
     return false;
@@ -588,101 +581,128 @@
 
 bool TupTimeLine::requestSceneAction(int action, int scenePos, const QVariant &arg)
 {
-    if (scenePos < 0)
-        scenePos = k->container->currentIndex();
-    
+    TupProjectRequest request;
+
     switch (action) {
             case TupProjectActionBar::InsertScene:
             {
-                 TupProjectRequest event = TupRequestBuilder::createSceneRequest(scenePos + 1, 
-                                           TupProjectRequest::Add, tr("Scene %1").arg(scenePos + 2));
-            
-                 emit requestTriggered(&event);
+                 request = TupRequestBuilder::createSceneRequest(scenePos + 1, TupProjectRequest::Add, tr("Scene %1").arg(scenePos + 2));
+                 emit requestTriggered(&request);
             
                  return true;
             }
             break;
             case TupProjectActionBar::RemoveScene:
             {
-                 TupProjectRequest event = TupRequestBuilder::createSceneRequest(scenePos, 
-                                          TupProjectRequest::Remove, arg);
-            
-                 emit requestTriggered(&event);
+                 request = TupRequestBuilder::createSceneRequest(scenePos, TupProjectRequest::Remove, arg);
+                 emit requestTriggered(&request);
 
                  return true;
             }
             break;
             case TupProjectActionBar::MoveSceneUp:
             {
-                 TupProjectRequest event = TupRequestBuilder::createSceneRequest(scenePos, TupProjectRequest::Move,
-                                          scenePos + 1);
-                 emit requestTriggered(&event);
+                 request = TupRequestBuilder::createSceneRequest(scenePos, TupProjectRequest::Move, scenePos + 1);
+                 emit requestTriggered(&request);
 
                  return true;
             }
             break;
             case TupProjectActionBar::MoveSceneDown:
             {
-                 TupProjectRequest event = TupRequestBuilder::createSceneRequest(scenePos, TupProjectRequest::Move,
-                                          scenePos - 1);
-                 emit requestTriggered(&event);
+                 request = TupRequestBuilder::createSceneRequest(scenePos, TupProjectRequest::Move, scenePos - 1);
+                 emit requestTriggered(&request);
+
                  return true;
             }
             break;
+            default:
+                 // Do nothing
+            break;
     }
     
     return false;
 }
 
-void TupTimeLine::emitRequestRenameLayer(int layer, const QString &name)
+void TupTimeLine::requestLayerVisibilityAction(int layer, bool isVisible)
 {
     /*
     #ifdef K_DEBUG
-        T_FUNCINFO << name;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupTimeLine::requestLayerVisibilityAction()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
     int scenePos = k->container->currentIndex();
-    
-    TupProjectRequest event = TupRequestBuilder::createLayerRequest(scenePos, layer, TupProjectRequest::Rename, name);
-    
-    emit requestTriggered(&event);
+
+    TupProjectRequest request = TupRequestBuilder::createLayerRequest(scenePos, layer, TupProjectRequest::View, isVisible);
+    emit requestTriggered(&request);
 }
 
-void TupTimeLine::emitSelectionSignal()
+void TupTimeLine::requestLayerRenameAction(int layer, const QString &name)
 {
-    // tFatal() << "TupTimeLine::emitSelectionSignal() - Just tracing!";
+    /*
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupTimeLine::requestLayerRenameAction()]";
+            qDebug() << "name: " << name;
+        #else
+            T_FUNCINFO << name;
+        #endif
+    #endif
+    */
 
     int scenePos = k->container->currentIndex();
-    int layerPos = layerManager(scenePos)->getLayerIndex()->currentRow();
-    k->selectedLayer = layerPos;
-    int frame = framesTable(scenePos)->currentColumn();
-
-    requestFrameAction(TupProjectRequest::Select, frame, layerPos, scenePos);
-}
-
-void TupTimeLine::emitLayerVisibility(int sceneIndex, int layerIndex, bool checked) 
-{
-    TupProjectRequest event = TupRequestBuilder::createLayerRequest(sceneIndex,
-                             layerIndex, TupProjectRequest::View, checked);
-    emit requestTriggered(&event);
+    
+    TupProjectRequest request = TupRequestBuilder::createLayerRequest(scenePos, layer, TupProjectRequest::Rename, name);
+    emit requestTriggered(&request);
 }
 
 void TupTimeLine::selectFrame(int indexLayer, int indexFrame)
 {
     int scenePos = k->container->currentIndex();
+    TupScene *scene = k->project->scene(scenePos);
+    if (scene) {
+        int lastFrame = framesTable(scenePos)->lastFrameByLayer(indexLayer);
+
+        if (indexFrame > lastFrame) {
+            int totalFrames = scene->framesTotal();
+
+            if (indexFrame > (totalFrames-1)) {
+                int layersTotal = scene->layersTotal();
+                for (int layer=0; layer < layersTotal; layer++) {
+                     int currentLimit = framesTable(scenePos)->lastFrameByLayer(layer); 
+                     for (int frame = currentLimit + 1; frame <= indexFrame; frame++) {
+                          TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, layer, frame,
+                                                      TupProjectRequest::Add, tr("Frame %1").arg(frame + 1));
+                          emit requestTriggered(&request);
+                     }
+                }
+            } else {
+                for (int frame = lastFrame + 1; frame <= indexFrame; frame++) {
+                     TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, indexLayer, frame,
+                                                 TupProjectRequest::Add, tr("Frame %1").arg(frame + 1));
+                     emit requestTriggered(&request);
+                }
+            }
 
-    // tFatal() << "TupTimeLine::selectFrame() - Just tracing!";
-    TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, indexLayer,
-                                                 indexFrame, TupProjectRequest::Select, "1");
-    emit requestTriggered(&request);
+            TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, indexLayer,
+                                                           indexFrame, TupProjectRequest::Select, "1");
+            emit requestTriggered(&request);
+        }
 
+        TupProjectRequest request = TupRequestBuilder::createFrameRequest(scenePos, indexLayer,
+                                                       indexFrame, TupProjectRequest::Select, "1");
+        emit requestTriggered(&request);
+    }
 }
 
-void TupTimeLine::emitRequestChangeScene(int sceneIndex)
+void TupTimeLine::requestSceneSelection(int sceneIndex)
 {
     if (k->container->count() > 1) {
-        // tFatal() << "TupTimeLine::emitRequestChangeScene - Just tracing!";
         TupProjectRequest request = TupRequestBuilder::createSceneRequest(sceneIndex, TupProjectRequest::Select);
         emit localRequestTriggered(&request);
     }
@@ -690,9 +710,14 @@
 
 void TupTimeLine::emitRequestChangeFrame(int sceneIndex, int layerIndex, int frameIndex)
 {
-    // tFatal() << "TupTimeLine::emitRequestChangeFrame - Just tracing!";
-    TupProjectRequest event = TupRequestBuilder::createFrameRequest(sceneIndex, layerIndex, frameIndex,
-                             TupProjectRequest::Select, "1");
-    emit requestTriggered(&event);
+    TupProjectRequest request = TupRequestBuilder::createFrameRequest(sceneIndex, layerIndex, frameIndex,
+                                TupProjectRequest::Select, "1");
+    emit requestTriggered(&request);
 }
 
+void TupTimeLine::requestLayerMove(int oldIndex, int newIndex)
+{
+    TupProjectRequest request = TupRequestBuilder::createLayerRequest(k->container->currentIndex(), oldIndex,
+                                                   TupProjectRequest::Move, newIndex);
+    emit requestTriggered(&request);
+}
diff -Nru tupi-0.2+git04/src/components/timeline/tuptimeline.h tupi-0.2+git05/src/components/timeline/tuptimeline.h
--- tupi-0.2+git04/src/components/timeline/tuptimeline.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptimeline.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,46 +36,46 @@
 #ifndef TUPTIMELINE_H
 #define TUPTIMELINE_H
 
+#include "tglobal.h"
 #include "tupmodulewidgetbase.h"
 #include "ttabwidget.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tuptimelinetable.h"
+#include "tupprojectactionbar.h"
+#include "tuprequestbuilder.h"
+#include "tupproject.h"
+#include "tuplibrary.h"
 
-#include <QSplitter>
 #include <QStackedWidget>
-
-class TupLayerManager;
-class TupFramesTable;
-class TupProjectActionBar;
-class TupFramesTableItem;
-class TupLibrary;
+#include <QList>
+#include <QHeaderView>
 
 /**
  * @author David Cuadrado
 **/
 
-class TupTimeLine : public TupModuleWidgetBase
+class TUPI_EXPORT TupTimeLine : public TupModuleWidgetBase
 {
     Q_OBJECT
 
     public:
-        TupTimeLine(QWidget *parent = 0);
+        TupTimeLine(TupProject *project, QWidget *parent = 0);
         ~TupTimeLine();
         void closeAllScenes();
         
-        void setLibrary(const TupLibrary *library);
-        
     private:
-        TupLayerManager *layerManager(int sceneIndex);
-        TupFramesTable *framesTable(int sceneIndex);
+        TupTimeLineTable *framesTable(int sceneIndex);
         
     protected:
-        void sceneResponse(TupSceneResponse *e);
-        void layerResponse(TupLayerResponse *e);
-        void frameResponse(TupFrameResponse *e);
+        void sceneResponse(TupSceneResponse *response);
+        void layerResponse(TupLayerResponse *response);
+        void frameResponse(TupFrameResponse *response);
         void libraryResponse(TupLibraryResponse *response);
         
     public slots:
-        void insertScene(int position, const QString &name);
-        void removeScene(int position);
+        void insertScene(int sceneIndex, const QString &name);
+        void removeScene(int sceneIndex);
         void emitRequestChangeFrame(int sceneIndex, int layerIndex, int frameIndex);
 
     private slots:
@@ -84,11 +84,11 @@
         bool requestLayerAction(int action, int layerPos = -1, int scenePos = -1, const QVariant &arg = QVariant());
         bool requestSceneAction(int action, int scenePos = -1, const QVariant &arg = QVariant());
         void selectFrame(int indexLayer, int indexFrame);
-        
-        void emitRequestRenameLayer(int layer, const QString &name);
-        void emitSelectionSignal();
-        void emitLayerVisibility(int sceneIndex, int layerIndex, bool checked);
-        void emitRequestChangeScene(int sceneIndex);
+        void requestLayerMove(int oldIndex, int newIndex);
+
+        void requestLayerVisibilityAction(int layer, bool isVisible);
+        void requestLayerRenameAction(int layer, const QString &name);
+        void requestSceneSelection(int sceneIndex);
         
     private:
         struct Private;
diff -Nru tupi-0.2+git04/src/components/timeline/tuptimelineheader.cpp tupi-0.2+git05/src/components/timeline/tuptimelineheader.cpp
--- tupi-0.2+git04/src/components/timeline/tuptimelineheader.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptimelineheader.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,251 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     *
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tuptimelineheader.h"
+
+struct TupTimeLineHeader::Private
+{
+    QPixmap lockIcon;
+    QPixmap viewIconOn;
+    QPixmap viewIconOff;
+    int currentLayer;
+    QList<TimeLineLayerItem> layers;
+    QLineEdit *editor;
+    int editorSection;
+    bool sectionOnMotion;
+};
+
+TupTimeLineHeader::TupTimeLineHeader(QWidget * parent) : QHeaderView(Qt::Vertical, parent), k(new Private)
+{
+    setSectionsClickable(true);
+    setSectionsMovable(true);
+
+    setFixedWidth(115);
+    // SQA: This code will be disabled until the "Lock layer" feature is implemented
+    // setFixedWidth(140);
+    // k->lockIcon = QPixmap(THEME_DIR + "icons/padlock.png");
+    k->viewIconOn = QPixmap(THEME_DIR + "icons/show_layer.png");
+    k->viewIconOff = QPixmap(THEME_DIR + "icons/hide_layer.png");
+
+    connect(this, SIGNAL(sectionDoubleClicked(int)), this, SLOT(showTitleEditor(int)));
+
+    k->editorSection = -1;
+
+    k->editor = new QLineEdit(this);
+    k->editor->setFocusPolicy(Qt::ClickFocus);
+    k->editor->setInputMask("");
+    connect(k->editor, SIGNAL(editingFinished()), this, SLOT(hideTitleEditor()));
+    k->editor->hide();
+}
+
+TupTimeLineHeader::~TupTimeLineHeader()
+{
+}
+
+void TupTimeLineHeader::paintSection(QPainter * painter, const QRect & rect, int index) const
+{
+    if (!model() || !rect.isValid())
+        return;
+
+    painter->save();
+
+    QStyleOptionHeader headerOption;
+    headerOption.rect = rect;
+    headerOption.orientation = Qt::Vertical;
+    headerOption.position = QStyleOptionHeader::Middle;
+    headerOption.text = "";
+
+    style()->drawControl(QStyle::CE_HeaderSection, &headerOption, painter);
+
+    if (k->currentLayer == index) {
+        QColor color(0, 136, 0, 40);
+        painter->fillRect(rect, color);
+    }
+
+    QFont font("Arial", 7, QFont::Normal, false);
+    QFontMetrics fm(font);
+
+    int y = rect.normalized().bottomLeft().y() - (1 + (rect.normalized().height() - fm.height())/2);
+    painter->setFont(font);
+    painter->setPen(QPen(Qt::black, 1, Qt::SolidLine));
+    painter->drawText(10, y, k->layers[index].title);
+
+    y = rect.y();
+
+    // SQA: This code will be disabled until the "Lock layer" feature is implemented
+    /* 
+    QRectF lockRect = QRectF(0, 0, 11, 12);
+    int lockY = (rect.height() - lockRect.height())/2;
+    painter->drawPixmap(QPointF(rect.x() + 90, lockY + y), k->lockIcon, lockRect);
+    */
+
+    QRectF viewRect = QRectF(0, 0, 13, 7); 
+    int viewY = (rect.height() - viewRect.height())/2;
+    if (k->layers[index].isVisible)
+        painter->drawPixmap(QPointF(rect.x() + 90, viewY + y), k->viewIconOn, viewRect);
+    else
+        painter->drawPixmap(QPointF(rect.x() + 90, viewY + y), k->viewIconOff, viewRect);
+
+    painter->restore();
+}
+
+void TupTimeLineHeader::mousePressEvent(QMouseEvent *event)
+{
+    QPoint point = event->pos();
+    int section = logicalIndexAt(point);
+
+    if (section != k->currentLayer)
+        emit selectionChanged(section);
+
+    int y = sectionViewportPosition(section);
+    QRect rect(90, y, 20, sectionSize(section));
+    if (rect.contains(point))
+        emit visibilityChanged(section, !k->layers[section].isVisible);
+
+    QHeaderView::mousePressEvent(event);
+}
+
+void TupTimeLineHeader::updateSelection(int index)
+{
+    if (k->currentLayer != index) {
+        k->currentLayer = index;
+        updateSection(index);
+    }
+}
+
+void TupTimeLineHeader::insertSection(int index, const QString &name)
+{
+    TimeLineLayerItem layer;
+    layer.title = name;
+    layer.lastFrame = -1;
+    layer.isVisible = true;
+    layer.isLocked = false;
+    layer.isSound = false;
+
+    k->layers.insert(index, layer);
+}
+
+void TupTimeLineHeader::setSectionVisibility(int index, bool visibility)
+{
+    k->layers[index].isVisible = visibility;
+    updateSection(index);
+}
+
+void TupTimeLineHeader::setSectionTitle(int index, const QString &name)
+{
+    k->layers[index].title = name;
+    updateSection(index);
+}
+
+void TupTimeLineHeader::showTitleEditor(int index)
+{
+    if (index >= 0) {
+        QFont font("Arial", 7, QFont::Normal, false);
+        k->editor->setFont(font);
+        int x = sectionViewportPosition(index);
+        k->editor->setGeometry(0, x, width(), sectionSize(index));
+        k->editorSection = index;
+        k->editor->setText(k->layers[index].title);
+        k->editor->show();
+        k->editor->setFocus();
+    }
+}
+
+void TupTimeLineHeader::hideTitleEditor()
+{
+    k->editor->hide();
+
+    if (k->editorSection != -1 && k->editor->isModified())
+        emit nameChanged(k->editorSection, k->editor->text());
+
+    k->editorSection = -1;
+}
+
+void TupTimeLineHeader::removeSection(int index)
+{
+    k->layers.removeAt(index);
+}
+
+int TupTimeLineHeader::lastFrame(int index)
+{
+    return k->layers[index].lastFrame;
+}
+
+void TupTimeLineHeader::updateLastFrame(int index, bool addition)
+{
+    if (addition)
+        k->layers[index].lastFrame++;
+    else
+        k->layers[index].lastFrame--;
+}
+
+void TupTimeLineHeader::resetLastFrame(int index)
+{
+    k->layers[index].lastFrame = -1;
+}
+
+bool TupTimeLineHeader::isSound(int index)
+{
+    return k->layers[index].isSound;
+}
+
+void TupTimeLineHeader::setSoundFlag(int index, bool flag)
+{
+    k->layers[index].isSound = flag;
+}
+
+int TupTimeLineHeader::currentSectionIndex()
+{
+    return k->currentLayer;
+}
+
+void TupTimeLineHeader::moveHeaderSection(int position, int newPosition, bool isLocalRequest)
+{
+    if (isLocalRequest) {
+        k->sectionOnMotion = true;
+        moveSection(visualIndex(position), visualIndex(newPosition));
+        k->layers.swap(position, newPosition);
+        k->sectionOnMotion = false;
+    } else {
+        k->layers.swap(position, newPosition);
+    }
+}
+
+bool TupTimeLineHeader::sectionIsMoving()
+{
+    return k->sectionOnMotion;
+}
+
+
diff -Nru tupi-0.2+git04/src/components/timeline/tuptimelineheader.h tupi-0.2+git05/src/components/timeline/tuptimelineheader.h
--- tupi-0.2+git04/src/components/timeline/tuptimelineheader.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptimelineheader.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,98 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     *
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TUPTIMELINEHEADER_H
+#define TUPTIMELINEHEADER_H
+
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+
+#include <QHeaderView>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QPixmap>
+#include <QLineEdit>
+
+struct TimeLineLayerItem
+{
+    QString title;
+    int lastFrame;
+    bool isVisible;
+    bool isLocked;
+    bool isSound;
+};
+
+class TUPI_EXPORT TupTimeLineHeader : public QHeaderView
+{
+    Q_OBJECT
+
+    public:
+        TupTimeLineHeader(QWidget * parent = 0);
+        ~TupTimeLineHeader();
+        void insertSection(int index, const QString &name);
+        void setSectionVisibility(int index, bool visibility);
+        void setSectionTitle(int index, const QString &name);
+        void removeSection(int index);
+        int  lastFrame(int index);
+        void updateLastFrame(int index, bool addition);
+        void resetLastFrame(int index);
+        bool isSound(int index);
+        void setSoundFlag(int index, bool flag);
+        int currentSectionIndex();
+        void moveHeaderSection(int position, int newPosition, bool isLocalRequest);
+        bool sectionIsMoving();
+
+    protected:
+        void paintSection(QPainter *painter, const QRect & rect, int index) const;
+        virtual void mousePressEvent(QMouseEvent *event);
+
+    public slots:
+        void updateSelection(int index);
+
+    private slots:
+        void showTitleEditor(int section);
+        void hideTitleEditor();
+
+    signals:
+        void selectionChanged(int section);
+        void visibilityChanged(int section, bool isVisible);
+        void nameChanged(int section, const QString &name);
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/components/timeline/tuptimelineruler.cpp tupi-0.2+git05/src/components/timeline/tuptimelineruler.cpp
--- tupi-0.2+git04/src/components/timeline/tuptimelineruler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptimelineruler.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,113 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tuptimelineruler.h"
+
+TupTimeLineRuler::TupTimeLineRuler(QWidget *parent) : QHeaderView(Qt::Horizontal, parent)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupTimeLineRuler()]";
+        #else
+            TINIT;
+        #endif
+    #endif
+
+    setHighlightSections(true);
+    setStyleSheet("QHeaderView { background-color: #CCCCCC; }");
+}
+
+TupTimeLineRuler::~TupTimeLineRuler()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupTimeLineRuler()]";
+        #else
+            TEND;
+        #endif
+    #endif
+}
+
+void TupTimeLineRuler::paintSection(QPainter *painter, const QRect & rect, int logicalIndex) const
+{
+    if (!model() || !rect.isValid())
+        return;
+
+    painter->save();
+
+    QModelIndex currentSelection = currentIndex(); 
+    int column = currentSelection.row(); 
+
+    if (selectionModel()->isSelected(model()->index(column, logicalIndex))) {
+        QBrush brush(QColor(0, 135, 0, 80));
+        painter->fillRect(rect, brush);
+    } else {
+        if ((logicalIndex + 1) == 1 || (logicalIndex+1) % 5 == 0) {
+            QBrush brush(QColor(150, 150, 150, 255));
+            painter->fillRect(rect, brush);
+        }
+    }
+
+    logicalIndex++;
+
+    int x = rect.bottomRight().x();
+    int topY = rect.topRight().y();
+    int bottomY = rect.bottomRight().y();
+    painter->drawLine(x, bottomY, x, bottomY - 6);
+    painter->drawLine(x, topY, x, topY + 4);
+
+    if (logicalIndex == 1 || logicalIndex % 5 == 0) {
+        QFont label("Arial", 7, QFont::Normal, false);
+        QFontMetrics fm(label);
+
+        QString number = QString::number(logicalIndex);
+	
+        painter->setFont(label);	
+        painter->drawText((int)(rect.center().x() - (fm.width(number)/2)), 
+                          (int)(rect.center().y() + (fm.height()/2)) - 2, number);
+    }
+
+    QPen pen = painter->pen();
+    pen.setWidth(4);
+    painter->setPen(pen); 
+    painter->drawLine(rect.bottomLeft(), rect.bottomRight());
+
+    painter->restore();
+}
+
+void TupTimeLineRuler::mousePressEvent(QMouseEvent *event)
+{
+    emit selectionChanged(logicalIndexAt(event->pos()));
+}
diff -Nru tupi-0.2+git04/src/components/timeline/tuptimelineruler.h tupi-0.2+git05/src/components/timeline/tuptimelineruler.h
--- tupi-0.2+git04/src/components/timeline/tuptimelineruler.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptimelineruler.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,65 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TUPTIMELINERULER_H
+#define TUPTIMELINERULER_H
+
+#include "tglobal.h"
+
+#include <QHeaderView>
+#include <QPainter>
+#include <QMouseEvent>
+
+/**
+ * @author David Cuadrado
+**/
+
+class TUPI_EXPORT TupTimeLineRuler : public QHeaderView
+{
+    Q_OBJECT
+
+    public:
+        TupTimeLineRuler(QWidget *parent = 0);
+        ~TupTimeLineRuler();
+
+    protected:
+        void paintSection(QPainter *painter, const QRect & rect, int logicalIndex) const;
+        virtual void mousePressEvent(QMouseEvent *event);
+
+    signals:
+        void selectionChanged(int section);
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/components/timeline/tuptimelinetable.cpp tupi-0.2+git05/src/components/timeline/tuptimelinetable.cpp
--- tupi-0.2+git04/src/components/timeline/tuptimelinetable.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptimelinetable.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,529 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tuptimelinetable.h"
+
+////////// TupTimeLineTableItemDelegate ///////////
+
+class TupTimeLineTableItemDelegate : public QItemDelegate
+{
+    public:
+        TupTimeLineTableItemDelegate(QObject * parent = 0);
+        ~TupTimeLineTableItemDelegate();
+        virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
+};
+
+TupTimeLineTableItemDelegate::TupTimeLineTableItemDelegate(QObject * parent) : QItemDelegate(parent) // QAbstractItemDelegate(parent)
+{
+}
+
+TupTimeLineTableItemDelegate::~TupTimeLineTableItemDelegate()
+{
+}
+
+void TupTimeLineTableItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    Q_ASSERT(index.isValid());
+
+    QItemDelegate::paint(painter, option, index);
+    TupTimeLineTable *table = qobject_cast<TupTimeLineTable *>(index.model()->parent());
+    TupTimeLineTableItem *item = dynamic_cast<TupTimeLineTableItem *>(table->itemFromIndex(index));
+    
+    // draw the background color
+    QVariant value = index.data(Qt::BackgroundColorRole);
+    
+    if (value.isValid()) {
+        painter->save();
+        
+        bool sound = table->isSoundLayer(index.row());
+        if (!sound)
+            painter->fillRect(option.rect, value.value<QColor>());
+        
+        painter->restore();
+    } else {
+        painter->save();
+        
+        bool sound = table->isSoundLayer(index.row());
+        
+        if (!sound) {
+            int counter = index.column() + 1;
+            if (counter == 1 || counter % 5 == 0) 
+                painter->fillRect(option.rect, QColor(230, 230, 230));
+            else 
+                painter->fillRect(option.rect, Qt::white);
+        } 
+        
+        painter->restore();
+    }
+    
+    // Selection!
+    if (option.showDecorationSelected && (option.state & QStyle::State_Selected)) {
+        painter->save();
+        painter->fillRect(option.rect, QColor(0, 136, 0, 180));
+        painter->restore();
+    }
+    
+    // Draw attributes
+    int offset = option.rect.width() - 5;
+
+    if (item && index.isValid()) {
+        if (item->isUsed()) {
+            painter->save();
+            painter->setBrush(Qt::black);
+            painter->setRenderHint(QPainter::Antialiasing, true);
+            
+            if (!item->isSound()) {
+                if (item->isLocked()) {
+                    painter->setPen(QPen(Qt::red, 1, Qt::SolidLine));
+                    painter->setBrush(Qt::red);
+                } 
+                painter->drawEllipse(option.rect.x() + ((option.rect.width() - offset)/2), 
+                                     option.rect.y() + ((option.rect.height() + offset)/2), 
+                                     offset, offset);
+            } else {
+                painter->setBrush(QColor(0, 136, 0));
+                painter->drawRect(option.rect.x() + ((option.rect.width() - offset)/2), 
+                                  option.rect.y() + ((option.rect.height() + offset)/2), 
+                                  offset, offset);
+            }
+            
+            painter->restore();
+        }
+    }
+}
+
+////////// TupTimeLineTableItem ////////
+
+TupTimeLineTableItem::TupTimeLineTableItem()
+{
+}
+
+TupTimeLineTableItem::~TupTimeLineTableItem()
+{
+}
+
+bool TupTimeLineTableItem::isUsed()
+{
+    return data(IsUsed).toBool();
+}
+
+bool TupTimeLineTableItem::isLocked()
+{
+    return data(IsLocked).toBool();
+}
+
+bool TupTimeLineTableItem::isSound()
+{
+    QVariant data = this->data(IsSound);
+    
+    if (data.canConvert<bool>())
+        return data.toBool();
+
+    return false;
+}
+
+//// TupTimeLineTable
+
+struct TupTimeLineTable::Private
+{
+    int rectWidth;
+    int rectHeight;
+
+    int sceneIndex;
+    int layerIndex;
+    int frameIndex;
+
+    TupTimeLineRuler *ruler;
+    TupTimeLineHeader *layerColumn;
+
+    bool removingLayer;
+    bool removingFrame;
+    bool isLocalRequest;
+};
+
+TupTimeLineTable::TupTimeLineTable(int sceneIndex, QWidget *parent) : QTableWidget(0, 200, parent), k(new Private)
+{
+    k->isLocalRequest = false;
+    k->sceneIndex = sceneIndex;
+    k->frameIndex = 0;
+    k->layerIndex = 0;
+
+    k->ruler = new TupTimeLineRuler;
+    connect(k->ruler, SIGNAL(selectionChanged(int)), this, SLOT(frameSelectionFromRuler(int)));
+
+    k->removingLayer = false;
+    k->removingFrame = false;
+
+    k->layerColumn = new TupTimeLineHeader;
+    connect(k->layerColumn, SIGNAL(nameChanged(int, const QString &)), this, SIGNAL(layerNameChanged(int, const QString &)));
+    connect(k->layerColumn, SIGNAL(selectionChanged(int)), this, SLOT(frameSelectionFromLayerHeader(int)));
+    connect(k->layerColumn, SIGNAL(visibilityChanged(int, bool)), this, SIGNAL(visibilityChanged(int, bool)));
+    connect(k->layerColumn, SIGNAL(sectionMoved(int, int, int)), this, SLOT(requestLayerMove(int, int, int)));
+
+    setup();
+}
+
+TupTimeLineTable::~TupTimeLineTable()
+{
+    delete k;
+}
+
+void TupTimeLineTable::setup()
+{
+    setItemDelegate(new TupTimeLineTableItemDelegate(this));
+    setSelectionBehavior(QAbstractItemView::SelectItems);
+    setSelectionMode(QAbstractItemView::SingleSelection);
+    setEditTriggers(QAbstractItemView::NoEditTriggers);
+
+    connect(this, SIGNAL(currentCellChanged(int, int, int, int)), this, SLOT(requestFrameSelection(int, int, int, int)));
+
+    setHorizontalHeader(k->ruler);
+    setVerticalHeader(k->layerColumn);
+
+    setItemSize(10, 25);
+    
+    k->ruler->setSectionResizeMode(QHeaderView::Custom);
+    k->layerColumn->setSectionResizeMode(QHeaderView::Custom);
+}
+
+void TupTimeLineTable::frameSelectionFromRuler(int frameIndex)
+{
+    emit frameSelected(0, frameIndex);
+}
+
+void TupTimeLineTable::frameSelectionFromLayerHeader(int layerIndex)
+{
+    if (k->layerColumn->currentSectionIndex() != layerIndex)
+        k->layerColumn->updateSelection(layerIndex);
+
+    emit frameSelected(layerIndex, currentColumn());
+}
+
+void TupTimeLineTable::requestLayerMove(int logicalIndex, int oldVisualIndex, int newVisualIndex)
+{
+    Q_UNUSED(logicalIndex);
+
+    if (!k->layerColumn->sectionIsMoving()) {
+        int distance = newVisualIndex - oldVisualIndex;
+        if (distance > 0) {
+            if (distance > 1)
+                newVisualIndex = oldVisualIndex + 1;
+        } else {
+            distance = abs(distance);
+            if (distance > 1)
+                newVisualIndex = oldVisualIndex - 1;
+        }
+
+        k->isLocalRequest = true;
+        emit layerMoved(oldVisualIndex, newVisualIndex);
+    }
+}
+
+void TupTimeLineTable::setItemSize(int w, int h)
+{
+    k->rectHeight = h;
+    k->rectWidth = w;
+    
+    fixSize();
+}
+
+bool TupTimeLineTable::isSoundLayer(int index)
+{
+    if (index < 0 && index >= rowCount())
+        return false;
+    
+    return k->layerColumn->isSound(index);
+}
+
+void TupTimeLineTable::insertLayer(int index, const QString &name)
+{
+    insertRow(index);
+    k->layerColumn->insertSection(index, name);
+    fixSize();
+}
+
+void TupTimeLineTable::insertSoundLayer(int index, const QString &name)
+{
+    insertRow(index);
+    k->layerColumn->insertSection(index, name);
+    fixSize();
+}
+
+void TupTimeLineTable::removeLayer(int index)
+{
+    k->removingLayer = true;
+    removeRow(index);
+    k->layerColumn->removeSection(index);
+}
+
+void TupTimeLineTable::moveLayer(int index, int newIndex)
+{
+    if (index < 0 || index >= rowCount() || newIndex < 0 || newIndex >= rowCount()) 
+        return;
+
+    k->layerColumn->moveHeaderSection(index, newIndex, k->isLocalRequest);
+    if (k->isLocalRequest)
+        k->isLocalRequest = false;
+
+    for (int frameIndex = 0; frameIndex <= k->layerColumn->lastFrame(index); frameIndex++)
+         exchangeFrame(frameIndex, index, frameIndex, newIndex);
+
+    blockSignals(true); 
+    selectFrame(newIndex, currentColumn());
+    blockSignals(false);
+}
+
+void TupTimeLineTable::exchangeFrame(int currentFrame, int currentLayer, int newFrame, int newLayer)
+{
+    QTableWidgetItem *oldItem = takeItem(currentLayer, currentFrame);
+    QTableWidgetItem *newItem = takeItem(newLayer, newFrame);
+
+    setItem(newLayer, newFrame, oldItem);
+    setItem(currentLayer, currentFrame, newItem);
+}
+
+void TupTimeLineTable::setLayerVisibility(int layerIndex, bool isVisible)
+{
+    k->layerColumn->setSectionVisibility(layerIndex, isVisible);
+}
+
+void TupTimeLineTable::setLayerName(int layerIndex, const QString &name)
+{
+    k->layerColumn->setSectionTitle(layerIndex, name);
+}
+
+int TupTimeLineTable::currentLayer()
+{
+    return currentRow();
+}
+
+int TupTimeLineTable::layersTotal()
+{
+    return rowCount();
+}
+
+int TupTimeLineTable::lastFrameByLayer(int index)
+{
+    if (index < 0 || index >= rowCount())
+        return -1;
+
+    return k->layerColumn->lastFrame(index);
+}
+
+// FRAMES
+
+void TupTimeLineTable::insertFrame(int layerIndex, const QString &name)
+{
+    Q_UNUSED(name);
+
+    if (layerIndex < 0 || layerIndex >= rowCount())
+        return;
+
+    k->layerColumn->updateLastFrame(layerIndex, true);
+  
+    int lastFrame = k->layerColumn->lastFrame(layerIndex); 
+
+    setAttribute(layerIndex, lastFrame, TupTimeLineTableItem::IsUsed, true);
+    setAttribute(layerIndex, lastFrame, TupTimeLineTableItem::IsSound, false);
+}
+
+void TupTimeLineTable::updateLayerHeader(int layerIndex)
+{
+    k->layerColumn->updateSelection(layerIndex); 
+}
+
+void TupTimeLineTable::selectFrame(int index)
+{
+    setCurrentItem(item(currentRow(), index));
+}
+
+void TupTimeLineTable::removeFrame(int index, int position)
+{
+    Q_UNUSED(position);
+
+    if (index < 0 || index >= rowCount())
+        return;
+
+    k->removingFrame = true;
+    
+    setAttribute(index, k->layerColumn->lastFrame(index), TupTimeLineTableItem::IsUsed, false);
+
+    k->layerColumn->updateLastFrame(index, false);
+    viewport()->update();
+}
+
+void TupTimeLineTable::lockFrame(int index, int position, bool lock)
+{
+    if (index < 0 || index >= rowCount())
+        return;
+    
+    setAttribute(index, position, TupTimeLineTableItem::IsLocked, lock);
+    viewport()->update();
+}
+
+bool TupTimeLineTable::frameIsLocked(int layerIndex, int frameIndex)
+{
+    TupTimeLineTableItem *frame = dynamic_cast<TupTimeLineTableItem *>(item(layerIndex, frameIndex));
+
+    if (frame) {
+        return frame->isLocked(); 
+    } else {
+        #ifdef K_DEBUG
+            QString msg = "TupTimeLineTable::frameIsLocked() - Layer: " + QString::number(layerIndex) + QString(", Frame: ") + QString::number(frameIndex) + QString(" doesn't exist");
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+    }
+
+    return false;
+}
+
+void TupTimeLineTable::setAttribute(int row, int col, TupTimeLineTableItem::Attributes att, bool value)
+{
+    QTableWidgetItem *item = this->item(row, col);
+    
+    if (!item) {
+        item = new TupTimeLineTableItem;
+        setItem(row, col, item);
+    }
+    
+    item->setData(att, value);
+}
+
+void TupTimeLineTable::fixSize()
+{
+    for (int column = 0; column < columnCount(); column++)
+         horizontalHeader()->resizeSection(column, k->rectWidth);
+
+    for (int row = 0; row < rowCount(); row++)
+         k->layerColumn->resizeSection(row, k->rectHeight);
+}
+
+void TupTimeLineTable::requestFrameSelection(int currentSelectedRow, int currentSelectedColumn, int previousRow, int previousColumn)
+{
+    if (!k->removingLayer) {
+        if (k->removingFrame) {
+            k->removingFrame = false;
+            emit frameSelected(currentRow(), currentColumn());
+            return;
+        } else {
+            if (previousColumn != currentSelectedColumn || previousRow != currentSelectedRow) 
+                emit frameSelected(currentRow(), currentColumn());
+        }
+    } else { // A layer is being removed
+        k->removingLayer = false;
+
+        if (previousRow != 0) {
+            if (previousRow != rowCount() - 1) {
+                blockSignals(true);
+                setCurrentItem(item(previousRow - 1, currentColumn())); 
+                k->layerColumn->updateSelection(previousRow - 1);
+                blockSignals(false);
+            }
+        }
+    }
+}
+
+void TupTimeLineTable::mousePressEvent(QMouseEvent *event)
+{
+    int frameIndex = columnAt(event->x());
+
+    int total = columnCount();
+    if ((frameIndex >= total - 11) && (frameIndex <= total - 1)) {
+        int newTotal = total + 100;
+        for (int i=total; i < newTotal; i++) {
+             insertColumn(i);
+        }
+        fixSize();
+    }
+
+    QTableWidget::mousePressEvent(event);
+}
+
+void TupTimeLineTable::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Right) {
+        int limit = columnCount()-1;
+        int next = currentColumn()+1;
+        if (next <= limit) 
+            setCurrentCell(currentRow(), next);
+    }    
+
+    if (event->key() == Qt::Key_Left) {
+        int next = currentColumn()-1;
+        if (next >= 0) 
+            setCurrentCell(currentRow(), next);
+    }
+
+    if (event->key() == Qt::Key_Up) {
+        int next = currentRow()-1;
+        if (next >= 0) 
+            setCurrentCell(next, currentColumn());
+    }
+
+    if (event->key() == Qt::Key_Down) {
+        int limit = rowCount()-1;
+        int next = currentRow()+1;
+        if (next <= limit)
+            setCurrentCell(next, currentColumn());
+    }
+}
+
+void TupTimeLineTable::enterEvent(QEvent *event)
+{
+    if (!hasFocus())
+        setFocus();
+
+    QTableWidget::enterEvent(event);
+}
+
+void TupTimeLineTable::leaveEvent(QEvent *event)
+{
+    if (hasFocus())
+        clearFocus();
+
+    QTableWidget::leaveEvent(event);
+}
+
+void TupTimeLineTable::selectFrame(int layerIndex, int frameIndex)
+{
+    blockSignals(true);
+    setCurrentCell(layerIndex, frameIndex);
+    updateLayerHeader(layerIndex);
+    blockSignals(false);
+}
diff -Nru tupi-0.2+git04/src/components/timeline/tuptimelinetable.h tupi-0.2+git05/src/components/timeline/tuptimelinetable.h
--- tupi-0.2+git04/src/components/timeline/tuptimelinetable.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptimelinetable.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,140 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TUPTIMELINETABLE_H
+#define TUPTIMELINETABLE_H
+
+#include "tglobal.h"
+#include "tuptimelineruler.h"
+#include "tuptimelineheader.h"
+#include "tupprojectactionbar.h"
+
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QItemDelegate>
+#include <QPainter>
+#include <QHeaderView>
+
+class TupTimeLineTable;
+class TupTimeLineTableItemDelegate;
+
+class TUPI_EXPORT TupTimeLineTableItem : public QTableWidgetItem
+{
+    public:
+        enum Attributes
+        {
+            IsUsed = 0x0100,
+            IsLocked,
+            IsSound
+        };
+        
+        TupTimeLineTableItem();
+        virtual ~TupTimeLineTableItem();
+        
+        bool isUsed();
+        bool isLocked();
+        bool isSound();
+};
+
+class TupTimeLineRuler;
+
+/**
+ * @author David Cuadrado
+*/
+class TUPI_EXPORT TupTimeLineTable : public QTableWidget
+{
+    Q_OBJECT;
+    
+    friend class TupTimeLineTableItemDelegate;
+    
+    public:
+        TupTimeLineTable(int sceneIndex = 0, QWidget *parent = 0);
+        ~TupTimeLineTable();
+        
+        bool isSoundLayer(int row);
+        void setLayerVisibility(int layerIndex, bool isVisible);
+        void setLayerName(int layerIndex, const QString &name);
+        void selectFrame(int layerIndex, int frameIndex);
+        bool frameIsLocked(int layerIndex, int frameIndex);
+        
+    public slots:
+        // Layers
+        void insertLayer(int index, const QString &name);
+        void insertSoundLayer(int layerPos, const QString &name);
+        void removeLayer(int pos);
+        void moveLayer(int pos, int newPos);
+        int lastFrameByLayer(int layerPos);
+        void updateLayerHeader(int layerIndex);
+        int currentLayer();
+        int layersTotal();
+
+        // Frames
+        void insertFrame(int layerPos, const QString &name);
+        void selectFrame(int index);
+        void setAttribute(int row, int col, TupTimeLineTableItem::Attributes att, bool value);
+        void removeFrame(int layerPos, int position);
+        void lockFrame(int layerPosition, int position, bool lock);
+        void setItemSize(int w, int h);
+        void exchangeFrame(int currentFrame, int currentLayer, int newFrame, int newLayer);
+        
+    private:
+        void setup();
+        
+    protected:
+        void fixSize();
+        void mousePressEvent(QMouseEvent * event);
+        void keyPressEvent(QKeyEvent * event);
+        void enterEvent(QEvent *event);
+        void leaveEvent(QEvent *event);
+        
+    private slots:
+        void frameSelectionFromRuler(int frameIndex);
+        void frameSelectionFromLayerHeader(int layerIndex);
+        void requestFrameSelection(int currentSelectedRow, int currentSelectedColumn, int previousRow, int previousColumn);
+        void requestLayerMove(int logicalIndex, int oldVisualIndex, int newVisualIndex);
+        
+    signals:
+        void frameChanged(int sceneIndex, int layerIndex, int frameIndex);
+        void frameSelected(int layer, int frame);
+        void visibilityChanged(int layer, bool isVisible);
+        void layerNameChanged(int layer, const QString &name);
+        void layerMoved(int oldVisualIndex, int newVisualIndex);
+        
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/components/timeline/tuptlruler.cpp tupi-0.2+git05/src/components/timeline/tuptlruler.cpp
--- tupi-0.2+git04/src/components/timeline/tuptlruler.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptlruler.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tuptlruler.h"
-#include "tdebug.h"
-
-#include <QPainter>
-#include <QMouseEvent>
-
-TupTLRuler::TupTLRuler(QWidget *parent) : QHeaderView(Qt::Horizontal, parent)
-{
-    #ifdef K_DEBUG
-           TINIT;
-    #endif
-
-    setHighlightSections(true);
-
-    // setClickable(true);	
-    connect(this, SIGNAL(sectionClicked(int)), this, SLOT(updateSelected(int)));
-}
-
-TupTLRuler::~TupTLRuler()
-{
-    #ifdef K_DEBUG
-           TEND;
-    #endif
-}
-
-void TupTLRuler::paintSection(QPainter * painter, const QRect & rect, int logicalIndex) const
-{
-    if (!model() || !rect.isValid())
-        return;
-
-    painter->save();
-
-    QModelIndex currentSelection = currentIndex(); 
-    int column = currentSelection.row(); 
-
-    if (selectionModel()->isSelected(model()->index(column, logicalIndex))) {
-        QBrush brush(QColor(255, 100, 100, 150));
-        brush.setStyle(Qt::Dense5Pattern);
-        painter->fillRect(rect, brush);
-    }
-
-    logicalIndex++;
-
-    if (logicalIndex == 1 || logicalIndex % 5 == 0) {
-        QFont label("Arial", 7, QFont::Normal, false);
-        QFontMetrics fm(label);
-
-        QString number = QString::number(logicalIndex);
-	
-        painter->setFont(label);	
-        painter->drawText((int)(rect.center().x() - (fm.width(number)/2)), 
-                          (int)(rect.center().y() + (fm.height()/2)) - 2, number);
-    }
-
-    int x = rect.bottomLeft().x() - 1;
-    int topY = rect.topLeft().y(); 
-    int bottomY = rect.bottomLeft().y();
-    painter->drawLine(x, bottomY, x, bottomY - 6);
-    painter->drawLine(x, topY, x, topY + 4);
-
-    QPen pen = painter->pen();
-    pen.setWidth(4);
-    painter->setPen(pen); 
-    painter->drawLine(rect.bottomLeft(), rect.bottomRight());
-    painter->restore();
-
-}
-
-void TupTLRuler::updateSelected(int logical)
-{
-    select(logical);
-
-    emit logicalSectionSelected(logical);
-}
-
-void TupTLRuler::select(int logical)
-{
-    selectionModel()->select(model()->index(0, logical), QItemSelectionModel::ClearAndSelect);
-    viewport()->update(QRect(sectionViewportPosition(logical), 0, sectionSize(logical),viewport()->height()));
-}
-
-void TupTLRuler::mouseMoveEvent(QMouseEvent *e)
-{
-    if (e->buttons() & Qt::LeftButton)
-        updateSelected(logicalIndexAt(e->pos()));
-
-    QHeaderView::mouseMoveEvent(e);
-}
diff -Nru tupi-0.2+git04/src/components/timeline/tuptlruler.h tupi-0.2+git05/src/components/timeline/tuptlruler.h
--- tupi-0.2+git04/src/components/timeline/tuptlruler.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/timeline/tuptlruler.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TUPTLRULER_H
-#define TUPTLRULER_H
-
-#include <QHeaderView>
-
-/**
- * @author David Cuadrado
-**/
-
-class TupTLRuler : public QHeaderView
-{
-    Q_OBJECT
-
-    public:
-        TupTLRuler(QWidget *parent = 0);
-        ~TupTLRuler();
-        void select(int logical);
-
-    protected:
-        void paintSection(QPainter *painter, const QRect & rect, int logicalIndex) const;
-        void mouseMoveEvent(QMouseEvent *e);
-
-    private slots:
-        void updateSelected(int logical);
-
-    signals:
-        void logicalSectionSelected(int logical);
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/components/twitter/tuptwitter.cpp tupi-0.2+git05/src/components/twitter/tuptwitter.cpp
--- tupi-0.2+git04/src/components/twitter/tuptwitter.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/twitter/tuptwitter.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -33,23 +33,15 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#include <QtGui>
-#include <QtNetwork>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QDomDocument>
-#include <QEventLoop>
-
 #include "tuptwitter.h"
-#include "tdebug.h"
 
-QString Tupwitter::TWITTER_HOST = QString("http://twitter.com");
-QString Tupwitter::IS_TWITTER_UP_URL = QString("/help/test.xml");
-QString Tupwitter::USER_TIMELINE_URL = QString("/statuses/user_timeline/maefloresta.xml");
-QString Tupwitter::TUPI_VERSION_URL = QString("http://www.maefloresta.com/updates/current_version.xml");
-QString Tupwitter::BROWSER_FINGERPRINT = QString("Tupi_Browser 1.0");
+QString TupTwitter::NEWS_HOST = QString("http://www.maefloresta.com");
+QString TupTwitter::IS_HOST_UP_URL = QString("/updates/test.xml");
+QString TupTwitter::USER_TIMELINE_URL = QString("/updates/tweets.html");
+QString TupTwitter::TUPI_VERSION_URL = QString("/updates/current_version.xml");
+QString TupTwitter::BROWSER_FINGERPRINT = QString("Tupi_Browser 1.0");
 
-struct Tupwitter::Private
+struct TupTwitter::Private
 {
     QNetworkAccessManager *manager;
     QNetworkRequest request;
@@ -59,108 +51,156 @@
     QString revision;
     QString codeName;
     QString word;
-    QString reference;
     QString url;
-    QString meaning;
     bool update;
 };
 
-Tupwitter::Tupwitter(QWidget *parent) : QWidget(parent), k(new Private)
+TupTwitter::TupTwitter(QWidget *parent) : QWidget(parent), k(new Private)
 {
     k->update = false;
 }
 
-void Tupwitter::start()
+void TupTwitter::start()
 {
-    loadTwitterMeaning();
-    QString url = TWITTER_HOST + IS_TWITTER_UP_URL;
+    QString url = NEWS_HOST + IS_HOST_UP_URL;
+
+    #ifdef K_DEBUG
+        QString msg = "TupTwitter::start() - Requesting url -> " + url;
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif
 
     k->manager = new QNetworkAccessManager(this);
-    connect(k->manager, SIGNAL(finished(QNetworkReply*)),
-            this, SLOT(closeRequest(QNetworkReply*)));
+    connect(k->manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(closeRequest(QNetworkReply*)));
 
     k->request.setUrl(QUrl(url));
-    k->request.setRawHeader("User-Agent", BROWSER_FINGERPRINT.toAscii());
+    k->request.setRawHeader("User-Agent", BROWSER_FINGERPRINT.toLatin1());
 
     k->reply = k->manager->get(k->request);
     connect(k->reply, SIGNAL(error(QNetworkReply::NetworkError)),
             this, SLOT(slotError(QNetworkReply::NetworkError)));
 }
 
-Tupwitter::~Tupwitter()
+TupTwitter::~TupTwitter()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupTwitter()]";
+        #else
+            TEND;
+        #endif
     #endif
 
     delete k;
 }
 
-void Tupwitter::requestFile(QString target)
+void TupTwitter::requestFile(QString target)
 {
+    #ifdef K_DEBUG
+        QString msg = "TupTwitter::requestFile() - Requesting url -> " + target;
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif
+
     k->request.setUrl(QUrl(target));
-    k->request.setRawHeader("User-Agent", BROWSER_FINGERPRINT.toAscii());
+    k->request.setRawHeader("User-Agent", BROWSER_FINGERPRINT.toLatin1());
     k->reply = k->manager->get(k->request);
 }
 
-void Tupwitter::closeRequest(QNetworkReply *reply)
+void TupTwitter::closeRequest(QNetworkReply *reply)
 {
     QByteArray array = reply->readAll();
     QString answer(array);
+    answer.chop(1);
 
     if (answer.length() > 0) {
         if (answer.compare("<ok>true</ok>") == 0) {
-            requestFile(TUPI_VERSION_URL);
+            requestFile(NEWS_HOST + TUPI_VERSION_URL);
         } else {
             if (answer.contains("branch", Qt::CaseSensitive)) {
                 checkSoftwareUpdates(array);
-                requestFile(TWITTER_HOST +  USER_TIMELINE_URL);
+                requestFile(NEWS_HOST +  USER_TIMELINE_URL);
             } else {
-                if (answer.contains("status", Qt::CaseSensitive) && (!answer.contains("Twitter is over capacity") 
-                    && !answer.contains("whale_error.gif") && !answer.contains("503 Error"))) {
+                if (answer.startsWith("<div")) {
                     formatStatus(array);
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "Tupwitter::closeRequest() - Network Error: Invalid data!";
+                        QString msg = "TupTwitter::closeRequest() - Network Error: Invalid data!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                 }
             }
         }
     } else {
         #ifdef K_DEBUG
-               tError() << "Tupwitter::closeRequest() - Network Error: Gosh! No Internet? :S";
+            QString msg = "TupTwitter::closeRequest() - Network Error: Gosh! No Internet? :S";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     } 
 }
 
-void Tupwitter::slotError(QNetworkReply::NetworkError error)
+void TupTwitter::slotError(QNetworkReply::NetworkError error)
 {
     switch (error) {
             case QNetworkReply::HostNotFoundError:
                  { 
                  #ifdef K_DEBUG
-                        tError() << "Tupwitter::slotError() - Network Error: Host not found";
+                     QString msg = "TupTwitter::slotError() - Network Error: Host not found";
+                     #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                     #else
+                            tError() << msg;
+                     #endif
                  #endif
                  }
             break;
             case QNetworkReply::TimeoutError:
                  {
                  #ifdef K_DEBUG
-                        tError() << "Tupwitter::slotError() - Network Error: Time out!";
+                     QString msg = "TupTwitter::slotError() - Network Error: Time out!";
+                     #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                     #else
+                            tError() << msg;
+                     #endif
                  #endif
                  }
             break;
             case QNetworkReply::ConnectionRefusedError:
                  {
                  #ifdef K_DEBUG
-                        tError() << "Tupwitter::slotError() - Network Error: Connection Refused!";
+                     QString msg = "TupTwitter::slotError() - Network Error: Connection Refused!";
+                     #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                     #else
+                            tError() << msg;
+                     #endif
                  #endif
                  }
             break;
             case QNetworkReply::ContentNotFoundError:
                  {
                  #ifdef K_DEBUG
-                        tError() << "Tupwitter::slotError() - Network Error: Content not found!";
+                     QString msg = "TupTwitter::slotError() - Network Error: Content not found!";
+                     #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                     #else
+                            tError() << msg;
+                     #endif
                  #endif
                  }
             break;
@@ -168,19 +208,23 @@
             default:
                  {
                  #ifdef K_DEBUG
-                        tError() << "Tupwitter::slotError() - Network Error: Unknown Network error!";
+                     QString msg = "TupTwitter::slotError() - Network Error: Unknown Network error!";
+                     #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                     #else
+                            tError() << msg;
+                     #endif
                  #endif
                  }
             break;
     }
 }
 
-void Tupwitter::checkSoftwareUpdates(QByteArray array)
+void TupTwitter::checkSoftwareUpdates(QByteArray array)
 {
     QDomDocument doc;
 
     if (doc.setContent(array)) {
-
         QDomElement root = doc.documentElement();
         QDomNode n = root.firstChild();
 
@@ -204,222 +248,59 @@
     }
 }
 
-void Tupwitter::formatStatus(QByteArray array)
-{
-    QString output = "";
-    QString name = "";
-    QString description = "";
-    QString website = "";
-    QString followers = "";
-    QString image = "";
-
-    QDomDocument doc;
-
-    if (doc.setContent(array)) {
-
-        QDomElement root = doc.documentElement();
-        QDomNode n = root.firstChild();
-        int counter = 0;
-
-        while (!n.isNull()) {
-               QDomElement e = n.toElement();
-
-               if (!e.isNull()) {
-                   if (e.tagName() == "status") {
-                       QDomNode n1 = e.firstChild();
-                       QString date = "";
-                       QString text = "";
-                       while (!n1.isNull()) {
-                              QDomElement e1 = n1.toElement();
-                              if (!e1.isNull()) {
-                                  if (e1.tagName() == "created_at") {
-                                      QString data = e1.text(); 
-                                      QStringList list1 = data.split(" ");
-                                      for (int i=0; i<3; i++)
-                                           date += list1.at(i) + " ";
-                                           date += list1.at(3);
-                                  } else {
-                                      if (e1.tagName() == "text") {
-                                          text = e1.text();
-                                          int init = text.indexOf("http://");
-                                          if (init >= 0) {
-                                              int end = text.indexOf(" ", init);
-                                              if (end < 0)
-                                                  end = text.length();
-                                              QString www = text.mid(init, end-init);
-                                              QString link = "<a href=\"" + www + "\">";
-                                              text.insert(end, "</a>");
-                                              text.insert(init, link);
-                                          }
-                                      } else {
-                                          if (counter == 0) {
-                                              if (e1.tagName() == "user") {
-                                                  QDomNode n2 = e1.firstChild();
-                                                  while (!n2.isNull()) {
-                                                         QDomElement e2 = n2.toElement();
-                                                         if (!e2.isNull()) {
-                                                             if (e2.tagName() == "name") {
-                                                                 name = e2.text(); 
-                                                             } else if (e2.tagName() == "description") {
-                                                                        description = e2.text();
-                                                                        description.replace("-", "<br/>-");
-                                                             } else if (e2.tagName() == "profile_image_url") {
-                                                                        image = e2.text();
-                                                             } else if (e2.tagName() == "url") {
-                                                                        website = "<a href=\"" + e2.text() + "\">";
-                                                                        website += e2.text(); 
-                                                                        website += "</a>";
-                                                             } else if (e2.tagName() == "followers_count") {
-                                                                        followers = e2.text();
-                                                             }
-                                                         }
-                                                         n2 = n2.nextSibling();
-                                                  }
-                                                  counter = 1;
-                                              }
-                                          }
-                                      }
-                                  }
-                              }
-
-                              n1 = n1.nextSibling();
-                       }
-
-                       output += "       <p class=\"status\">\n";
-                       output += "       <div class=\"date\">[ " + date + " ]</div><br/>\n";
-                       output += "       <b>MaeFloresta:</b> ";
-                       output += text + "\n";
-                       output += "       <p/>\n";
-                   }
-               }
-
-               n = n.nextSibling();
-        }
-     }
-
-     QString html = "";
-
-     html += "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
-     html += "<html>\n";
-     html += "<head>\n";
-     html += "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n";
-     html += "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + QString::fromLocal8Bit(::getenv("TUPI_SHARE")) \
-             + "/data/help/css/tupi.css\">\n";
-     html += "</head>\n";
-     html += "<body class=\"tupi_background1\">\n";
-     html += " <table class=\"twitter_base\">\n";
-     html += "  <tr>\n";
-     html += "  <td class=\"twitter_status\">\n";
-     html += "    <table class=\"status_table\">\n";
-     html += "     <tr>\n";
-     html += "     <td>\n";
-     html += "      &nbsp;&nbsp;\n";
-     html += "      <img class=\"twitter_logo\" src=\"" + QString::fromLocal8Bit(::getenv("TUPI_SHARE")) \
-             + "/data/help/images/twitter01.png\" alt=\"maefloresta\"/>\n";
-     html += "      <font class=\"twitter_headline\" >&nbsp;&nbsp;maefloresta</font>\n";
-     html += "      <br/>\n";
-     html += "     </td>\n";
-     html += "     </tr>\n";
-     html += "     <tr>\n";
-
-     QString css = "tupi_version";  
-     if (k->update)
-         css = "tupi_update"; 
-
-     html += "     <td class=\"" + css + "\">\n";
-     html += "       <center>" + tr("Latest version") + ": <b>" + k->version + "</b> &nbsp;&nbsp;&nbsp;" + tr("Revision") + ": <b>" + k->revision + "</b> &nbsp;&nbsp;&nbsp;" + tr("Code Name") + ": <b>" + k->codeName + "</b>";
-
-     if (k->update)
-         html += "<br/><b>[</b> <a href=\"http://www.maefloresta.com\">" + tr("Update here!") + "</a>  <b>]</b>"; 
-
-     html += "</center>\n";
-
-     html += "     </td>\n";
-     html += "     </tr>\n";
-     html += "     <tr>\n";
-     html += "     <td>\n";
-     html += "     <b>" + tr("This is what's happening") + ":</b>\n";
-     html += "     </td>\n";
-     html += "     </tr>\n";
-     html += "     <tr>\n";
-     html += "     <td>\n";
-
-     html += output;
-
-     html += "     </td>\n";
-     html += "     </tr>\n";
-     html += "    </table>\n";
-     html += "  </td>\n";
-     html += "  <td class=\"twitter_desc\">\n";
-     html += "    <table class=\"desc_table\">\n";
-     html += "     <tr><td>\n";
-     html += "          <b>" + tr("Name") + ":</b> " + name + "<br/>\n";
-     html += "          <b>" + tr("Description") + ":</b> " + description + "<br/>\n";
-     html += "          <b>" + tr("Website") + ":</b> " +  website + "<br/>\n";
-     html += "          <b>" + tr("Followers") + ":</b> " + followers + "<br/>\n";
-     html += "     </td></tr>\n";
-     html += "     </table>\n";
-     html += "    <table class=\"twitter_slang\">\n";
-     html += "     <tr><td>\n";
-     html += "         <p class=\"twitter_slang_td\">\n";
-     html += "         &nbsp;<br/>\n";
-     html += "          <b><a href=\"" + k->url.simplified() + "\">" + k->reference + "</a></b><br/>\n";
-     html += "          <b>" + k->word + ":</b> " + k->meaning + "<br/>\n";
-     html += "         </p>";
-     html += "     </td></tr>\n";
-     html += "     </table>\n";
-     html += "  </td>\n";
-     html += "  </tr>\n";
-     html += "</table>\n";
-     html += "</body>\n";
-     html += "</html>";
-
-     QString twitterPath = QDir::homePath() + "/." + QCoreApplication::applicationName() + "/twitter.html";
-     QFile file(twitterPath);
-     file.open(QIODevice::WriteOnly);
-
-     QByteArray data = html.toUtf8();
-     file.write(data, qstrlen(data));
-     file.close();
-
-     // FIXME: This class doesn't close its network request correctly / refactoring required  
-     // delete k->reply;
-     // delete k->manager;
-
-     emit pageReady();
-}
-
-void Tupwitter::loadTwitterMeaning()
+void TupTwitter::formatStatus(QByteArray array)
 {
-    QDomDocument doc;
-    QString twitterFile = DATA_DIR + "twitter.xml";
-    QFile file(twitterFile);
+    QString tweets = QString(array);
+    QString html = "";
 
-    if (!file.open(QIODevice::ReadOnly))
-        return;
+    html += "<html>\n";
+    html += "<head>\n";
+    html += "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n";
+    html += "<link rel=\"stylesheet\" type=\"text/css\" href=\"file:tupi.css\">\n";
+    html += "</head>\n";
+    html += "<body class=\"twitter_white\">\n";
+    html += "<div class=\"tupi_background1\">";
+    html += "<center><img src=\"file:maefloresta.png\" alt=\"maefloresta\"/></center>\n";
+    html += "<div class=\"twitter_headline\"><center>&nbsp;&nbsp;@maefloresta</center></div></div>\n";
+    QString css = "twitter_tupi_version";  
+    if (k->update)
+        css = "twitter_tupi_update"; 
+
+    html += "<div class=\"" + css + "\"><center>\n";
+    html += tr("Latest version") + ": <b>" + k->version + "</b> &nbsp;&nbsp;&nbsp;"; 
+    html += tr("Revision") + ": <b>" + k->revision + "</b> &nbsp;&nbsp;&nbsp;";
+    html += tr("Code Name") + ": <b>" + k->codeName + "</b>";
+
+    if (k->update)
+        html += "&nbsp;&nbsp;&nbsp;<b>[</b> <a href=\"http://www.maefloresta.com\">" + tr("It's time to upgrade! Click here!") + "</a>  <b>]</b>"; 
+
+    html += "</center></div>\n";
+    html += "<div class=\"twitter_tupi_donation\"><center>\n";
+    html += "<a href=\"http://www.maefloresta.com/portal/donations\">" + tr("Want to help us to make a better project? Click here!") + "</a>";
+    html += "</center></div>\n";
+    html += tweets;
+    html += "</body>\n";
+    html += "</html>";
+
+    QString twitterPath = QDir::homePath() + "/." + QCoreApplication::applicationName() + "/twitter.html";
+    QFile file(twitterPath);
+    file.open(QIODevice::WriteOnly);
 
-    if (!doc.setContent(&file)) {
-        file.close();
-        return;
-    }
+    QByteArray data = html.toUtf8();
+    file.write(data, qstrlen(data));
     file.close();
 
-    QDomElement docElem = doc.documentElement();
-    QDomNode n = docElem.firstChild();
+    k->reply->deleteLater(); 
+    k->manager->deleteLater();
 
-    while (!n.isNull()) {
-           QDomElement e = n.toElement();
-           if (!e.isNull()) {
-               if (e.tagName() == "word")
-                   k->word = e.text();
-               else if (e.tagName() == "ref")
-                   k->reference = e.text();
-               else if (e.tagName() == "url")
-                   k->url = e.text();
-               else if (e.tagName() == "meaning")
-                   k->meaning = e.text();
-           }
-           n = n.nextSibling();
-    }
+    #ifdef K_DEBUG
+        QString msg = "TupTwitter::formatStatus() - Saving file -> " + twitterPath;
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif
 
+    emit pageReady();
 }
diff -Nru tupi-0.2+git04/src/components/twitter/tuptwitter.h tupi-0.2+git05/src/components/twitter/tuptwitter.h
--- tupi-0.2+git04/src/components/twitter/tuptwitter.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/twitter/tuptwitter.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,25 +33,30 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef TUPWITTER_H
-#define TUPWITTER_H
+#ifndef TUPTWITTER_H
+#define TUPTWITTER_H
 
+#include "tglobal.h"
 #include "tapplicationproperties.h"
 
 #include <QWidget>
-#include <QNetworkReply>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QFile>
 #include <QByteArray>
+#include <QtGui>
+#include <QtNetwork>
+#include <QNetworkReply>
+#include <QDomDocument>
+#include <QEventLoop>
 
-class Tupwitter : public QWidget
+class TUPI_EXPORT TupTwitter : public QWidget
 {
     Q_OBJECT
 
     public:
-        Tupwitter(QWidget *parent=0);
-        ~Tupwitter();
+        TupTwitter(QWidget *parent=0);
+        ~TupTwitter();
         void start();
 
     private slots:
@@ -65,10 +70,9 @@
         void requestFile(QString target);
         void checkSoftwareUpdates(QByteArray array);
         void formatStatus(QByteArray array);
-        void loadTwitterMeaning();
 
-        static QString TWITTER_HOST;
-        static QString IS_TWITTER_UP_URL;
+        static QString NEWS_HOST;
+        static QString IS_HOST_UP_URL;
         static QString USER_TIMELINE_URL;
         static QString TUPI_VERSION_URL;
         static QString BROWSER_FINGERPRINT;
diff -Nru tupi-0.2+git04/src/components/twitter/tuptwitterwidget.cpp tupi-0.2+git05/src/components/twitter/tuptwitterwidget.cpp
--- tupi-0.2+git04/src/components/twitter/tuptwitterwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/twitter/tuptwitterwidget.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,52 +34,54 @@
  ***************************************************************************/
 
 #include "tuptwitterwidget.h"
-#include "tuptwitter.h"
 
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QIcon>
-#include <QMenu>
-#include <QMouseEvent>
-
-// Twitter Widget 
+struct TupTwitterWidget::Private
+{
+    QSplitter *separator;
+    QTextBrowser *pageArea;
+    QTextDocument *document;
+};
 
-TupTwitterWidget::TupTwitterWidget(QWidget *parent) : QWidget(parent)
+TupTwitterWidget::TupTwitterWidget(QWidget *parent) : QWidget(parent), k(new Private)
 {
     setWindowTitle(tr("News!"));
     setWindowIcon(QIcon(QPixmap(THEME_DIR + "icons/news_mode.png")));
 
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->setMargin(15);
-    m_separator = new QSplitter(this);
-    layout->addWidget(m_separator);
-
-    m_pageArea = new QTextBrowser(m_separator);
-    m_pageArea->setOpenExternalLinks(true);
+    k->separator = new QSplitter(this);
+    layout->addWidget(k->separator);
 
-    m_document = new QTextDocument(m_pageArea);
-
-    m_pageArea->setDocument(m_document);
+    k->pageArea = new QTextBrowser(k->separator);
+    k->document = new QTextDocument(k->pageArea);
+    k->pageArea->setDocument(k->document);
 }
 
 TupTwitterWidget::~TupTwitterWidget()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupTwitterWidget()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
-void TupTwitterWidget::setDocument(const QString &doc)
-{
-    m_document->setHtml(doc);
-}
-
 void TupTwitterWidget::setSource(const QString &filePath)
 {
-    m_pageArea->setSource(filePath);
+    QStringList path;
+#ifdef Q_OS_WIN32
+    QString resources = SHARE_DIR + "help" + QDir::separator();
+#else
+    QString resources = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator();
+#endif
+
+    path << resources + "css";
+    path << resources + "images";
+    k->pageArea->setSearchPaths(path);
+    k->pageArea->setOpenExternalLinks(true);
+    k->pageArea->setSource(QUrl::fromLocalFile(filePath));
 }
 
 void TupTwitterWidget::keyPressEvent(QKeyEvent * event) {
@@ -94,12 +96,12 @@
 void TupTwitterWidget::downLoadNews()
 {
     // Downloading maefloresta Twitter status
-    Tupwitter *tuptwitter = new Tupwitter();
-    connect(tuptwitter, SIGNAL(pageReady()), this, SLOT(reload()));
-    tuptwitter->start();
+    TupTwitter *twitter = new TupTwitter();
+    connect(twitter, SIGNAL(pageReady()), this, SLOT(reload()));
+    twitter->start();
 }
 
 void TupTwitterWidget::reload()
 {
-    m_pageArea->reload(); 
+    k->pageArea->reload(); 
 }
diff -Nru tupi-0.2+git04/src/components/twitter/tuptwitterwidget.h tupi-0.2+git05/src/components/twitter/tuptwitterwidget.h
--- tupi-0.2+git04/src/components/twitter/tuptwitterwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/twitter/tuptwitterwidget.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,16 +36,23 @@
 #ifndef TUPTWITTERWIDGET_H
 #define TUPTWITTERWIDGET_H
 
+#include "tglobal.h"
+#include "tuptwitter.h"
+
 #include <QWidget>
 #include <QSplitter>
 #include <QTextBrowser>
 #include <QTextDocument>
+#include <QBoxLayout>
+#include <QIcon>
+#include <QMenu>
+#include <QMouseEvent>
 
 /**
  * @author David Cuadrado
 */
 
-class TupTwitterWidget : public QWidget
+class TUPI_EXPORT TupTwitterWidget : public QWidget
 {
     Q_OBJECT
 
@@ -54,7 +61,6 @@
         ~TupTwitterWidget();
 
     public slots:
-        void setDocument(const QString &doc);
         void setSource(const QString &filePath);
 
     private slots: 
@@ -65,10 +71,8 @@
 
     private:
         void downLoadNews();
-
-        QSplitter *m_separator;
-        QTextBrowser *m_pageArea;
-        QTextDocument *m_document;
+        struct Private;
+        Private *const k;
 };
 
 #endif
diff -Nru tupi-0.2+git04/src/components/twitter/twitter.pri tupi-0.2+git05/src/components/twitter/twitter.pri
--- tupi-0.2+git04/src/components/twitter/twitter.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/twitter/twitter.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$TWITTER_DIR
-LIBS += -L$$TWITTER_DIR -ltupitwitter
+
+unix {
+    LIBS += -L$$TWITTER_DIR -ltupitwitter
+}
+
+win32 {
+    LIBS += -L$$TWITTER_DIR/release/ -ltupitwitter
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$TWITTER_DIR/libtupitwitter.so
diff -Nru tupi-0.2+git04/src/components/twitter/twitter.pro tupi-0.2+git05/src/components/twitter/twitter.pro
--- tupi-0.2+git04/src/components/twitter/twitter.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/twitter/twitter.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/components/pen
-# Target is a library:  
+QT += opengl core gui svg xml network
 
 INSTALLS += target
 target.path = /lib/
@@ -15,6 +12,7 @@
 
 SOURCES += tuptwitter.cpp \
            tuptwitterwidget.cpp
+		   
 *:!macx{
     CONFIG += dll warn_on
 }
@@ -24,5 +22,37 @@
 
 FRAMEWORK_DIR = "../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
 
+unix {
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi
+
+    !include(../../../tupiglobal.pri) {
+             error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
+
+    STORE_DIR = ../../store/
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+    LIBBASE_DIR = ../../libbase/
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+    LIBTUPI_DIR = ../../libtupi/
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
diff -Nru tupi-0.2+git04/src/framework/framework.pri tupi-0.2+git05/src/framework/framework.pri
--- tupi-0.2+git04/src/framework/framework.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/framework.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,6 +1,9 @@
-
-#INCLUDEPATH += $$FRAMEWORK_DIR $$FRAMEWORK_DIR/tcore $$FRAMEWORK_DIR/tgui $$FRAMEWORK_DIR/tsound
+unix {
 INCLUDEPATH += $$FRAMEWORK_DIR $$FRAMEWORK_DIR/tcore $$FRAMEWORK_DIR/tgui
-
-#LIBS += -L$$FRAMEWORK_DIR/tcore -L$$FRAMEWORK_DIR/tgui -L$$FRAMEWORK_DIR/tsound -ltupifwcore -ltupifwgui -ltupifwsound
 LIBS += -L$$FRAMEWORK_DIR/tcore -L$$FRAMEWORK_DIR/tgui -ltupifwcore -ltupifwgui
+}
+
+win32 {
+INCLUDEPATH += $$FRAMEWORK_DIR $$FRAMEWORK_DIR/tcore $$FRAMEWORK_DIR/tgui
+LIBS += -L$$FRAMEWORK_DIR/tcore/release/ -L$$FRAMEWORK_DIR/tgui/release/ -ltupifwcore -ltupifwgui
+}
\ No newline at end of file
diff -Nru tupi-0.2+git04/src/framework/framework.pro tupi-0.2+git05/src/framework/framework.pro
--- tupi-0.2+git04/src/framework/framework.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/framework.pro	2014-12-15 14:21:33.000000000 +0000
@@ -7,4 +7,3 @@
 SUBDIRS += tcore tgui
 CONFIG += ordered warn_on
 TEMPLATE = subdirs
-
diff -Nru tupi-0.2+git04/src/framework/tcore/talgorithm.cpp tupi-0.2+git05/src/framework/tcore/talgorithm.cpp
--- tupi-0.2+git04/src/framework/tcore/talgorithm.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/talgorithm.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,17 +35,6 @@
 
 #include "talgorithm.h"
 
-#include <cstdlib>
-#include <cstdio>
-#include <ctime>
-#include <QCryptographicHash>
-
-#ifdef Q_OS_LINUX
-#include <unistd.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#endif
-
 int TAlgorithm::random()
 {
     static bool init = false;
diff -Nru tupi-0.2+git04/src/framework/tcore/talgorithm.h tupi-0.2+git05/src/framework/tcore/talgorithm.h
--- tupi-0.2+git04/src/framework/tcore/talgorithm.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/talgorithm.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,10 +36,22 @@
 #ifndef TALGORITHM_H
 #define TALGORITHM_H
 
+#include "tglobal.h"
+
 #include <QString>
 #include <QColor>
 
-#include "tglobal.h"
+#include <cstdlib>
+#include <cstdio>
+#include <ctime>
+#include <QCryptographicHash>
+
+#ifdef Q_OS_LINUX
+#include <unistd.h>
+#include <sys/time.h>
+#include <fcntl.h>
+#endif
+
 
 /**
  * Class containing generic useful algorithms about random values
diff -Nru tupi-0.2+git04/src/framework/tcore/tapplicationproperties.cpp tupi-0.2+git05/src/framework/tcore/tapplicationproperties.cpp
--- tupi-0.2+git04/src/framework/tcore/tapplicationproperties.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tapplicationproperties.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,10 +35,6 @@
 
 #include "tapplicationproperties.h"
 
-#include <QDir>
-#include <QLocale>
-#include <QApplication>
-
 TApplicationProperties *TApplicationProperties::s_instance = 0;
 
 struct TApplicationProperties::Private
@@ -97,7 +93,7 @@
 
 void TApplicationProperties::setCacheDir(const QString &path)
 {
-    k->cacheDir = path;
+	k->cacheDir = path;
 }
 
 void TApplicationProperties::setRepositoryDir(const QString &path)
@@ -145,7 +141,7 @@
         if (locale.length() < 2)
             locale = "en";
 
-        return k->shareDir + QDir::separator() + "data" + QDir::separator() + locale + QDir::separator();
+        return k->shareDir + QDir::separator() + "data" + QDir::separator() + "xml" + QDir::separator() + locale + QDir::separator();
     }
 
     return k->dataDir;
diff -Nru tupi-0.2+git04/src/framework/tcore/tapplicationproperties.h tupi-0.2+git05/src/framework/tcore/tapplicationproperties.h
--- tupi-0.2+git04/src/framework/tcore/tapplicationproperties.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tapplicationproperties.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,11 +33,15 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef KAPPLICATIONPROPERTIES_H
-#define KAPPLICATIONPROPERTIES_H
+#ifndef TAPPLICATIONPROPERTIES_H
+#define TAPPLICATIONPROPERTIES_H
 
 #include "tglobal.h"
+
 #include <QString>
+#include <QDir>
+#include <QLocale>
+#include <QApplication>
 
 /**
  * @author David Cuadrado
@@ -85,5 +89,14 @@
 };
 
 #define kAppProp TApplicationProperties::instance()
+#define HOME_DIR kAppProp->homeDir()
+#define BIN_DIR kAppProp->binDir()
+#define SHARE_DIR kAppProp->shareDir()
+#define DATA_DIR kAppProp->dataDir()
+#define THEME_DIR kAppProp->themeDir()
+#define CONFIG_DIR kAppProp->configDir()
+#define PLUGINS_DIR kAppProp->pluginDir()
+#define CACHE_DIR kAppProp->cacheDir()
+#define REPOSITORY_DIR kAppProp->repositoryDir()
 
 #endif
diff -Nru tupi-0.2+git04/src/framework/tcore/tconfig.cpp tupi-0.2+git05/src/framework/tcore/tconfig.cpp
--- tupi-0.2+git04/src/framework/tcore/tconfig.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tconfig.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,12 +34,6 @@
  ***************************************************************************/
 
 #include "tconfig.h"
-#include "tdebug.h"
-
-#include <QDir>
-#include <QCoreApplication>
-#include <QTextDocument>
-#include <QDomDocument>
 
 class TConfig::Private
 {
@@ -61,40 +55,62 @@
 TConfig::TConfig() : QObject(), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TConfig()]";
+        #else
+            TINIT;
+        #endif
     #endif
-	
-    #ifdef Q_WS_X11
-           k->configDirectory.setPath(QDir::homePath() + "/." + QCoreApplication::applicationName());
-    #elif defined(Q_WS_WIN)
-                  k->configDirectory.setPath(QDir::homePath() + "/" + QCoreApplication::applicationName());
-    #elif defined(Q_WS_MAC)
-                  k->configDirectory.setPath(QDir::homePath() + "/." + QCoreApplication::applicationName());
+
+    QString base = QDir::homePath() + QDir::separator();
+
+	/*
+    #ifdef Q_OS_WIN32
+            k->configDirectory.setPath(base + QCoreApplication::applicationName());
+    #else
+            k->configDirectory.setPath(base + "." + QCoreApplication::applicationName());
     #endif
+	*/
+	
+	k->configDirectory.setPath(base + "." + QCoreApplication::applicationName());
 
     if (!k->configDirectory.exists()) {
         k->firstTime = true;
         #ifdef K_DEBUG
-               tWarning() << "*** TConfig::TConfig() - Config file doesn't exist. Creating path: " << k->configDirectory.path();
+            QString msg = "TConfig::TConfig() - Config file doesn't exist. Creating path: " + k->configDirectory.path();
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
 
         if (!k->configDirectory.mkdir(k->configDirectory.path())) {
             #ifdef K_DEBUG
-                   tError() << "TConfig::TConfig() - Fatal Error: Can't create path -> " << k->configDirectory.path();
+                QString msg = "TConfig::TConfig() - Fatal Error: Can't create path -> " + k->configDirectory.path();
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
         }
     } else {
         k->firstTime = false;
     }
 
-    k->path = k->configDirectory.path() + "/" + QCoreApplication::applicationName().toLower() + ".cfg";
+    k->path = k->configDirectory.path() + QDir::separator() + QCoreApplication::applicationName().toLower() + ".cfg";
     init();
 }
 
 TConfig::~TConfig()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TConfig()]";
+        #else
+            TEND;
+        #endif
     #endif
 
     if (m_instance) 
@@ -122,9 +138,16 @@
         k->isOk = k->document.setContent(&config, &errorMsg, &errorLine, &errorColumn);
 
         if (!k->isOk) {
-            #ifdef K_DEBUG 
-                   tError() << "TConfig::init() - Fatal Error: Configuration file is corrupted - Line: " << errorLine << " - Column: " << errorColumn;
-                   tError() << "TConfig::init() - Message: " << errorMsg;
+            #ifdef K_DEBUG
+                QString msg1 = "TConfig::init() - Fatal Error: Configuration file is corrupted - Line: " + QString::number(errorLine) + " - Column: " + QString::number(errorColumn);
+                QString msg2 = "TConfig::init() - Message: " + errorMsg;
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg1;
+                    qDebug() << msg2;
+                #else
+                    tError() << msg1;
+                    tError() << msg2;
+                #endif
             #endif
         }
 
@@ -173,7 +196,8 @@
 
 void TConfig::beginGroup(const QString & prefix)
 {
-    QString stripped = Qt::escape(prefix);
+    // QString stripped = Qt::escape(prefix);
+    QString stripped = QString(prefix).toHtmlEscaped();
 
     stripped.replace(' ', "_");
     stripped.replace('\n', "");
diff -Nru tupi-0.2+git04/src/framework/tcore/tconfig.h tupi-0.2+git05/src/framework/tcore/tconfig.h
--- tupi-0.2+git04/src/framework/tcore/tconfig.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tconfig.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,14 +36,17 @@
 #ifndef TCONFIG_H
 #define TCONFIG_H
 
-#include <QObject>
+#include "tglobal.h"
+
 #include <QDir>
-#include <QHash>
+#include <QCoreApplication>
+#include <QTextStream>
+#include <QTextDocument>
 #include <QDomDocument>
+#include <QObject>
+#include <QHash>
 #include <QVariant>
 
-#include "tglobal.h"
-
 class TConfig;
 
 /**
diff -Nru tupi-0.2+git04/src/framework/tcore/tcore.pro tupi-0.2+git05/src/framework/tcore/tcore.pro
--- tupi-0.2+git04/src/framework/tcore/tcore.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tcore.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,10 +1,13 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/framework/tcore
-# Target is a library: tupifwcore  
+QT += opengl core gui svg xml network
 
-!include(../tupconfig.pri) {
-    error("Run ./configure first")
+unix {
+    !include(../tupconfig.pri) {
+        error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
 }
 
 INSTALLS += target
@@ -23,7 +26,6 @@
 HEADERS += talgorithm.h \
            tapplicationproperties.h \
            tconfig.h \
-           tdebug.h \
            tglobal.h \
            tipdatabase.h \
            txmlparserbase.h
@@ -31,10 +33,16 @@
 SOURCES += talgorithm.cpp \
            tapplicationproperties.cpp \
            tconfig.cpp \
-           tdebug.cpp \
            tipdatabase.cpp \
            txmlparserbase.cpp
 
+unix {
+    contains(DEFINES, K_DEBUG) {
+        HEADERS += tdebug.h
+        SOURCES += tdebug.cpp
+    }
+}
+
 *:!macx{
     CONFIG += warn_on dll
 }
diff -Nru tupi-0.2+git04/src/framework/tcore/tdebug.cpp tupi-0.2+git05/src/framework/tcore/tdebug.cpp
--- tupi-0.2+git04/src/framework/tcore/tdebug.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tdebug.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -33,41 +33,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#if !defined(K_NODEBUG)
 #include "tdebug.h"
 
-#include <QFile>
-#include <QString>
-#include <QDateTime>
-#include <QPoint>
-#include <QPointF>
-#include <QRect>
-#include <QStringList>
-#include <QVariant>
-#include <QSize>
-#include <QEvent>
-// #include <QTimer>
-
-#ifdef QT_GUI_LIB
-
-#include <QRegion>
-#include <QPen>
-#include <QBrush>
-#include <QImage>
-#include <QIcon>
-#include <QPixmap>
-#include <QWidget>
-#include <QMessageBox>
-#include <QSyntaxHighlighter>
-#include <QMatrix>
-#include <QDesktopWidget>
-#include <QScrollBar>
-#include <QDebug>
-
-#endif
-
-// #include <QSettings>
-
 #if defined(Q_OS_UNIX)
 # define SHOW_ERROR "*** \033[0;31m%s\033[0;0m ***\n"
 # define SHOW_WARNING "-> \033[10;33m%s\033[0;0m\n"
@@ -78,10 +45,10 @@
 # define SHOW_FATAL "***** %s *****\n"
 #endif
 
-#ifdef QT_GUI_LIB
-       static QTextEdit *debugBrowser = 0;
-#endif
-
+// #ifdef QT_GUI_LIB
+static QTextEdit *debugBrowser = 0;
+static bool projectIsOpen = false;
+// #endif
 
 #ifdef Q_OS_UNIX
 
@@ -145,7 +112,7 @@
 {
 }
 
-#ifdef QT_GUI_LIB
+// #ifdef QT_GUI_LIB
 
 class DebugBrowserHighlighter : public QSyntaxHighlighter
 {
@@ -201,7 +168,7 @@
         setFormat(0, sepIndex, format);
 }
 
-#endif // QT_GUI_LIB
+// #endif // QT_GUI_LIB
 
 static void tDebugOutput(DebugType t, DebugOutput o, const char *data)
 {
@@ -253,7 +220,7 @@
                }
             break;
 
-            #ifdef QT_GUI_LIB
+            // #ifdef QT_GUI_LIB
             case TBoxOutput:
                {
                     switch (t) {
@@ -285,17 +252,19 @@
             break;
             case TBrowserOutput:
                {
-                    if (debugBrowser) {
-                        if (data) {
+                   if (projectIsOpen) {
+                       if (debugBrowser) {
+                           if (data) {
                             debugBrowser->append(QString(data));
                             QScrollBar *bar = debugBrowser->verticalScrollBar();
                             bar->setValue(bar->maximum());
-                            fprintf(stderr, output, data);
-                        }
-                    } 
+                           }
+                       } 
+                   }
+                   fprintf(stderr, output, data);
                }
             break;
-            #endif
+            // #endif
 
             default: 
             break;
@@ -332,7 +301,6 @@
 TDebug::~TDebug()
 {
     ::tDebugOutput(m_type, configReader.outputType, streamer->buffer.toLocal8Bit().data());
-
     delete streamer;
 }
 
@@ -417,7 +385,6 @@
     return *this;
 }
 
-#ifdef QT_GUI_LIB
 TDebug& TDebug::operator<<( const QPixmap& p ) 
 {
     *this << "(" << p.width() << ", " << p.height() << ")";
@@ -610,6 +577,8 @@
     return debugBrowser;
 }
 
-#endif // QT_GUI_LIB
+void TDebug::setProjectStatus(bool status)
+{
+    projectIsOpen = status;
+}
 
-#endif // K_NODEBUG
diff -Nru tupi-0.2+git04/src/framework/tcore/tdebug.h tupi-0.2+git05/src/framework/tcore/tdebug.h
--- tupi-0.2+git04/src/framework/tcore/tdebug.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tdebug.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,41 @@
 #ifndef TDEBUG_H
 #define TDEBUG_H
 
-#include "tglobal.h"
+// #include "tglobal.h"
+
+#if defined(QT_SHARED) || defined(QT_PLUGIN)
+#define T_CORE_EXPORT Q_DECL_EXPORT
+#else
+#define T_CORE_EXPORT
+#endif
+
+#include <QFile>
+#include <QString>
+#include <QDateTime>
+#include <QPoint>
+#include <QPointF>
+#include <QRect>
+#include <QVariant>
+#include <QSize>
+#include <QEvent>
+
+#ifdef QT_GUI_LIB
+
+#include <QRegion>
+#include <QPen>
+#include <QBrush>
+#include <QImage>
+#include <QIcon>
+#include <QPixmap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QSyntaxHighlighter>
+#include <QMatrix>
+#include <QDesktopWidget>
+#include <QScrollBar>
+#include <QDebug>
+
+#endif
 
 #include <QTextStream>
 #include <QStringList>
@@ -345,7 +379,7 @@
         
         // static QTextBrowser *browser(QWidget *parent, int width);
         static QTextEdit *browser(QWidget *parent, int width);
-
+        static void setProjectStatus(bool status);
 #endif
   
         template <class T> TDebug& operator << ( const QList<T> &list );
diff -Nru tupi-0.2+git04/src/framework/tcore/tglobal.h tupi-0.2+git05/src/framework/tcore/tglobal.h
--- tupi-0.2+git04/src/framework/tcore/tglobal.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tglobal.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,26 +36,54 @@
 #ifndef TGLOBAL_H
 #define TGLOBAL_H
 
+/**
+ * This class defines enumerations used in the whole code of the project.
+ *
+ * @author David Cuadrado
+*/
+
 #if defined(QT_SHARED) || defined(QT_PLUGIN)
-# define T_GUI_EXPORT Q_GUI_EXPORT
-# define T_CORE_EXPORT Q_DECL_EXPORT
-# define T_SOUND_EXPORT Q_DECL_EXPORT
+#define T_GUI_EXPORT Q_GUI_EXPORT
+#define T_CORE_EXPORT Q_DECL_EXPORT
+#define T_SOUND_EXPORT Q_DECL_EXPORT
+#define TUPI_EXPORT Q_GUI_EXPORT
+#define TUPI_PLUGIN Q_DECL_EXPORT
+#else
+#define T_GUI_EXPORT
+#define T_CORE_EXPORT
+#define T_SOUND_EXPORT
+#define TUPI_EXPORT
+#define TUPI_PLUGIN
+#endif
+
+#ifdef K_DEBUG
+
+#ifdef Q_OS_WIN32
+#include <QDebug>
 #else
-# define T_GUI_EXPORT
-# define T_CORE_EXPORT
-# define T_SOUND_EXPORT
+#include "tdebug.h"
+#endif
+
 #endif
 
-// #include "tapplicationproperties.h"
+#define LIBRARY_DIR CONFIG_DIR+"/libraries"
+
+namespace Tupi 
+{
+    enum RenderType
+      {
+       Image = 0,
+       OpenGL,
+       Native
+      };
 
-#define HOME_DIR kAppProp->homeDir()
-#define BIN_DIR kAppProp->binDir()
-#define SHARE_DIR kAppProp->shareDir()
-#define DATA_DIR kAppProp->dataDir()
-#define THEME_DIR kAppProp->themeDir()
-#define CONFIG_DIR kAppProp->configDir()
-#define PLUGINS_DIR kAppProp->pluginDir()
-#define CACHE_DIR kAppProp->cacheDir()
-#define REPOSITORY_DIR kAppProp->repositoryDir()
+    enum MessageType
+      {
+       Information = 0,
+       Warning,
+       Error,
+       Critical
+      };
+};
 
 #endif
diff -Nru tupi-0.2+git04/src/framework/tcore/tipdatabase.cpp tupi-0.2+git05/src/framework/tcore/tipdatabase.cpp
--- tupi-0.2+git04/src/framework/tcore/tipdatabase.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tipdatabase.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,11 +34,6 @@
  ***************************************************************************/
 
 #include "tipdatabase.h"
-#include "talgorithm.h"
-#include "tdebug.h"
-
-#include <QDomDocument>
-#include <QFile>
 
 struct TipDatabase::Private
 {
diff -Nru tupi-0.2+git04/src/framework/tcore/tipdatabase.h tupi-0.2+git05/src/framework/tcore/tipdatabase.h
--- tupi-0.2+git04/src/framework/tcore/tipdatabase.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/tipdatabase.h	2014-12-15 14:21:33.000000000 +0000
@@ -37,7 +37,10 @@
 #define TIPDATABASE_H
 
 #include "tglobal.h"
+#include "talgorithm.h"
 
+#include <QDomDocument>
+#include <QFile>
 #include <QWidget>
 #include <QString>
 #include <QList>
diff -Nru tupi-0.2+git04/src/framework/tcore/txmlparserbase.cpp tupi-0.2+git05/src/framework/tcore/txmlparserbase.cpp
--- tupi-0.2+git04/src/framework/tcore/txmlparserbase.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/txmlparserbase.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,8 +35,6 @@
 
 #include "txmlparserbase.h"
 
-#include "tdebug.h"
-
 struct TXmlParserBase::Private
 {
     QString currentTag;
@@ -116,16 +114,34 @@
 
 bool TXmlParserBase::error(const QXmlParseException & exception)
 {
-    tWarning() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
-    tWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;
+#ifdef K_DEBUG	
+    #ifdef Q_OS_WIN32
+        qWarning() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
+        qWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;
+    #else
+        tWarning() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
+        tWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;
+    #endif
+#else
+     Q_UNUSED(exception);
+#endif
 
     return true;
 }
 
 bool TXmlParserBase::fatalError(const QXmlParseException & exception)
 {
-    tFatal() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
-    tWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;
+#ifdef K_DEBUG
+    #ifdef Q_OS_WIN32
+        qWarning() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
+        qWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;
+    #else
+        tWarning() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
+        tWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;
+    #endif
+#else
+     Q_UNUSED(exception);
+#endif
 
     return true;
 }
@@ -169,7 +185,15 @@
 {
     if (!file->isOpen()) {
         if (! file->open(QIODevice::ReadOnly | QIODevice::Text)) {
-            tWarning() << "Cannot open file " << file->fileName();
+#ifdef K_DEBUG
+            QString msg = "TXmlParserBase::parse() - Error: Cannot open file -> " + file->fileName();
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+#endif
+
             return false;
         }
     }
diff -Nru tupi-0.2+git04/src/framework/tcore/txmlparserbase.h tupi-0.2+git05/src/framework/tcore/txmlparserbase.h
--- tupi-0.2+git04/src/framework/tcore/txmlparserbase.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tcore/txmlparserbase.h	2014-12-15 14:21:33.000000000 +0000
@@ -37,6 +37,7 @@
 #define TXMLPARSERBASE_H
 
 #include "tglobal.h"
+
 #include <QXmlDefaultHandler>
 
 /**
diff -Nru tupi-0.2+git04/src/framework/tgui/tabbedmainwindow.cpp tupi-0.2+git05/src/framework/tgui/tabbedmainwindow.cpp
--- tupi-0.2+git04/src/framework/tgui/tabbedmainwindow.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tabbedmainwindow.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,13 +35,6 @@
 
 #include "tabbedmainwindow.h"
 
-#include <QTabWidget>
-#include <QToolButton>
-#include <QPainter>
-#include <QWheelEvent>
-#include <QTabBar>
-#include <QtDebug>
-
 #ifndef TUPI_GUI
 
 class TabWidgetPrivate : public QTabWidget
diff -Nru tupi-0.2+git04/src/framework/tgui/tabbedmainwindow.h tupi-0.2+git05/src/framework/tgui/tabbedmainwindow.h
--- tupi-0.2+git04/src/framework/tgui/tabbedmainwindow.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tabbedmainwindow.h	2014-12-15 14:21:33.000000000 +0000
@@ -38,6 +38,12 @@
 
 #include "tmainwindow.h"
 
+#include <QTabWidget>
+#include <QToolButton>
+#include <QPainter>
+#include <QWheelEvent>
+#include <QTabBar>
+
 class QTabWidget;
 
 /**
@@ -45,7 +51,7 @@
  * @author David Cuadrado
 */
 
-class T_IDEAL_EXPORT TabbedMainWindow : public TMainWindow
+class T_GUI_EXPORT TabbedMainWindow : public TMainWindow
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tabdialog.cpp tupi-0.2+git05/src/framework/tgui/tabdialog.cpp
--- tupi-0.2+git04/src/framework/tgui/tabdialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tabdialog.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,10 +35,6 @@
 
 #include "tabdialog.h"
 
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QHBoxLayout>
-
 TabDialog::TabDialog(QWidget *parent, bool modal) : QDialog(parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout;
diff -Nru tupi-0.2+git04/src/framework/tgui/tabdialog.h tupi-0.2+git05/src/framework/tgui/tabdialog.h
--- tupi-0.2+git04/src/framework/tgui/tabdialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tabdialog.h	2014-12-15 14:21:33.000000000 +0000
@@ -40,6 +40,9 @@
 
 #include <QDialog>
 #include <QHash>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QHBoxLayout>
 
 typedef QHash<int, QPushButton *> Buttons;
 
diff -Nru tupi-0.2+git04/src/framework/tgui/taction.cpp tupi-0.2+git05/src/framework/tgui/taction.cpp
--- tupi-0.2+git04/src/framework/tgui/taction.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/taction.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,8 +34,6 @@
  ***************************************************************************/
 
 #include "taction.h"
-#include "tactionmanager.h"
-#include "tdebug.h"
 
 TAction::TAction(QObject * parent, const QString &id) : QAction(parent)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/taction.h tupi-0.2+git05/src/framework/tgui/taction.h
--- tupi-0.2+git04/src/framework/tgui/taction.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/taction.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,11 +36,12 @@
 #ifndef TACTION_H
 #define TACTION_H
 
+#include "tglobal.h"
+#include "tactionmanager.h"
+
 #include <QAction>
 #include <QKeySequence>
 
-#include "tglobal.h"
-
 class TActionManager;
 
 /**
diff -Nru tupi-0.2+git04/src/framework/tgui/tactionmanager.cpp tupi-0.2+git05/src/framework/tgui/tactionmanager.cpp
--- tupi-0.2+git04/src/framework/tgui/tactionmanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tactionmanager.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "tactionmanager.h"
-#include "tdebug.h"
-
-#include <QMenuBar>
-#include <QToolBar>
 
 /**
  * Construye un manejador de acciones.
@@ -69,8 +65,14 @@
     QAction *a = (m_actionContainer[container])[id];
     if (a == action) {
         #ifdef K_DEBUG
-               tError() << "TActionManager::insert() - Fatal Error: Cannot insert action with id: " << id;
+            QString msg = "TActionManager::insert() - Fatal Error: Cannot insert action with id -> " + id;;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         return false;
     }
 
@@ -141,7 +143,12 @@
 
     if (action == 0) {
         #ifdef K_DEBUG
-               tError() << "TActionManager::find() - Fatal Error: Returning NULL action: " << id << " in " << container;
+            QString msg = "TActionManager::find() - Fatal Error: Returning NULL action: " + id + " in " + container;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tactionmanager.h tupi-0.2+git05/src/framework/tgui/tactionmanager.h
--- tupi-0.2+git04/src/framework/tgui/tactionmanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tactionmanager.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,17 +36,20 @@
 #ifndef TACTIONMANAGER_H
 #define TACTIONMANAGER_H
 
-#include "taction.h"
 #include "tglobal.h"
+#include "taction.h"
 
+#include <QMenu>
 #include <QObject>
 #include <QWidget>
 #include <QList>
 #include <QHash>
+#include <QMenuBar>
+#include <QToolBar>
 
-typedef QList<QAction *> KActionList;
-typedef QHash<QString, QAction *> KActionDict;
-typedef QHash<QString, KActionDict> KActionContainer;
+typedef QList<QAction *> TActionList;
+typedef QHash<QString, QAction *> TActionDict;
+typedef QHash<QString, TActionDict> TActionContainer;
 
 class QToolBar;
 class QMenuBar;
@@ -78,7 +81,7 @@
         QToolBar *setupToolBar(QToolBar *toolBar, const QString &container, bool clear = true);
 
     private:
-        KActionContainer m_actionContainer;
+        TActionContainer m_actionContainer;
 };
 
 #endif
diff -Nru tupi-0.2+git04/src/framework/tgui/tanimwidget.cpp tupi-0.2+git05/src/framework/tgui/tanimwidget.cpp
--- tupi-0.2+git04/src/framework/tgui/tanimwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tanimwidget.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,14 +34,6 @@
  ***************************************************************************/
 
 #include "tanimwidget.h"
-#include "tapplication.h"
-#include "tdebug.h"
-
-#include <QPixmap>
-#include <QHideEvent>
-#include <QShowEvent>
-#include <QPainter>
-#include <QFontMetricsF>
 
 class TAnimWidget::Controller
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tanimwidget.h tupi-0.2+git05/src/framework/tgui/tanimwidget.h
--- tupi-0.2+git04/src/framework/tgui/tanimwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tanimwidget.h	2014-12-15 14:21:33.000000000 +0000
@@ -35,19 +35,23 @@
 
 #ifndef TANIMWIDGET_H
 #define TANIMWIDGET_H
+
 /**
  * @file tanimwidget.h
  * @brief Include this file if you need the class TAnimWidget
  */
 
+#include "tglobal.h"
+#include "tapplication.h"
+
 #include <QPixmap>
 #include <QHideEvent>
 #include <QShowEvent>
+#include <QPainter>
+#include <QFontMetricsF>
 #include <QList>
 #include <QWidget>
 
-#include "tglobal.h"
-
 typedef QList<QPixmap> ListOfPixmaps;
 
 /**
diff -Nru tupi-0.2+git04/src/framework/tgui/tapplication.cpp tupi-0.2+git05/src/framework/tgui/tapplication.cpp
--- tupi-0.2+git04/src/framework/tgui/tapplication.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tapplication.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,24 +34,18 @@
  ***************************************************************************/
 
 #include "tapplication.h"
-#include "tdebug.h"
-#include "tactionmanager.h"
-
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QMessageBox>
-#include <QObject>
-#include <QLocale>
-
-#include <QApplication>
-#include <QMap>
 
 TApplication::TApplication(int & argc, char ** argv) : QApplication(argc, argv)
 {
+    /*
     #ifdef K_DEBUG
-           TINIT;
-    #endif 
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TApplication()]";
+        #else
+            TINIT;
+        #endif
+    #endif
+    */
 
     QApplication::setEffectEnabled(Qt::UI_AnimateMenu, true);
     QApplication::setEffectEnabled(Qt::UI_AnimateCombo, true);
@@ -67,9 +61,15 @@
 {
     TCONFIG->sync();
 
+    /*
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TApplication()]";
+        #else
+            TEND;
+        #endif
     #endif
+    */
 }
 
 void TApplication::applyTheme(const QString &file)
diff -Nru tupi-0.2+git04/src/framework/tgui/tapplication.h tupi-0.2+git05/src/framework/tgui/tapplication.h
--- tupi-0.2+git04/src/framework/tgui/tapplication.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tapplication.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,28 +36,33 @@
 #ifndef TAPPLICATION_H
 #define TAPPLICATION_H
 
+#include "tglobal.h"
+#include "themedocument.h"
 #include "thememanager.h"
 #include "tvhbox.h"
 #include "twizard.h"
 #include "tconfig.h"
-#include "tglobal.h"
+#include "tactionmanager.h"
 
 #include <QApplication>
 #include <QMap>
-#include <QColorGroup>
-
 #include <QLineEdit>
 #include <QPushButton>
 #include <QLabel>
 #include <QFileDialog>
 #include <QDialog>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QObject>
+#include <QLocale>
 
 class QApplication;
 class QString;
-class ThemeDocument;
 class QPalette;
-class TActionManager;
-class TAction;
+// class TActionManager;
+// class TAction;
 
 typedef QMap<QString, QString> ParseArgs;
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tbuttonbar.cpp tupi-0.2+git05/src/framework/tgui/tbuttonbar.cpp
--- tupi-0.2+git04/src/framework/tgui/tbuttonbar.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tbuttonbar.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,18 +34,6 @@
  ***************************************************************************/
 
 #include "tbuttonbar.h"
-#include "tviewbutton.h"
-#include "toolview.h"
-#include "tdebug.h"
-
-#include <QToolButton>
-#include <QBoxLayout>
-#include <QAction>
-#include <QCheckBox>
-#include <QMenu>
-#include <QMouseEvent>
-
-#include <QtDebug>
 
 TButtonBar::TButtonBar(Qt::ToolBarArea area, QWidget *parent) : QToolBar(parent), m_autoHide(false), m_blockHider(false), m_shouldBeVisible(true)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tbuttonbar.h tupi-0.2+git05/src/framework/tgui/tbuttonbar.h
--- tupi-0.2+git04/src/framework/tgui/tbuttonbar.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tbuttonbar.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,12 +36,20 @@
 #ifndef TBUTTONBAR_H
 #define TBUTTONBAR_H
 
-#include "tideality.h"
+#include "tglobal.h"
+#include "tviewbutton.h"
+#include "toolview.h"
 
 #include <QToolBar>
 #include <QButtonGroup>
 #include <QMap>
 #include <QTimer>
+#include <QToolButton>
+#include <QBoxLayout>
+#include <QAction>
+#include <QCheckBox>
+#include <QMenu>
+#include <QMouseEvent>
 
 class TViewButton;
 class ToolView;
@@ -52,7 +60,7 @@
  * @author David Cuadrado
 */
 
-class T_IDEAL_EXPORT TButtonBar : public QToolBar
+class T_GUI_EXPORT TButtonBar : public QToolBar
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tcellview.cpp tupi-0.2+git05/src/framework/tgui/tcellview.cpp
--- tupi-0.2+git04/src/framework/tgui/tcellview.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcellview.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,15 +34,6 @@
  ***************************************************************************/
 
 #include "tcellview.h"
-#include "tdebug.h"
-
-#include <QPainter>
-#include <QPaintEvent>
-#include <QItemSelectionModel>
-#include <QPainterPath>
-#include <QScrollBar>
-#include <QHeaderView>
-#include <QTimer>
 
 ////////// TCellViewItemDelegate ///////////
 
@@ -173,8 +164,11 @@
 
     setItemSize(18, 18);
 
-    horizontalHeader()->setResizeMode(QHeaderView::Custom);
-    verticalHeader()->setResizeMode(QHeaderView::Custom);
+    // horizontalHeader()->setResizeMode(QHeaderView::Custom);
+    // verticalHeader()->setResizeMode(QHeaderView::Custom);
+
+    horizontalHeader()->setSectionResizeMode(QHeaderView::Custom);
+    verticalHeader()->setSectionResizeMode(QHeaderView::Custom);
 }
 
 void TCellView::setItemSize(int w, int h)
@@ -226,7 +220,7 @@
     }
 
     m_countColor++;
-    setItem(m_row-1 , m_col , item);
+    setItem(m_row-1, m_col, item);
 
     fixSize();
 }
@@ -250,7 +244,13 @@
 void TCellView::wheelEvent(QWheelEvent *event)
 {
     if (event->modifiers() == Qt::ControlModifier) {
-        SHOW_VAR(event->delta());
+        #ifdef K_DEBUG
+            #ifdef Q_OS_WIN32
+                qDebug() << "[TCellView::wheelEvent()] - event->delta(): " << event->delta();
+            #else
+                SHOW_VAR(event->delta());
+            #endif
+        #endif
     } else {
         QTableWidget::wheelEvent(event);
     }
diff -Nru tupi-0.2+git04/src/framework/tgui/tcellview.h tupi-0.2+git05/src/framework/tgui/tcellview.h
--- tupi-0.2+git04/src/framework/tgui/tcellview.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcellview.h	2014-12-15 14:21:33.000000000 +0000
@@ -40,6 +40,13 @@
 
 #include <QTableWidget>
 #include <QStyleOptionViewItem>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QItemSelectionModel>
+#include <QPainterPath>
+#include <QScrollBar>
+#include <QHeaderView>
+#include <QTimer>
 
 class TCellViewItemDelegate;
 
@@ -48,7 +55,7 @@
  * @brief Include this file if you need the class TCellView, TCellViewItem, TCellViewItemDelegate or TCellViewModel
  */
 
-class TCellViewItem : public QTableWidgetItem
+class T_GUI_EXPORT TCellViewItem : public QTableWidgetItem
 {
     public:
         TCellViewItem();
@@ -61,7 +68,7 @@
 /**
  * @author David Cuadrado
  */
-class TCellView : public QTableWidget
+class T_GUI_EXPORT TCellView : public QTableWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tcirclebuttonbar.cpp tupi-0.2+git05/src/framework/tgui/tcirclebuttonbar.cpp
--- tupi-0.2+git04/src/framework/tgui/tcirclebuttonbar.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcirclebuttonbar.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,8 +35,6 @@
 
 #include "tcirclebuttonbar.h"
 
-#include <QApplication>
-
 TCircleButtonBar::TCircleButtonBar(int radio, QWidget *parent) : QFrame(parent), m_radio(radio), m_buttonCount(0), m_offset(30)
 {    
     m_layout = new QBoxLayout(QBoxLayout::LeftToRight, this);
diff -Nru tupi-0.2+git04/src/framework/tgui/tcirclebuttonbar.h tupi-0.2+git05/src/framework/tgui/tcirclebuttonbar.h
--- tupi-0.2+git04/src/framework/tgui/tcirclebuttonbar.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcirclebuttonbar.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,14 +33,18 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef CCBAR_H
-#define CCBAR_H
+#ifndef TCIRCLEBUTTONBAR_H
+#define TCIRCLEBUTTONBAR_H
 
 /**
  * @file tcirclebuttonbar.h
  * Include this file if you need the class TCircleButtonBar
  */
 
+#include "tcirclebutton.h"
+#include "tglobal.h"
+
+#include <QApplication>
 #include <QFrame>
 #include <QPixmap>
 #include <QPolygon>
@@ -50,9 +54,6 @@
 #include <QPainterPath>
 #include <QImage>
 
-#include "tcirclebutton.h"
-#include "tglobal.h"
-
 class QPainterPath;
 
 /**
diff -Nru tupi-0.2+git04/src/framework/tgui/tcirclebutton.cpp tupi-0.2+git05/src/framework/tgui/tcirclebutton.cpp
--- tupi-0.2+git04/src/framework/tgui/tcirclebutton.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcirclebutton.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,18 +35,6 @@
 
 #include "tcirclebutton.h"
 
-#include <QPainter>
-#include <QRegion>
-#include <QRect>
-#include <QPaintEvent>
-#include <QDebug>
-#include <QMoveEvent>
-#include <QApplication>
-#include <QBitmap>
-#include <QPainterPath>
-#include <QTimer>
-#include <QPaintEngine>
-
 static const char * new_xpm[] = {
 "12 16 6 1",
 "     c #040404",
diff -Nru tupi-0.2+git04/src/framework/tgui/tcirclebutton.h tupi-0.2+git05/src/framework/tgui/tcirclebutton.h
--- tupi-0.2+git04/src/framework/tgui/tcirclebutton.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcirclebutton.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,8 +33,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef CCBUTTON_H
-#define CCBUTTON_H
+#ifndef TCIRCLEBUTTON_H
+#define TCIRCLEBUTTON_H
 /**
  * @file tcirclebutton.h
  * Include this file if you need the class TCircleButton
@@ -44,6 +44,17 @@
 
 #include <QPushButton>
 #include <QStyleOptionButton>
+#include <QPainter>
+#include <QRegion>
+#include <QRect>
+#include <QPaintEvent>
+#include <QDebug>
+#include <QMoveEvent>
+#include <QApplication>
+#include <QBitmap>
+#include <QPainterPath>
+#include <QTimer>
+#include <QPaintEngine>
 
 /**
  * @short The TCircleButton class provides a circular button
diff -Nru tupi-0.2+git04/src/framework/tgui/tclicklineedit.cpp tupi-0.2+git05/src/framework/tgui/tclicklineedit.cpp
--- tupi-0.2+git04/src/framework/tgui/tclicklineedit.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tclicklineedit.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,8 +35,6 @@
 
 #include "tclicklineedit.h"
 
-#include <QPainter>
-
 struct TClickLineEdit::Private
 {
     QString clickMessage;
@@ -76,9 +74,9 @@
     QLineEdit::setText(txt);
 }
 
-void TClickLineEdit::paintEvent(QPaintEvent *e)
+void TClickLineEdit::paintEvent(QPaintEvent *event)
 {
-    QLineEdit::paintEvent(e);
+    QLineEdit::paintEvent(event);
     
     QPainter p(this);
     if (k->drawClickMsg == true && !hasFocus()) {
@@ -88,24 +86,24 @@
         
         cr.adjust(3, 0, 0 ,0);
         p.drawText(cr, Qt::AlignVCenter, k->clickMessage);
-        p.setPen( tmp );
+        p.setPen(tmp);
     }
 }
 
-void TClickLineEdit::focusInEvent(QFocusEvent *ev)
+void TClickLineEdit::focusInEvent(QFocusEvent *event)
 {
     if (k->drawClickMsg == true) {
         k->drawClickMsg = false;
         repaint();
     }
-    QLineEdit::focusInEvent(ev);
+    QLineEdit::focusInEvent(event);
 }
 
-void TClickLineEdit::focusOutEvent(QFocusEvent *ev)
+void TClickLineEdit::focusOutEvent(QFocusEvent *event)
 {
     if (text().isEmpty()) {
         k->drawClickMsg = true;
         repaint();
     }
-    QLineEdit::focusOutEvent(ev);
+    QLineEdit::focusOutEvent(event);
 }
diff -Nru tupi-0.2+git04/src/framework/tgui/tclicklineedit.h tupi-0.2+git05/src/framework/tgui/tclicklineedit.h
--- tupi-0.2+git04/src/framework/tgui/tclicklineedit.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tclicklineedit.h	2014-12-15 14:21:33.000000000 +0000
@@ -39,6 +39,7 @@
 #include "tglobal.h"
 
 #include <QLineEdit>
+#include <QPainter>
 
 class T_GUI_EXPORT TClickLineEdit : public QLineEdit
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tcollapsiblewidget.cpp tupi-0.2+git05/src/framework/tgui/tcollapsiblewidget.cpp
--- tupi-0.2+git04/src/framework/tgui/tcollapsiblewidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcollapsiblewidget.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,21 +34,6 @@
  ***************************************************************************/
 
 #include "tcollapsiblewidget.h"
-#include "tdebug.h"
-
-#include <QTextDocument>
-#include <QMimeData>
-#include <QPainter>
-#include <QMouseEvent>
-#include <QDragEnterEvent>
-#include <QVBoxLayout>
-#include <QApplication>
-#include <QGridLayout>
-#include <QPushButton>
-#include <QPainterPath>
-#include <QStyleOption>
-#include <QGroupBox>
-#include <QFontMetrics>
 
 /******************************************************************
  * Helper classes
diff -Nru tupi-0.2+git04/src/framework/tgui/tcollapsiblewidget.h tupi-0.2+git05/src/framework/tgui/tcollapsiblewidget.h
--- tupi-0.2+git04/src/framework/tgui/tcollapsiblewidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcollapsiblewidget.h	2014-12-15 14:21:33.000000000 +0000
@@ -40,7 +40,20 @@
 
 #include <QScrollArea>
 #include <QLabel>
-#include <QDebug>
+#include <QTextDocument>
+#include <QMimeData>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QDragEnterEvent>
+#include <QVBoxLayout>
+#include <QApplication>
+#include <QGridLayout>
+#include <QPushButton>
+#include <QPainterPath>
+#include <QStyleOption>
+#include <QGroupBox>
+#include <QFontMetrics>
+#include <QDrag>
 
 class QScrollArea;
 class QTextDocument;
diff -Nru tupi-0.2+git04/src/framework/tgui/tcolorbutton.cpp tupi-0.2+git05/src/framework/tgui/tcolorbutton.cpp
--- tupi-0.2+git04/src/framework/tgui/tcolorbutton.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcolorbutton.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,23 +35,6 @@
 
 #include "tcolorbutton.h"
 
-#include <QColorDialog>
-#include <QPalette>
-#include <QCursor>
-#include <QLabel>
-#include <QPainter>
-#include <QApplication>
-#include <QDrag>
-#include <QStyle>
-#include <QStyleOptionButton>
-
-#include <QPixmap>
-#include <QDragLeaveEvent>
-#include <QDragMoveEvent>
-#include <QDropEvent>
-#include <QDragEnterEvent>
-#include <QMouseEvent>
-
 TColorButton::TColorButton(QWidget* parent) : QAbstractButton(parent)
 {
     setMinimumSize(minimumSizeHint());
diff -Nru tupi-0.2+git04/src/framework/tgui/tcolorbutton.h tupi-0.2+git05/src/framework/tgui/tcolorbutton.h
--- tupi-0.2+git04/src/framework/tgui/tcolorbutton.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcolorbutton.h	2014-12-15 14:21:33.000000000 +0000
@@ -44,6 +44,18 @@
 #include <QDragLeaveEvent>
 #include <QDragMoveEvent>
 #include <QDropEvent>
+#include <QColorDialog>
+#include <QPalette>
+#include <QCursor>
+#include <QLabel>
+#include <QPainter>
+#include <QApplication>
+#include <QDrag>
+#include <QStyle>
+#include <QStyleOptionButton>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QMimeData>
 
 class QColor;
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tcommandhistory.cpp tupi-0.2+git05/src/framework/tgui/tcommandhistory.cpp
--- tupi-0.2+git04/src/framework/tgui/tcommandhistory.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcommandhistory.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "tcommandhistory.h"
-#include "tdebug.h"
-
-#include <QUndoStack>
-#include <QMenu>
 
 TCommandHistory::TCommandHistory(QUndoStack *stack, QObject *parent) 
     : QObject(parent), m_stack(stack), m_currentIndex(0), m_isLastRedo(false)
@@ -93,19 +89,22 @@
 
 void TCommandHistory::updateFromIndex(int idx)
 {
-    qDebug("*** TCommandHistory::updateFromIndex");
-    
-    tfDebug << idx << " == " << m_stack->count() << " == " << m_currentIndex;
-    tDebug() << m_stack->text(idx-1);
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << idx << " == " << m_stack->count() << " == " << m_currentIndex;
+            qDebug() << m_stack->text(idx-1);
+        #else
+            tDebug() << idx << " == " << m_stack->count() << " == " << m_currentIndex;
+            tDebug() << m_stack->text(idx-1);
+        #endif
+    #endif
     
     if (idx > m_stack->count()) {
-        qDebug("*** Exiting...");
         m_stack->setIndex(m_stack->count());
         return;
     }
     
     if (idx == m_stack->count()  && !m_isLastRedo) { // Added
-
         QAction *a = m_undoMenu->addAction(m_stack->text(idx-1));
         a->setData(idx);
         a->setText(QString::number(idx)+": "+m_stack->text(idx-1));
@@ -117,33 +116,44 @@
         m_undoMenu->setActiveAction(a);
         
         m_redoMenu->clear();
-
     } else if (idx > m_currentIndex) {
                // redo clicked
-               qDebug("REDO");
-               tDebug() << idx << " " << m_currentIndex;
+               // qDebug("REDO");
+               // tDebug() << idx << " " << m_currentIndex;
         
                if (m_actions.contains(idx)) {
                    m_redoMenu->removeAction(m_actions[idx]);
                    m_undoMenu->addAction(m_actions[idx]);
                    m_undoMenu->menuAction()->setEnabled(true);
                } else {
-                   tError() << "Error!";
+                   #ifdef K_DEBUG
+                       QString msg = "TCommandHistory::updateFromIndex() - Error: invalid id " + QString::number(idx);
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
+                   #endif
                }
     } else if (idx < m_currentIndex) {
-
                // Undo clicked
-               qDebug("UNDO");
-               tDebug() << idx << " " << m_currentIndex;
+               // qDebug("UNDO");
+               // tDebug() << idx << " " << m_currentIndex;
         
                if (m_actions.contains(idx-1)) {
                    m_undoMenu->removeAction(m_actions[idx-1]);
                    m_redoMenu->addAction(m_actions[idx-1]);
                    m_redoMenu->menuAction()->setEnabled(true);
                } else {
-                   tError() << "Error!";
+                   #ifdef K_DEBUG
+                       QString msg = "TCommandHistory::updateFromIndex() - Error: invalid id " + QString::number(idx);
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
+                   #endif
                }
-
     }
     
     m_currentIndex = m_stack->index();
@@ -156,7 +166,14 @@
 
     for (int i = qMin(idx, m_currentIndex); i < qMax(idx, m_currentIndex); i++) {
         if (!m_stack->canUndo()) {
-            tError() << "Cannot undo!!!";
+            #ifdef K_DEBUG
+                QString msg = "TCommandHistory::undoFromAction() - Error: Cannot undo!!!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
             break;
         }
         
@@ -166,7 +183,14 @@
             m_undoMenu->removeAction(m_actions[i]);
             m_redoMenu->addAction(m_actions[i]);
         } else {
-            qDebug("History item not found!");
+            #ifdef K_DEBUG
+                QString msg = "TCommandHistory::undoFromAction() - Error: History item not found!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
         }
     }
     
@@ -188,9 +212,25 @@
     
     m_stack->blockSignals(true);
     for (int i = qMax(idx, m_currentIndex)-1; i >= qMin(idx, m_currentIndex)-1; i--) {
-         SHOW_VAR(i);
+         #ifdef K_DEBUG
+             QString msg = "TupCommandExecutor::createItem() - Error: Invalid scene index!";
+             #ifdef Q_OS_WIN32
+                 qDebug() << "SHOW_VAR: " << i;
+             #else
+                 SHOW_VAR(i);
+             #endif
+          #endif
+
          if (!m_stack->canRedo()) {
-             tError() << "Cannot redo!!!";
+             #ifdef K_DEBUG
+                 QString msg = "TCommandHistory::redoFromAction() - Error: Cannot redo!!!";
+                 #ifdef Q_OS_WIN32
+                     qDebug() << msg;
+                 #else
+                     tError() << msg;
+                 #endif
+             #endif
+
              break;
          }
         
@@ -200,7 +240,14 @@
              m_redoMenu->removeAction(m_actions[i]);
              m_undoMenu->addAction(m_actions[i]);
          } else {
-             qDebug("ERROR REDO");
+             #ifdef K_DEBUG
+                 QString msg = "TCommandHistory::redoFromAction() - Error while doing REDO";
+                 #ifdef Q_OS_WIN32
+                     qDebug() << msg;
+                 #else
+                     tError() << msg;
+                 #endif
+             #endif
         }
     }
     
@@ -220,13 +267,27 @@
 
 void TCommandHistory::enableRedoMenu(bool e)
 {
-    T_FUNCINFO;
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TCommandHistory::enableRedoMenu()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
     m_redoMenu->menuAction()->setEnabled(e);
 }
 
 void TCommandHistory::enableUndoMenu(bool e)
 {
-    T_FUNCINFO;
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TCommandHistory::enableUndoMenu()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
     m_undoMenu->menuAction()->setEnabled(e);
 }
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tcommandhistory.h tupi-0.2+git05/src/framework/tgui/tcommandhistory.h
--- tupi-0.2+git04/src/framework/tgui/tcommandhistory.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcommandhistory.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,8 +36,12 @@
 #ifndef TCOMMANDHISTORY_H
 #define TCOMMANDHISTORY_H
 
+#include "tglobal.h"
+
 #include <QObject>
 #include <QHash>
+#include <QUndoStack>
+#include <QMenu>
 
 class QUndoStack;
 class QMenu;
@@ -47,7 +51,7 @@
  * @author David Cuadrado
 */
 
-class TCommandHistory : public QObject
+class T_GUI_EXPORT TCommandHistory : public QObject
 {
     Q_OBJECT
     
diff -Nru tupi-0.2+git04/src/framework/tgui/tconfigurationdialog.cpp tupi-0.2+git05/src/framework/tgui/tconfigurationdialog.cpp
--- tupi-0.2+git04/src/framework/tgui/tconfigurationdialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tconfigurationdialog.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,17 +34,6 @@
  ***************************************************************************/
 
 #include "tconfigurationdialog.h"
-#include "tseparator.h"
-#include "tdebug.h"
-
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QStackedWidget>
-#include <QLabel>
-#include <QHeaderView>
-#include <QDialogButtonBox>
-#include <QListWidget>
 
 ////////////////
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tconfigurationdialog.h tupi-0.2+git05/src/framework/tgui/tconfigurationdialog.h
--- tupi-0.2+git04/src/framework/tgui/tconfigurationdialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tconfigurationdialog.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,14 +36,22 @@
 #ifndef TCONFIGURATIONDIALOG_H
 #define TCONFIGURATIONDIALOG_H
 
-#include <QDialog>
-#include <QMap>
-#include <QButtonGroup>
-
+#include "tglobal.h"
 #include "twidgetlistview.h"
 #include "tflatbutton.h"
+#include "tseparator.h"
 
-#include "tglobal.h"
+#include <QDialog>
+#include <QMap>
+#include <QButtonGroup>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QStackedWidget>
+#include <QLabel>
+#include <QHeaderView>
+#include <QDialogButtonBox>
+#include <QListWidget>
 
 class QStackedWidget;
 class QListWidget;
diff -Nru tupi-0.2+git04/src/framework/tgui/tcontrolnode.cpp tupi-0.2+git05/src/framework/tgui/tcontrolnode.cpp
--- tupi-0.2+git04/src/framework/tgui/tcontrolnode.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcontrolnode.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,17 +35,6 @@
 
 #include "tcontrolnode.h"
 #include "tnodegroup.h"
-#include "tdebug.h"
-
-#include <QCursor>
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#include <QStyleOption>
-#include <QStyleOptionButton>
-#include <QApplication>
-#include <QCursor>
-#include <QGraphicsPathItem>
 
 struct TControlNode::Private
 {
@@ -61,7 +50,8 @@
 
 TControlNode::TControlNode(int index, TNodeGroup *nodeGroup, const QPointF & pos, 
                            QGraphicsItem *graphicParent, QGraphicsScene *scene, int level) : 
-                           QGraphicsItem(0, scene), k(new Private)
+                           QGraphicsItem(), k(new Private)
+                           // QGraphicsItem(0, scene), k(new Private)
 {
     k->index  = index;
     k->graphicParent = 0;
@@ -78,13 +68,6 @@
     setFlag(ItemSendsGeometryChanges, true);
     setPos(pos);
 
-    /*
-    if (level > 0)
-        setZValue(level + 1);
-    else
-        setZValue(graphicParent->zValue() + 1);
-    */
-
     setZValue(level);
     setGraphicParent(graphicParent);
 }
@@ -102,15 +85,16 @@
     // bool antialiasing = painter->renderHints() & QPainter::Antialiasing;
     // painter->setRenderHint(QPainter::Antialiasing, antialiasing);
 
-    QColor c;
+    QColor color;
 
     if (k->centralNode) {
-        c = QColor("white");
+        color = QColor("white");
     } else {
-        c = QColor(55, 155, 55);
+        color = QColor(55, 155, 55);
+        color.setAlpha(200);
     }
 
-    painter->setBrush(c);
+    painter->setBrush(color);
     paintLinesToChildNodes(painter);
     painter->drawRoundRect(boundingRect());
 }
@@ -138,17 +122,17 @@
 
 QRectF TControlNode::boundingRect() const
 {
-    QSizeF size(8, 8);
+    QSizeF size(10, 10);
     QRectF rect(QPointF(-size.width()/2, -size.height()/2), size);
 
     if (k->rightNode) {
         if (k->rightNode->isVisible())
-            rect.unite(k->rightNode->boundingRect());
+            rect.united(k->rightNode->boundingRect());
     }
 
     if (k->leftNode) {
         if (k->leftNode->isVisible())
-           rect.unite(k->leftNode->boundingRect());
+           rect.united(k->leftNode->boundingRect());
     }
 
     return rect;
@@ -202,7 +186,6 @@
 void TControlNode::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (k->centralNode) {
-
         setSelected(true);
         k->centralNode->setSelected(true);
 
@@ -234,7 +217,11 @@
 void TControlNode::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TControlNode::mouseReleaseEvent()]";
+        #else
            T_FUNCINFO;
+        #endif
     #endif
 
     Q_UNUSED(event);
@@ -340,3 +327,9 @@
 {
     k->unchanged = unchanged;
 }
+
+void TControlNode::resize(qreal factor)
+{
+    setScale(factor);
+}
+
diff -Nru tupi-0.2+git04/src/framework/tgui/tcontrolnode.h tupi-0.2+git05/src/framework/tgui/tcontrolnode.h
--- tupi-0.2+git04/src/framework/tgui/tcontrolnode.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tcontrolnode.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,13 +33,23 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef CONTROLNODE_H
-#define CONTROLNODE_H
+#ifndef TCONTROLNODE_H
+#define TCONTROLNODE_H
 
+#include "tglobal.h"
+
+#include <QCursor>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QStyleOption>
+#include <QStyleOptionButton>
+#include <QApplication>
+#include <QCursor>
+#include <QGraphicsPathItem>
 #include <QGraphicsItem>
 #include <QObject>
 #include <QPointF>
-#include <QGraphicsScene>
 
 /**
  * @author Jorge Cuadrado
@@ -47,15 +57,10 @@
 
 class TNodeGroup;
 
-// class TControlNode : public QObject, public QGraphicsItem
-class TControlNode : public QGraphicsItem
+class T_GUI_EXPORT TControlNode : public QGraphicsItem
 {
-    // Q_OBJECT
-    
     public:
-
         enum State { Pressed = 1, Released };
-        
         TControlNode(int index, TNodeGroup *nodeGroup, const QPointF & pos = QPoint(0,0),  
                      QGraphicsItem * parent = 0, QGraphicsScene * scene = 0, int level = 0);
         
@@ -79,6 +84,7 @@
         TControlNode *centralNode();
         
         void hasChanged(bool notChange);
+        void resize(qreal factor);
         
     protected:
         QVariant itemChange(GraphicsItemChange change, const QVariant &value);
diff -Nru tupi-0.2+git04/src/framework/tgui/tdoublecombobox.cpp tupi-0.2+git05/src/framework/tgui/tdoublecombobox.cpp
--- tupi-0.2+git04/src/framework/tgui/tdoublecombobox.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tdoublecombobox.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,11 +35,6 @@
 
 #include "tdoublecombobox.h"
 
-#include <QDoubleValidator>
-#include <QLineEdit>
-
-#include <cmath>
-
 #define PERCENT(v) (v * 100.0) / maximum()
 #define VALUE(p) (p * maximum()) / 100.0
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tdoublecombobox.h tupi-0.2+git05/src/framework/tgui/tdoublecombobox.h
--- tupi-0.2+git04/src/framework/tgui/tdoublecombobox.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tdoublecombobox.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,15 +36,20 @@
 #ifndef TDOUBLECOMBOBOX_H
 #define TDOUBLECOMBOBOX_H
 
+#include "tglobal.h"
+
 #include <QComboBox>
+#include <QDoubleValidator>
+#include <QLineEdit>
+#include <cmath>
 
 /**
  * @author David Cuadrado
 */
 
-class TDoubleComboBox : public QComboBox
+class T_GUI_EXPORT TDoubleComboBox : public QComboBox
 {
-    Q_OBJECT;
+    Q_OBJECT
     
     public:
         TDoubleComboBox(double min, double max, QWidget *parent = 0);
diff -Nru tupi-0.2+git04/src/framework/tgui/tdualcolorbutton.cpp tupi-0.2+git05/src/framework/tgui/tdualcolorbutton.cpp
--- tupi-0.2+git04/src/framework/tgui/tdualcolorbutton.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tdualcolorbutton.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,21 +34,10 @@
  ***************************************************************************/
 
 #include "tdualcolorbutton.h"
-#include "tdebug.h"
 
 #include "tcolorarrow.xpm"
 #include "tcolorreset.xpm"
 
-#include <qdrawutil.h>
-#include <QPainter>
-#include <QBitmap>
-#include <QDragEnterEvent>
-#include <QPixmap>
-#include <QMouseEvent>
-#include <QPaintEvent>
-#include <QDropEvent>
-#include <QApplication>
-
 struct TDualColorButton::Private
 {
     QPixmap arrowBitmap;
@@ -183,11 +172,11 @@
 
     if (fgRect.contains(mPos)) {
         k->currentSpace = Foreground;
-        tFatal() << "TDualColorButton::mousePressEvent() - emitting foreground signal!";
+        // tFatal() << "TDualColorButton::mousePressEvent() - emitting foreground signal!";
         emit selectionChanged(Foreground);
     } else if (bgRect.contains(mPos)) {
                k->currentSpace = Background;
-               tFatal() << "TDualColorButton::mousePressEvent() - emitting background signal!";
+               // tFatal() << "TDualColorButton::mousePressEvent() - emitting background signal!";
                emit selectionChanged(Background);
     } else if (event->pos().x() > fgRect.width()) {
                // We handle the swap and reset controls as soon as the mouse is
diff -Nru tupi-0.2+git04/src/framework/tgui/tdualcolorbutton.h tupi-0.2+git05/src/framework/tgui/tdualcolorbutton.h
--- tupi-0.2+git04/src/framework/tgui/tdualcolorbutton.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tdualcolorbutton.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,9 @@
 #ifndef TDUALCOLORBUTTON_H
 #define TDUALCOLORBUTTON_H
 
-class QBitmap;
+#include "tglobal.h"
+
+// class QBitmap;
 
 #include <QMouseEvent>
 #include <QDragEnterEvent>
@@ -45,8 +47,10 @@
 #include <QDropEvent>
 #include <QBrush>
 #include <QWidget>
-
-#include "tglobal.h"
+#include <qdrawutil.h>
+#include <QPainter>
+#include <QBitmap>
+#include <QApplication>
 
 /**
  * @note This class was adapted to Tupi by David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tgui/teditspinbox.cpp tupi-0.2+git05/src/framework/tgui/teditspinbox.cpp
--- tupi-0.2+git04/src/framework/tgui/teditspinbox.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/teditspinbox.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,8 +35,6 @@
 
 #include "teditspinbox.h"
 
-#include <QHBoxLayout>
-
 TEditSpinBox::TEditSpinBox(int value, int minValue, int maxValue, int step, QString text, QWidget *parent, const char *name) :QGroupBox(parent)
 {
     setObjectName(name);
diff -Nru tupi-0.2+git04/src/framework/tgui/teditspinbox.h tupi-0.2+git05/src/framework/tgui/teditspinbox.h
--- tupi-0.2+git04/src/framework/tgui/teditspinbox.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/teditspinbox.h	2014-12-15 14:21:33.000000000 +0000
@@ -38,6 +38,7 @@
 
 #include "tglobal.h"
 
+#include <QHBoxLayout>
 #include <QGroupBox>
 #include <QSpinBox>
 #include <QSlider>
diff -Nru tupi-0.2+git04/src/framework/tgui/tflatbutton.cpp tupi-0.2+git05/src/framework/tgui/tflatbutton.cpp
--- tupi-0.2+git04/src/framework/tgui/tflatbutton.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tflatbutton.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tflatbutton.h"
-#include <QPainter>
 
 TFlatButton::TFlatButton(QWidget *parent) : QAbstractButton(parent)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tflatbutton.h tupi-0.2+git05/src/framework/tgui/tflatbutton.h
--- tupi-0.2+git04/src/framework/tgui/tflatbutton.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tflatbutton.h	2014-12-15 14:21:33.000000000 +0000
@@ -38,6 +38,7 @@
 
 #include "tglobal.h"
 #include <QAbstractButton>
+#include <QPainter>
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tgui/tfontchooser.cpp tupi-0.2+git05/src/framework/tgui/tfontchooser.cpp
--- tupi-0.2+git04/src/framework/tgui/tfontchooser.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tfontchooser.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,13 +34,6 @@
  ***************************************************************************/
 
 #include "tfontchooser.h"
-#include "tformfactory.h"
-#include "tdebug.h"
-
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QFontDatabase>
-#include <QFontComboBox>
 
 TFontChooser::TFontChooser(QWidget *parent) : QFrame(parent)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tfontchooser.h tupi-0.2+git05/src/framework/tgui/tfontchooser.h
--- tupi-0.2+git04/src/framework/tgui/tfontchooser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tfontchooser.h	2014-12-15 14:21:33.000000000 +0000
@@ -37,7 +37,13 @@
 #define TFONTCHOOSER_H
 
 #include "tglobal.h"
+#include "tformfactory.h"
+
 #include <QFrame>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QFontDatabase>
+#include <QFontComboBox>
 
 class QComboBox;
 class QFontComboBox;
diff -Nru tupi-0.2+git04/src/framework/tgui/tformfactory.cpp tupi-0.2+git05/src/framework/tgui/tformfactory.cpp
--- tupi-0.2+git04/src/framework/tgui/tformfactory.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tformfactory.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,12 +35,6 @@
 
 #include "tformfactory.h"
 
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGridLayout>
-
-#include <QLabel>
-
 TFormFactory::TFormFactory()
 {
 }
diff -Nru tupi-0.2+git04/src/framework/tgui/tformfactory.h tupi-0.2+git05/src/framework/tgui/tformfactory.h
--- tupi-0.2+git04/src/framework/tgui/tformfactory.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tformfactory.h	2014-12-15 14:21:33.000000000 +0000
@@ -37,11 +37,17 @@
 #define TFORMFACTORY_H
 
 #include "tglobal.h"
+
 #include <QWidget>
 #include <QStringList>
+#include <QBoxLayout>
+// #include <QVBoxLayout>
+// #include <QHBoxLayout>
+#include <QGridLayout>
+#include <QLabel>
 
-class QBoxLayout;
-class QGridLayout;
+// class QBoxLayout;
+// class QGridLayout;
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tgui/tformvalidator.cpp tupi-0.2+git05/src/framework/tgui/tformvalidator.cpp
--- tupi-0.2+git04/src/framework/tgui/tformvalidator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tformvalidator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,15 +34,6 @@
  ***************************************************************************/
 
 #include "tformvalidator.h"
-#include "tdebug.h"
-
-#include <QLineEdit>
-#include <QIntValidator>
-#include <QDoubleValidator>
-#include <QRegExpValidator>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
-#include <QtDebug>
 
 TFormValidator::TFormValidator(QWidget *form) : m_parent(form)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tformvalidator.h tupi-0.2+git05/src/framework/tgui/tformvalidator.h
--- tupi-0.2+git04/src/framework/tgui/tformvalidator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tformvalidator.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,11 +33,20 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef TVALIDATES_H
-#define TVALIDATES_H
+#ifndef TFORMVALIDATOR_H
+#define TFORMVALIDATOR_H
+
+#include "tglobal.h"
 
 #include <QWidget>
-class QLineEdit;
+#include <QLineEdit>
+#include <QIntValidator>
+#include <QDoubleValidator>
+#include <QRegExpValidator>
+#include <QSpinBox>
+#include <QDoubleSpinBox>
+
+// class QLineEdit;
 
 #define K_GIVE_NAME(obj) obj->setObjectName(#obj);
 
@@ -45,7 +54,7 @@
  * @author David Cuadrado
 */
 
-class TFormValidator
+class T_GUI_EXPORT TFormValidator
 {
     public:
         TFormValidator(QWidget *form);
diff -Nru tupi-0.2+git04/src/framework/tgui/tgui.pro tupi-0.2+git05/src/framework/tgui/tgui.pro
--- tupi-0.2+git04/src/framework/tgui/tgui.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tgui.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,10 +1,13 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/framework/tgui
-# Target is a library: tupifwgui 
+QT += opengl core gui svg xml network
 
-!include(../tupconfig.pri) {
-    error("Run ./configure first!")
+unix {
+    !include(../tupconfig.pri) {
+        error("Run ./configure first!")
+    }
+}
+
+win32 {
+    include(../../../win.pri)
 }
 
 INSTALLS += target
@@ -42,7 +45,7 @@
            tformfactory.h \
            tformvalidator.h \
            ticon.h \
-           tideality.h \
+           # tideality.h \
            timagebutton.h \
            titemselector.h \
            tmainwindow.h \
@@ -72,7 +75,7 @@
            treewidgetsearchline.h \
            tvhbox.h \
            tviewbutton.h \
-           twaitstyle.h \
+           # twaitstyle.h \
            twidgetlistview.h \
            twizard.h \
            tworkspacemainwindow.h \
@@ -129,7 +132,7 @@
            treewidgetsearchline.cpp \
            tvhbox.cpp \
            tviewbutton.cpp \
-           twaitstyle.cpp \
+           # twaitstyle.cpp \
            twidgetlistview.cpp \
            twizard.cpp \
            tworkspacemainwindow.cpp \
@@ -147,14 +150,21 @@
 
 RESOURCES += tgui_images.qrc
 
-linux-g{
+linux-g {
     TARGETDEPS += ../tcore/libtupifwcore.so
 }
 
-# include(../../../tupiglobal.pri)
-
-LIBS += -L../tcore -ltupifwcore
+unix {
+    LIBS += -L../tcore -ltupifwcore
+    # INCLUDEPATH += ../tcore ../ ../../libbase
+    INCLUDEPATH += ../tcore
+}
 
-macx {
-    LIBS += -lavcodec -lavformat -lavutil 
+win32 {
+    LIBS += -L..\tcore\release\ -ltupifwcore
+    INCLUDEPATH += ..\tcore
 }
+
+# macx {
+#    LIBS += -lavcodec -lavformat -lavutil 
+# }
diff -Nru tupi-0.2+git04/src/framework/tgui/themedocument.h tupi-0.2+git05/src/framework/tgui/themedocument.h
--- tupi-0.2+git04/src/framework/tgui/themedocument.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/themedocument.h	2014-12-15 14:21:33.000000000 +0000
@@ -40,7 +40,7 @@
 
 #include <QMap>
 #include <QStringList>
-#include <qdom.h>
+#include <QDomDocument>
 
 typedef QMap<QString, QString> ThemeKey;
 
diff -Nru tupi-0.2+git04/src/framework/tgui/thememanager.cpp tupi-0.2+git05/src/framework/tgui/thememanager.cpp
--- tupi-0.2+git04/src/framework/tgui/thememanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/thememanager.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,13 +34,8 @@
  ***************************************************************************/
 
 #include "thememanager.h"
-#include "themedocument.h"
-#include "tdebug.h"
-#include "tglobal.h"
 #include "tapplication.h"
 
-#include <QApplication>
-
 ThemeManager::ThemeManager() : QXmlDefaultHandler()
 {
     m_palette = QApplication::palette();
@@ -63,8 +58,14 @@
         ok = true;
     } else {
         #ifdef K_DEBUG
-               tError() << "ThemeManager::applyTheme() - Fatal Error: Can't process the theme file: " << file;
+            QString msg = "ThemeManager::applyTheme() - Fatal Error: Can't process the theme file: " + file;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         ok = false;
     }
     
@@ -86,8 +87,14 @@
         ok = true;
     } else {
         #ifdef K_DEBUG
-               tError() << "ThemeManager::applyTheme() - Fatal Error: Can't process theme document";
+            QString msg = "ThemeManager::applyTheme() - Fatal Error: Can't process theme document";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         ok = false;
     }
     
@@ -185,10 +192,16 @@
 bool ThemeManager::error(const QXmlParseException &exception)
 {
     #ifdef K_DEBUG
-           tError() << "ThemeManager::error() - Fatal Error: Can't process theme!";
-           tError() << "ThemeManager::error() - Message: " << exception.message();
+        QString msg = "ThemeManager::error() - Fatal Error: Can't process theme!";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+            qDebug() << "ThemeManager::error() - Message: " << exception.message();
+        #else
+            tError() << msg;
+            tError() << "ThemeManager::error() - Message: " << exception.message();
+        #endif
     #else
-           Q_UNUSED(exception);
+        Q_UNUSED(exception);
     #endif
 
     return false;
@@ -197,9 +210,18 @@
 bool ThemeManager::fatalError(const QXmlParseException &exception)
 {
     #ifdef K_DEBUG
-           tError() << "ThemeManager::error() - Fatal Error: Can't load theme...";
-           tError() << "ThemeManager::error() - Line: " << exception.lineNumber() << " Column: " << exception.columnNumber();
-           tError() << "ThemeManager::error() - Message: " << exception.message();
+        QString msg1 = "ThemeManager::error() - Fatal Error: Can't load theme...";
+        QString msg2 = "ThemeManager::error() - Line: " + QString::number(exception.lineNumber()) + " Column: " + QString::number(exception.columnNumber());
+        QString msg3 = "ThemeManager::error() - Message: " + exception.message();
+        #ifdef Q_OS_WIN32
+            qDebug() << msg1;
+            qDebug() << msg2;
+            qDebug() << msg3;
+        #else
+            tError() << msg1;
+            tError() << msg2;
+            tError() << msg3;
+        #endif
     #else
            Q_UNUSED(exception);
     #endif
diff -Nru tupi-0.2+git04/src/framework/tgui/thememanager.h tupi-0.2+git05/src/framework/tgui/thememanager.h
--- tupi-0.2+git04/src/framework/tgui/thememanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/thememanager.h	2014-12-15 14:21:33.000000000 +0000
@@ -37,11 +37,13 @@
 #define THEMEMANAGER_H
 
 #include "tglobal.h"
+#include "themedocument.h"
 
 #include <QXmlDefaultHandler>
 #include <QPalette>
+#include <QApplication>
 
-class ThemeDocument;
+// class ThemeDocument;
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tgui/ticon.cpp tupi-0.2+git05/src/framework/tgui/ticon.cpp
--- tupi-0.2+git04/src/framework/tgui/ticon.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/ticon.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "ticon.h"
-#include "tdebug.h"
-
-#include <qdrawutil.h>
-#include <QPainter>
 
 struct TIcon::Private
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/ticon.h tupi-0.2+git05/src/framework/tgui/ticon.h
--- tupi-0.2+git04/src/framework/tgui/ticon.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/ticon.h	2014-12-15 14:21:33.000000000 +0000
@@ -41,6 +41,8 @@
 #include <QIcon>
 #include <QBrush>
 #include <QColor>
+#include <qdrawutil.h>
+#include <QPainter>
 
 class T_GUI_EXPORT TIcon : public QIcon
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tideality.h tupi-0.2+git05/src/framework/tgui/tideality.h
--- tupi-0.2+git04/src/framework/tgui/tideality.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tideality.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TIDEALITY_H
-#define TIDEALTIY_H
-
-#include <qglobal.h>
-
-#if defined(QT_SHARED) || defined(QT_PLUGIN)
-# define T_IDEAL_EXPORT Q_GUI_EXPORT
-#else
-# define T_IDEAL_EXPORT
-#endif
-
-#endif // TIDEALITY_H
diff -Nru tupi-0.2+git04/src/framework/tgui/timagebutton.cpp tupi-0.2+git05/src/framework/tgui/timagebutton.cpp
--- tupi-0.2+git04/src/framework/tgui/timagebutton.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/timagebutton.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,15 +34,6 @@
  ***************************************************************************/
 
 #include "timagebutton.h"
-#include "tdebug.h"
-
-#include <QPainter>
-#include <QPixmap>
-#include <QLayout>
-#include <QBitmap>
-#include <QStyle>
-#include <QStyleOptionButton>
-#include <QStylePainter>
 
 class TImageButton::Animation
 {
@@ -109,12 +100,10 @@
     // setIconSize(QSize(m_imageSize-10,m_imageSize-10));
     
     if (m_isAnimated) {
-
         m_animator->begin();
         m_animator->aBeginning = true;
         if (m_animator->aSize >= m_imageSize + 10)
             m_animator->aSize = m_imageSize;
-
     } else {
         setFlat(false);
     }
@@ -123,12 +112,10 @@
 void TImageButton::leaveEvent(QEvent *)
 {
     if (m_isAnimated && !isDown()) {
-
         m_animator->aBeginning = false;
         m_animator->aSize = m_imageSize;
         m_animator->end();
         setIconSize(QSize(m_imageSize,m_imageSize));
-
     } else {
         setFlat(true);
     }
diff -Nru tupi-0.2+git04/src/framework/tgui/timagebutton.h tupi-0.2+git05/src/framework/tgui/timagebutton.h
--- tupi-0.2+git04/src/framework/tgui/timagebutton.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/timagebutton.h	2014-12-15 14:21:33.000000000 +0000
@@ -43,6 +43,12 @@
 #include <QPixmap>
 #include <QIcon>
 #include <QTimer>
+#include <QPainter>
+#include <QLayout>
+#include <QBitmap>
+#include <QStyle>
+#include <QStyleOptionButton>
+#include <QStylePainter>
 
 /**
  * A image pressable
diff -Nru tupi-0.2+git04/src/framework/tgui/tipdialog.cpp tupi-0.2+git05/src/framework/tgui/tipdialog.cpp
--- tupi-0.2+git04/src/framework/tgui/tipdialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tipdialog.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,20 +34,6 @@
  ***************************************************************************/
 
 #include "tipdialog.h"
-#include "tseparator.h"
-#include "tconfig.h"
-#include "tdebug.h"
-#include "tapplicationproperties.h"
-
-#include <QVBoxLayout>
-#include <QTextBrowser>
-#include <QTextFrame>
-#include <QTextFrameFormat>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QDomDocument>
-#include <QFile>
-#include <QDir>
 
 TipDialog::TipDialog(QStringList &labels, const QString &file, QWidget *parent) : QDialog(parent)
 {
@@ -83,7 +69,12 @@
     textBrowser->setOpenExternalLinks(true);
 
     QStringList path;
-    QString resources = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator();
+#ifdef Q_OS_WIN32
+    QString resources = SHARE_DIR + "help" + QDir::separator();
+#else
+	QString resources = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator();
+#endif	
+
     path << resources + "css";
     path << resources + "images";
     textBrowser->setSearchPaths(path);
diff -Nru tupi-0.2+git04/src/framework/tgui/tipdialog.h tupi-0.2+git05/src/framework/tgui/tipdialog.h
--- tupi-0.2+git04/src/framework/tgui/tipdialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tipdialog.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,15 +33,27 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef TUPIP_H
-#define TUPIP_H
+#ifndef TIPDIALOG_H
+#define TIPDIALOG_H
+
+#include "tglobal.h"
+#include "tipdatabase.h"
+#include "tseparator.h"
+#include "tconfig.h"
+#include "tapplicationproperties.h"
 
 #include <QString>
 #include <QList>
 #include <QDialog>
-
-#include "tglobal.h"
-#include "tipdatabase.h"
+#include <QVBoxLayout>
+#include <QTextBrowser>
+#include <QTextFrame>
+#include <QTextFrameFormat>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QDomDocument>
+#include <QFile>
+#include <QDir>
 
 class QCheckBox;
 class QTextBrowser;
diff -Nru tupi-0.2+git04/src/framework/tgui/titemselector.cpp tupi-0.2+git05/src/framework/tgui/titemselector.cpp
--- tupi-0.2+git04/src/framework/tgui/titemselector.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/titemselector.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -33,14 +33,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#include "tglobal.h"
 #include "titemselector.h"
 
-#include <QListWidget>
-#include <QToolButton>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-
 struct TItemSelector::Private
 {
     QListWidget *available;
diff -Nru tupi-0.2+git04/src/framework/tgui/titemselector.h tupi-0.2+git05/src/framework/tgui/titemselector.h
--- tupi-0.2+git04/src/framework/tgui/titemselector.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/titemselector.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,19 @@
 #ifndef TITEMSELECTOR_H
 #define TITEMSELECTOR_H
 
+#include "tglobal.h"
 #include "tapplicationproperties.h"
+
 #include <QWidget>
+#include <QListWidget>
+#include <QToolButton>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 
 /**
  * @author David Cuadrado
 */
-class TItemSelector : public QWidget
+class T_GUI_EXPORT TItemSelector : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tmainwindowabstractsettings.h tupi-0.2+git05/src/framework/tgui/tmainwindowabstractsettings.h
--- tupi-0.2+git04/src/framework/tgui/tmainwindowabstractsettings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tmainwindowabstractsettings.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef TMAINWINDOWABSTRACTSETTINGS_H
 #define TMAINWINDOWABSTRACTSETTINGS_H
 
-#include "tideality.h"
+#include "tglobal.h"
 #include <QObject>
 
 class ToolView;
@@ -46,7 +46,7 @@
  * @author David Cuadrado
 */
 
-class T_IDEAL_EXPORT TMainWindowAbstractSettings : public QObject
+class T_GUI_EXPORT TMainWindowAbstractSettings : public QObject
 {
     public:
         TMainWindowAbstractSettings(QObject *parent = 0) : QObject(parent) {}
@@ -54,7 +54,6 @@
         
         virtual void save(TMainWindow *w) = 0;
         virtual void restore(TMainWindow *w) = 0;
-        
 };
 
 #endif
diff -Nru tupi-0.2+git04/src/framework/tgui/tmainwindow.cpp tupi-0.2+git05/src/framework/tgui/tmainwindow.cpp
--- tupi-0.2+git04/src/framework/tgui/tmainwindow.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tmainwindow.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,25 +34,8 @@
  ***************************************************************************/
 
 #include "tmainwindow.h"
-#include "tbuttonbar.h"
-#include "toolview.h"
-#include "tviewbutton.h"
-#include "tmainwindowabstractsettings.h"
-#include "tdebug.h"
-
-#include <QTimer>
-#include <QMenu>
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QSettings>
-#include <QApplication>
-#include <QtDebug>
-#include <QHashIterator>
-#include <QMenuBar>
 
-#include <QCloseEvent>
-
-class DefaultSettings : public TMainWindowAbstractSettings
+class T_GUI_EXPORT DefaultSettings : public TMainWindowAbstractSettings
 {
     public:
         DefaultSettings(QObject *parent);
@@ -71,6 +54,15 @@
 
 void DefaultSettings::save(TMainWindow *w)
 {
+    #ifdef K_DEBUG
+            QString msg = "DefaultSettings::save() - Saving UI settings...";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif
+
     QSettings settings(qApp->applicationName(), "ideality", this);
 
     QHash<Qt::ToolBarArea, TButtonBar *> buttonBars = w->buttonBars();
@@ -110,7 +102,12 @@
 void DefaultSettings::restore(TMainWindow *w)
 {
     #ifdef K_DEBUG
-           tFatal() << "Restoring Interface...";
+	    QString msg = "DefaultSettings::restore() - Restoring UI settings...";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
     #endif
 
     QSettings settings(qApp->applicationName(), "ideality", this);
@@ -130,6 +127,7 @@
                       Qt::DockWidgetArea area = Qt::DockWidgetArea(settings.value("area", 0).toInt());
                       w->moveToolView(view, area);
                       view->setFixedSize(settings.value("size").toInt());
+
                       view->button()->setToolButtonStyle(Qt::ToolButtonStyle(settings.value("style", 
                                                          int(view->button()->toolButtonStyle())).toInt()));
                       view->button()->setSensible(settings.value("sensibility", view->button()->isSensible()).toBool());
@@ -293,13 +291,7 @@
 
              while (it != views.end()) {
                     ToolView *v = *it;
-
-                    // SQA: Temporary code while Time Line components are fixed
-                    if (v->getObjectID().compare("ToolView-Time Line")==0)
-                        v->enableButton(false);
-                    else
-                        v->enableButton(flag);
-
+                    v->enableButton(flag);
                     ++it;
              }
     }
@@ -408,8 +400,17 @@
                }
                break;
             default: 
-                 qWarning("toDockWidgetArea: Floating... %d", area); 
-                 break;
+               {
+                   #ifdef K_DEBUG
+                       QString msg = "TMainWindow::toDockWidgetArea() - Floating -> " + QString::number(area);
+                       #ifdef Q_OS_WIN32
+                           qWarning() << msg;
+                       #else
+                           tWarning() << msg;
+                       #endif
+                   #endif
+               }
+               break;
     }
 
     return Qt::LeftDockWidgetArea;
@@ -439,8 +440,17 @@
                }
                break;
             default: 
-                 qWarning("toToolBarArea: Floating... %d", area); 
-                 break;
+               {
+                 #ifdef K_DEBUG
+                     QString msg = "TMainWindow::toToolBarArea() - Floating -> " + QString::number(area);
+                     #ifdef Q_OS_WIN32
+                         qWarning() << msg;
+                     #else
+                         tWarning() << msg;
+                     #endif
+                 #endif
+               }
+               break;
     }
 
     return Qt::LeftToolBarArea;
@@ -551,16 +561,7 @@
                       view->setUpdatesEnabled(false);
 
                       if (view->perspective() & workspace) {
-
-                          // SQA: Temporary code while Library and Time Line components are fixed
-                          if (view->getObjectID().compare("ToolView-Time Line")==0) {
-                              bar->enable(view->button());
-                              view->enableButton(false);
-                          } else {
-                              bar->enable(view->button());
-                          } 
-
-                          // bar->enable(view->button());
+                          bar->enable(view->button());
  
                           if (view->button()->isChecked() && (workspace != 4) && view->getObjectID().compare("ToolView-Help")!=0) {
                               view->show();
diff -Nru tupi-0.2+git04/src/framework/tgui/tmainwindowfactory.cpp tupi-0.2+git05/src/framework/tgui/tmainwindowfactory.cpp
--- tupi-0.2+git04/src/framework/tgui/tmainwindowfactory.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tmainwindowfactory.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -37,16 +37,8 @@
 #include "tabbedmainwindow.h"
 #include "tstackedmainwindow.h"
 #include "tworkspacemainwindow.h"
-#include "tdebug.h"
 
-#include <QDockWidget>
-#include <QToolBar>
-#include <QTabWidget>
-#include <QEvent>
-#include <QApplication>
-#include <QShowEvent>
-
-class EventFilter : public QObject
+class T_GUI_EXPORT EventFilter : public QObject
 {
     public:
         EventFilter(TMainWindow *mw, QObject *parent = 0);
@@ -115,8 +107,14 @@
 
     if (other->inherits("TMainWindow")) {
         #ifdef K_DEBUG
-               tError() << "TMainWindowFactory::create() - Fatal Error: Can't create a TMainWindow!";
+            QString msg = "TMainWindowFactory::create() - Fatal Error: Can't create a TMainWindow!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         return static_cast<TMainWindow *>(other);
     }
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tmainwindowfactory.h tupi-0.2+git05/src/framework/tgui/tmainwindowfactory.h
--- tupi-0.2+git04/src/framework/tgui/tmainwindowfactory.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tmainwindowfactory.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,14 @@
 #ifndef TMAINWINDOWFACTORY_H
 #define TMAINWINDOWFACTORY_H
 
-#include "tideality.h"
+#include "tglobal.h"
+
+#include <QDockWidget>
+#include <QToolBar>
+#include <QTabWidget>
+#include <QEvent>
+#include <QApplication>
+#include <QShowEvent>
 
 class TMainWindow;
 class QMainWindow;
@@ -46,7 +53,7 @@
  * @author David Cuadrado
 */
 
-class T_IDEAL_EXPORT TMainWindowFactory
+class T_GUI_EXPORT TMainWindowFactory
 {
     public:
         TMainWindowFactory();
diff -Nru tupi-0.2+git04/src/framework/tgui/tmainwindow.h tupi-0.2+git05/src/framework/tgui/tmainwindow.h
--- tupi-0.2+git04/src/framework/tgui/tmainwindow.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tmainwindow.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,14 +36,24 @@
 #ifndef TMAINWINDOW_H
 #define TMAINWINDOW_H
 
-#include "tideality.h"
-
-// Project begin: Aug 4 2006
+#include "tglobal.h"
+#include "tbuttonbar.h"
+#include "toolview.h"
+#include "tviewbutton.h"
+#include "tmainwindowabstractsettings.h"
 
 #include <QMainWindow>
 #include <QHash>
 #include <QMap>
 #include <QKeySequence>
+#include <QTimer>
+#include <QMenu>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QSettings>
+#include <QHashIterator>
+#include <QMenuBar>
+#include <QCloseEvent>
 
 class TButtonBar;
 class ToolView;
@@ -54,9 +64,10 @@
  * @author David Cuadrado
 */
 
-class T_IDEAL_EXPORT TMainWindow : public QMainWindow
+class T_GUI_EXPORT TMainWindow : public QMainWindow
 {
-    Q_OBJECT;
+    Q_OBJECT
+
     public:
         enum
          {
diff -Nru tupi-0.2+git04/src/framework/tgui/tmoviegenerator.cpp tupi-0.2+git05/src/framework/tgui/tmoviegenerator.cpp
--- tupi-0.2+git04/src/framework/tgui/tmoviegenerator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tmoviegenerator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,8 @@
  ***************************************************************************/
 
 #include "tmoviegenerator.h"
-#include "tdebug.h"
 
-TMovieGenerator::TMovieGenerator(int width, int height)
-    : QImage(width, height, QImage::Format_RGB32)
+TMovieGenerator::TMovieGenerator(int width, int height) : QImage(width, height, QImage::Format_RGB32)
 {
     reset();
 }
diff -Nru tupi-0.2+git04/src/framework/tgui/tmoviegenerator.h tupi-0.2+git05/src/framework/tgui/tmoviegenerator.h
--- tupi-0.2+git04/src/framework/tgui/tmoviegenerator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tmoviegenerator.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,15 +36,14 @@
 #ifndef TMOVIEGENERATOR_H
 #define TMOVIEGENERATOR_H
 
-#include <QImage>
-
+#include "tglobal.h"
 #include "tmoviegeneratorinterface.h"
 
 /**
  * @author David Cuadrado
 */
 
-class TMovieGenerator : public QImage, public TMovieGeneratorInterface
+class T_GUI_EXPORT TMovieGenerator : public QImage, public TMovieGeneratorInterface
 {
     public:
         TMovieGenerator(int width, int height);
diff -Nru tupi-0.2+git04/src/framework/tgui/tmoviegeneratorinterface.h tupi-0.2+git05/src/framework/tgui/tmoviegeneratorinterface.h
--- tupi-0.2+git04/src/framework/tgui/tmoviegeneratorinterface.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tmoviegeneratorinterface.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,11 +36,13 @@
 #ifndef TMOVIEGENERATORINTERFACE_H
 #define TMOVIEGENERATORINTERFACE_H
 
+#include <QImage>
+
 /**
  * @author David Cuadrado
 */
 
-class TMovieGeneratorInterface
+class T_GUI_EXPORT TMovieGeneratorInterface
 {
     public:
         enum Format
diff -Nru tupi-0.2+git04/src/framework/tgui/tnodegroup.cpp tupi-0.2+git05/src/framework/tgui/tnodegroup.cpp
--- tupi-0.2+git04/src/framework/tgui/tnodegroup.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tnodegroup.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "tnodegroup.h"
-#include "tdebug.h"
-
-#include <QGraphicsPathItem>
-#include <QAbstractGraphicsShapeItem>
 
 struct TNodeGroup::Private
 {
@@ -54,7 +50,11 @@
 TNodeGroup::TNodeGroup(QGraphicsItem *parent, QGraphicsScene *scene, GroupType type, int level): k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TNodeGroup()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     k->parentItem = parent;
@@ -74,25 +74,37 @@
 TNodeGroup::~TNodeGroup()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TNodeGroup()]";
+        #else
+            TEND;
+        #endif
     #endif
 
-    // clear();
     delete k;
 }
 
 void TNodeGroup::clear()
 {
-    // SQA: Check if exists a better way to clean nodes 
-    qDeleteAll(k->nodes);
+    // qDeleteAll(k->nodes);
+
+    foreach (TControlNode *node, k->nodes) {
+             if (node)
+                 k->scene->removeItem(node);
+    }
 
+    k->nodes.clear();
     k->parentItem->update();
 }
 
 void TNodeGroup::syncNodes(const QPainterPath &path)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TNodeGroup::syncNodes()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->nodes.isEmpty())
@@ -109,7 +121,11 @@
 void TNodeGroup::syncNodesFromParent()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TNodeGroup::syncNodesFromParent()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->parentItem) {
@@ -121,7 +137,11 @@
 void TNodeGroup::setParentItem(QGraphicsItem *newParent)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TNodeGroup::setParentItem()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     k->parentItem = newParent;
@@ -133,9 +153,15 @@
 
 void TNodeGroup::moveElementTo(int index, const QPointF& pos)
 {
+    /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TNodeGroup::moveElementTo()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
+    */
 
     QPainterPath path = qgraphicsitem_cast<QGraphicsPathItem *>(k->parentItem)->path();
     path.setElementPositionAt(index, pos.x(), pos.y());
@@ -202,7 +228,11 @@
 void TNodeGroup::createNodes(QGraphicsPathItem *pathItem)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TNodeGroup::createNodes()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (pathItem) {
@@ -267,7 +297,12 @@
         }
     } else {
         #ifdef K_DEBUG
-               tError() << "TNodeGroup::createNodes() - Fatal Error: Item is NULL!";
+            QString msg = "TNodeGroup::createNodes() - Fatal Error: Item is NULL!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -279,7 +314,11 @@
 void TNodeGroup::emitNodeClicked(TControlNode::State state)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TNodeGroup::emitNodeClicked()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     /* SQA: Possible code for the future 
@@ -313,3 +352,11 @@
 {
     return k->nodes.count();
 }
+
+void TNodeGroup::resizeNodes(qreal scaleFactor)
+{
+    foreach (TControlNode *node, k->nodes) {
+             if (node)
+                 node->resize(scaleFactor);
+    }
+}
diff -Nru tupi-0.2+git04/src/framework/tgui/tnodegroup.h tupi-0.2+git05/src/framework/tgui/tnodegroup.h
--- tupi-0.2+git04/src/framework/tgui/tnodegroup.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tnodegroup.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,17 +36,20 @@
 #ifndef NODEGROUP_H
 #define NODEGROUP_H
 
+#include "tglobal.h"
 #include "tcontrolnode.h"
 
 #include <QGraphicsScene>
 #include <QObject>
 #include <QHash>
+#include <QGraphicsPathItem>
+#include <QAbstractGraphicsShapeItem>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TNodeGroup : public QObject
+class T_GUI_EXPORT TNodeGroup : public QObject
 {
     Q_OBJECT
 
@@ -84,6 +87,7 @@
         void expandAllNodes();
         bool isSelected();
         int size();
+        void resizeNodes(qreal scaleFactor);
         
     private:
         struct Private;
diff -Nru tupi-0.2+git04/src/framework/tgui/toolview.cpp tupi-0.2+git05/src/framework/tgui/toolview.cpp
--- tupi-0.2+git04/src/framework/tgui/toolview.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/toolview.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,16 +34,6 @@
  ***************************************************************************/
 
 #include "toolview.h"
-#include "tviewbutton.h"
-#include "tmainwindow.h"
-#include "tdebug.h"
-
-#include <QtDebug>
-#include <QAction>
-#include <QMainWindow>
-#include <QMouseEvent>
-#include <QLayout>
-#include <QEvent>
 
 ToolView::ToolView(const QString &title, const QIcon &icon, const QString &code, QWidget * parent)
           : QDockWidget(title, parent), m_size(-1), m_perspective(0)
diff -Nru tupi-0.2+git04/src/framework/tgui/toolview.h tupi-0.2+git05/src/framework/tgui/toolview.h
--- tupi-0.2+git04/src/framework/tgui/toolview.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/toolview.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,19 +36,24 @@
 #ifndef TOOLVIEW_H
 #define TOOLVIEW_H
 
-#include "tideality.h"
+#include "tglobal.h"
+#include "tviewbutton.h"
+#include "tmainwindow.h"
 
 #include <QDockWidget>
 #include <QIcon>
 #include <QKeySequence>
-
-class TViewButton;
+#include <QAction>
+#include <QMainWindow>
+#include <QMouseEvent>
+#include <QLayout>
+#include <QEvent>
 
 /**
  * @author David Cuadrado
 */
 
-class T_IDEAL_EXPORT ToolView : public QDockWidget
+class T_GUI_EXPORT ToolView : public QDockWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/framework/tgui/toptionaldialog.cpp tupi-0.2+git05/src/framework/tgui/toptionaldialog.cpp
--- tupi-0.2+git04/src/framework/tgui/toptionaldialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/toptionaldialog.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "toptionaldialog.h"
-#include "tseparator.h"
-
-#include <QVBoxLayout>
-#include <QLabel>
 
 TOptionalDialog::TOptionalDialog(const QString &text,const QString &title,QWidget *parent) : QDialog(parent)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/toptionaldialog.h tupi-0.2+git05/src/framework/tgui/toptionaldialog.h
--- tupi-0.2+git04/src/framework/tgui/toptionaldialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/toptionaldialog.h	2014-12-15 14:21:33.000000000 +0000
@@ -37,11 +37,13 @@
 #define TOPTIONALDIALOG_H
 
 #include "tglobal.h"
+#include "tseparator.h"
 
+#include <QBoxLayout>
+#include <QLabel>
 #include <QDialog>
 #include <QCheckBox>
 #include <QPushButton>
-#include <QHBoxLayout>
 
 /**
  * @if english
diff -Nru tupi-0.2+git04/src/framework/tgui/tosd.cpp tupi-0.2+git05/src/framework/tgui/tosd.cpp
--- tupi-0.2+git04/src/framework/tgui/tosd.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tosd.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,14 +34,6 @@
  ***************************************************************************/
 
 #include "tosd.h"
-#include "tdebug.h"
-
-#include <QApplication>
-#include <QBitmap>
-#include <QTimer>
-#include <QPainter>
-#include <QDesktopWidget>
-#include <QLinearGradient>
 
 TOsd *TOsd::s_osd = 0;
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tosd.h tupi-0.2+git05/src/framework/tgui/tosd.h
--- tupi-0.2+git04/src/framework/tgui/tosd.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tosd.h	2014-12-15 14:21:33.000000000 +0000
@@ -44,6 +44,12 @@
 #include <QPaintEvent>
 #include <QTimer>
 #include <QTextDocument>
+#include <QApplication>
+#include <QBitmap>
+#include <QTimer>
+#include <QPainter>
+#include <QDesktopWidget>
+#include <QLinearGradient>
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tgui/tpathhelper.cpp tupi-0.2+git05/src/framework/tgui/tpathhelper.cpp
--- tupi-0.2+git04/src/framework/tgui/tpathhelper.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tpathhelper.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tpathhelper.h"
-#include "tdebug.h"
 
 TPathHelper::TPathHelper()
 {
@@ -138,7 +137,12 @@
     Q_UNUSED(svgpath);
 
     #ifdef K_DEBUG
-           tWarning() << "TPathHelper::buildPath() - Warning: method pending for implementation";
+        QString msg = "TPathHelper::buildPath() - Warning: method pending for implementation";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
     
     return QPainterPath();
diff -Nru tupi-0.2+git04/src/framework/tgui/tpushbutton.cpp tupi-0.2+git05/src/framework/tgui/tpushbutton.cpp
--- tupi-0.2+git04/src/framework/tgui/tpushbutton.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tpushbutton.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,9 +35,6 @@
 
 #include "tpushbutton.h"
 
-#include <QPolygon>
-#include <QPainter>
-
 TPushButton::TPushButton(QWidget *parent, const QString &name, int column, int row) : QPushButton(parent)
 {
     setText(name);
diff -Nru tupi-0.2+git04/src/framework/tgui/tpushbutton.h tupi-0.2+git05/src/framework/tgui/tpushbutton.h
--- tupi-0.2+git04/src/framework/tgui/tpushbutton.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tpushbutton.h	2014-12-15 14:21:33.000000000 +0000
@@ -37,7 +37,10 @@
 #define TPUSHBUTTON_H
 
 #include "tglobal.h"
+
 #include <QPushButton>
+#include <QPolygon>
+#include <QPainter>
 
 /**
  * @author Gustav Gonzalez 
diff -Nru tupi-0.2+git04/src/framework/tgui/tradiobuttongroup.cpp tupi-0.2+git05/src/framework/tgui/tradiobuttongroup.cpp
--- tupi-0.2+git04/src/framework/tgui/tradiobuttongroup.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tradiobuttongroup.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "tradiobuttongroup.h"
-#include "tdebug.h"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
 
 TRadioButtonGroup::TRadioButtonGroup(const QString &title, Qt::Orientation orientation, QWidget *parent) : QGroupBox(title, parent), m_orientation(orientation)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tradiobuttongroup.h tupi-0.2+git05/src/framework/tgui/tradiobuttongroup.h
--- tupi-0.2+git04/src/framework/tgui/tradiobuttongroup.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tradiobuttongroup.h	2014-12-15 14:21:33.000000000 +0000
@@ -40,8 +40,8 @@
 
 #include <QGroupBox>
 #include <QRadioButton>
-#include <QBoxLayout>
 #include <QButtonGroup>
+#include <QBoxLayout>
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tgui/treelistwidget.cpp tupi-0.2+git05/src/framework/tgui/treelistwidget.cpp
--- tupi-0.2+git04/src/framework/tgui/treelistwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/treelistwidget.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,12 +34,6 @@
  ***************************************************************************/
 
 #include "treelistwidget.h"
-#include "tdebug.h"
-
-#include <QHeaderView>
-#include <QItemDelegate>
-#include <QEvent>
-#include <QLineEdit>
 
 class TreeListWidgetDelegate : public QItemDelegate
 {
@@ -120,16 +114,17 @@
 void TreeListWidget::closeEditor(QWidget * editor, QAbstractItemDelegate::EndEditHint hint)
 {
     #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::removeItem()]";
+        #else
            T_FUNCINFO;
+        #endif
     #endif
 
     QLineEdit *edit = qobject_cast<QLineEdit *>(editor);
 
-    if (edit) {
-        QTreeWidgetItem *item = currentItem();
-        if (item)
-            emit itemRenamed(item);
-    }
+    if (edit)
+        emit editorClosed();
 
     QTreeWidget::closeEditor(editor, hint);
 }
diff -Nru tupi-0.2+git04/src/framework/tgui/treelistwidget.h tupi-0.2+git05/src/framework/tgui/treelistwidget.h
--- tupi-0.2+git04/src/framework/tgui/treelistwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/treelistwidget.h	2014-12-15 14:21:33.000000000 +0000
@@ -39,6 +39,10 @@
 #include "tglobal.h"
 
 #include <QTreeWidget>
+#include <QHeaderView>
+#include <QItemDelegate>
+#include <QEvent>
+#include <QLineEdit>
 
 /**
  * @author David Cuadrado
@@ -67,7 +71,8 @@
         virtual void closeEditor(QWidget * editor, QAbstractItemDelegate::EndEditHint hint);
         
     signals:
-        void itemRenamed(QTreeWidgetItem *item);
+        // void itemRenamed(QTreeWidgetItem *item);
+        void editorClosed();
         
     private:
         bool m_isEditable;
diff -Nru tupi-0.2+git04/src/framework/tgui/treewidgetsearchline.cpp tupi-0.2+git05/src/framework/tgui/treewidgetsearchline.cpp
--- tupi-0.2+git04/src/framework/tgui/treewidgetsearchline.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/treewidgetsearchline.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,17 +35,6 @@
 
 #include "treewidgetsearchline.h"
 
-#include <QApplication>
-#include <QTimer>
-#include <QMenu>
-#include <QLabel>
-#include <QContextMenuEvent>
-#include <QList>
-#include <QToolButton>
-#include <QHeaderView>
-#include <QHBoxLayout>
-#include <QTreeWidget>
-
 class TreeWidgetSearchLine::TreeWidgetSearchLinePrivate
 {
     public:
diff -Nru tupi-0.2+git04/src/framework/tgui/treewidgetsearchline.h tupi-0.2+git05/src/framework/tgui/treewidgetsearchline.h
--- tupi-0.2+git04/src/framework/tgui/treewidgetsearchline.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/treewidgetsearchline.h	2014-12-15 14:21:33.000000000 +0000
@@ -40,10 +40,17 @@
 #include "tglobal.h"
 
 #include <QModelIndex>
-
-class QTreeWidget;
-class QTreeWidgetItem;
-class QToolButton;
+#include <QApplication>
+#include <QTimer>
+#include <QMenu>
+#include <QLabel>
+#include <QContextMenuEvent>
+#include <QList>
+#include <QToolButton>
+#include <QHeaderView>
+#include <QHBoxLayout>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 
 /**
  * This class provides a search line for filtering the items in
diff -Nru tupi-0.2+git04/src/framework/tgui/trulerbase.cpp tupi-0.2+git05/src/framework/tgui/trulerbase.cpp
--- tupi-0.2+git04/src/framework/tgui/trulerbase.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/trulerbase.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,13 +34,6 @@
  ***************************************************************************/
 
 #include "trulerbase.h"
-#include "tdebug.h"
-
-#include <QMouseEvent>
-#include <QFrame>
-#include <QResizeEvent>
-#include <QPaintEvent> 
-#include <QPainter>
 
 struct TRulerBase::Private
 {
@@ -119,7 +112,7 @@
     delete k;
 }
 
-void TRulerBase::paintEvent ( QPaintEvent * )
+void TRulerBase::paintEvent(QPaintEvent *)
 {
     QPainter p(this);
 
@@ -207,15 +200,15 @@
     update();
 }
 
-void TRulerBase::mouseMoveEvent(QMouseEvent * e)
+void TRulerBase::mouseMoveEvent(QMouseEvent *event)
 {
     if (k->drawPointer)
-        movePointers(e->pos());
+        movePointers(event->pos());
 }
 
-void TRulerBase::setDrawPointer(bool yes)
+void TRulerBase::setDrawPointer(bool flag)
 {
-    k->drawPointer = yes;
+    k->drawPointer = flag;
     update();
 }
 
@@ -225,14 +218,21 @@
         k->separation = sep;
         update();
     } else {
-        tError() << "I can't assign separation : " << sep << endl;
+        #ifdef K_DEBUG
+            QString msg = "TRulerBase::setSeparation() - Error: Can't assign separation : " + QString::number(sep);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
     }
 }
 
-void TRulerBase::mousePressEvent(QMouseEvent *e)
+void TRulerBase::mousePressEvent(QMouseEvent *event)
 {
-    if (e->button() == Qt::RightButton)
-        emit displayMenu(this, e->globalPos());
+    if (event->button() == Qt::RightButton)
+        emit displayMenu(this, event->globalPos());
 }
 
 Qt::Orientation TRulerBase::orientation()
diff -Nru tupi-0.2+git04/src/framework/tgui/trulerbase.h tupi-0.2+git05/src/framework/tgui/trulerbase.h
--- tupi-0.2+git04/src/framework/tgui/trulerbase.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/trulerbase.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,8 +33,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef RULER_H
-#define RULER_H
+#ifndef RULERBASE_H
+#define RULERBASE_H
 
 #include "tglobal.h"
 
@@ -44,6 +44,7 @@
 #include <QMenu>
 #include <QPolygonF>
 #include <QFrame>
+#include <QPainter>
 
 #define UNITCOUNT 5
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tseparator.cpp tupi-0.2+git05/src/framework/tgui/tseparator.cpp
--- tupi-0.2+git04/src/framework/tgui/tseparator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tseparator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,8 +34,6 @@
  ***************************************************************************/
 
 #include "tseparator.h"
-#include <QStyleOption>
-#include <QPainter>
 
 TSeparator::TSeparator(QWidget* parent) : QFrame(parent)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tseparator.h tupi-0.2+git05/src/framework/tgui/tseparator.h
--- tupi-0.2+git04/src/framework/tgui/tseparator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tseparator.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,9 +36,12 @@
 #ifndef TSEPARATOR_H
 #define TSEPARATOR_H
 
-#include <QFrame>
 #include "tglobal.h"
 
+#include <QFrame>
+#include <QStyleOption>
+#include <QPainter>
+
 /**
  * Standard horizontal or vertical separator.
  *
diff -Nru tupi-0.2+git04/src/framework/tgui/tstackedmainwindow.cpp tupi-0.2+git05/src/framework/tgui/tstackedmainwindow.cpp
--- tupi-0.2+git04/src/framework/tgui/tstackedmainwindow.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tstackedmainwindow.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,8 +35,6 @@
 
 #include "tstackedmainwindow.h"
 
-#include <QStackedWidget>
-
 TStackedMainWindow::TStackedMainWindow(QWidget *parent) : TMainWindow(parent)
 {
     m_stack = new QStackedWidget;
diff -Nru tupi-0.2+git04/src/framework/tgui/tstackedmainwindow.h tupi-0.2+git05/src/framework/tgui/tstackedmainwindow.h
--- tupi-0.2+git04/src/framework/tgui/tstackedmainwindow.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tstackedmainwindow.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,17 +36,17 @@
 #ifndef TSTACKEDMAINWINDOW_H
 #define TSTACKEDMAINWINDOW_H
 
+#include "tglobal.h"
 #include "tmainwindow.h"
 
+#include <QStackedWidget>
 #include <QHash>
 
-class QStackedWidget;
-
 /**
  * @author David Cuadrado
 */
 
-class T_IDEAL_EXPORT TStackedMainWindow : public TMainWindow
+class T_GUI_EXPORT TStackedMainWindow : public TMainWindow
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tstylecombobox.cpp tupi-0.2+git05/src/framework/tgui/tstylecombobox.cpp
--- tupi-0.2+git04/src/framework/tgui/tstylecombobox.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tstylecombobox.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "tstylecombobox.h"
-#include "tdebug.h"
-
-#include <QStyleFactory>
-#include <QApplication>
 
 TStyleComboBox::TStyleComboBox(QWidget *parent) : QComboBox(parent)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tstylecombobox.h tupi-0.2+git05/src/framework/tgui/tstylecombobox.h
--- tupi-0.2+git04/src/framework/tgui/tstylecombobox.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tstylecombobox.h	2014-12-15 14:21:33.000000000 +0000
@@ -37,7 +37,10 @@
 #define TSTYLECOMBOBOX_H
 
 #include "tglobal.h"
+
 #include <QComboBox>
+#include <QStyleFactory>
+#include <QApplication>
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tgui/ttabwidget.cpp tupi-0.2+git05/src/framework/tgui/ttabwidget.cpp
--- tupi-0.2+git04/src/framework/tgui/ttabwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/ttabwidget.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "ttabwidget.h"
-#include "tdebug.h"
-
-#include <QWheelEvent>
-#include <QTabBar>
 
 TTabWidget::TTabWidget(QWidget *parent) : QTabWidget(parent)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/ttabwidget.h tupi-0.2+git05/src/framework/tgui/ttabwidget.h
--- tupi-0.2+git04/src/framework/tgui/ttabwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/ttabwidget.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,9 +36,12 @@
 #ifndef TTABWIDGET_H
 #define TTABWIDGET_H
 
-#include <QTabWidget>
 #include "tglobal.h"
 
+#include <QTabWidget>
+#include <QWheelEvent>
+#include <QTabBar>
+
 /**
  * @author David Cuadrado
 */
diff -Nru tupi-0.2+git04/src/framework/tgui/ttoolbox.cpp tupi-0.2+git05/src/framework/tgui/ttoolbox.cpp
--- tupi-0.2+git04/src/framework/tgui/ttoolbox.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/ttoolbox.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,9 +35,6 @@
 
 #include "ttoolbox.h"
 
-#include <QPolygon>
-#include <QPainter>
-
 TToolBox::TToolBox(QWidget *parent) : QToolBox(parent), m_lastIndex(0)
 {
     setFrameStyle(QFrame::StyledPanel);
diff -Nru tupi-0.2+git04/src/framework/tgui/ttoolbox.h tupi-0.2+git05/src/framework/tgui/ttoolbox.h
--- tupi-0.2+git04/src/framework/tgui/ttoolbox.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/ttoolbox.h	2014-12-15 14:21:33.000000000 +0000
@@ -37,7 +37,10 @@
 #define TTOOLBOX_H
 
 #include "tglobal.h"
+
 #include <QToolBox>
+#include <QPolygon>
+#include <QPainter>
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tgui/tvhbox.cpp tupi-0.2+git05/src/framework/tgui/tvhbox.cpp
--- tupi-0.2+git04/src/framework/tgui/tvhbox.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tvhbox.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,12 +34,6 @@
  ***************************************************************************/
 
 #include "tvhbox.h"
-#include "tdebug.h"
-
-#include <QApplication>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QPoint>
 
 TVHBox::TVHBox(QWidget *parent, Qt::Orientation o) : QFrame(parent)
 {
@@ -78,16 +72,20 @@
 
 void TVHBox::moveWidgetUp(QWidget *widget)
 {
-    // dDebug() << "Childs " << children ().count() << endl;
     int position = m_pLayout->indexOf(widget);
     
-    // dDebug() << "Position: " << position << endl;
-    
     if (position > 0) {
         m_pLayout->removeWidget(widget);
         m_pLayout->insertWidget(position-1, widget);
     } else {
-        tError() << "The widget isn't in the layout" << endl;
+        #ifdef K_DEBUG
+            QString msg = "TVHBox::moveWidgetUp() - Error: The widget isn't in the layout";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
     }
 }
 
@@ -160,9 +158,8 @@
 
 void TVHBox::mouseMoveEvent(QMouseEvent *e)
 {
-    if (hasMouseTracking()) {
+    if (hasMouseTracking())
         emit mouseAt(e->pos());
-    }
 }
 
 QBoxLayout *TVHBox::boxLayout()
diff -Nru tupi-0.2+git04/src/framework/tgui/tvhbox.h tupi-0.2+git05/src/framework/tgui/tvhbox.h
--- tupi-0.2+git04/src/framework/tgui/tvhbox.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tvhbox.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,8 +36,6 @@
 #ifndef TVHBOX_H
 #define TVHBOX_H
 
-class TVHBox;
-
 #include "tglobal.h"
 
 #include <QFrame>
@@ -45,6 +43,8 @@
 #include <QBoxLayout>
 #include <QEvent>
 #include <QMouseEvent>
+#include <QApplication>
+#include <QPoint>
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tgui/tviewbutton.cpp tupi-0.2+git05/src/framework/tgui/tviewbutton.cpp
--- tupi-0.2+git04/src/framework/tgui/tviewbutton.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tviewbutton.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,16 +35,6 @@
 
 #include "tviewbutton.h"
 #include "toolview.h"
-#include "tdebug.h"
-
-#include <QToolBar>
-#include <QStylePainter>
-#include <QMenu>
-#include <QIcon>
-#include <QMouseEvent>
-#include <QMainWindow>
-#include <QTimer>
-#include <QtDebug>
 
 class TViewButton::Animator
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/tviewbutton.h tupi-0.2+git05/src/framework/tgui/tviewbutton.h
--- tupi-0.2+git04/src/framework/tgui/tviewbutton.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tviewbutton.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,10 +36,17 @@
 #ifndef TVIEWBUTTON_H
 #define TVIEWBUTTON_H
 
-#include "tideality.h"
+#include "tglobal.h"
 
 #include <QToolButton>
 #include <QStyleOptionToolButton>
+#include <QToolBar>
+#include <QStylePainter>
+#include <QMenu>
+#include <QIcon>
+#include <QMouseEvent>
+#include <QMainWindow>
+#include <QTimer>
 
 class ToolView;
 
@@ -47,7 +54,7 @@
  * @author David Cuadrado
 */
 
-class T_IDEAL_EXPORT TViewButton : public QToolButton
+class T_GUI_EXPORT TViewButton : public QToolButton
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/framework/tgui/twaitstyle.cpp tupi-0.2+git05/src/framework/tgui/twaitstyle.cpp
--- tupi-0.2+git04/src/framework/tgui/twaitstyle.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/twaitstyle.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,571 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "twaitstyle.h"
-
-#include <QLayout>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPixmapCache>
-#include <QRadioButton>
-#include <QString>
-#include <QStyleOption>
-#include <QtDebug>
-#include <QPushButton>
-#include <QGroupBox>
-
-QPixmap cached(const QString &img, const QColor &color)
-{
-    Q_UNUSED(color);
-
-    if (QPixmap *p = QPixmapCache::find(img))
-        return *p;
-
-    QPixmap pm;
-    QImage original(img);
-
-    // SQA: Replace the method fade with a native Qt function 
-    // pm = QPixmap::fromImage(TImageEffect::fade(original, 0.7, color), Qt::OrderedDither | Qt::OrderedAlphaDither);
-
-    pm = QPixmap::fromImage(original, Qt::OrderedDither | Qt::OrderedAlphaDither);
-    if (pm.isNull())
-        return QPixmap();
-
-    QPixmapCache::insert(img, pm);
-    return pm;
-}
-
-TWaitStyle::TWaitStyle()
-    : QPlastiqueStyle()
-{
-    Q_INIT_RESOURCE(tgui_images);
-}
-
-void TWaitStyle::drawHoverRect(QPainter *painter, const QRect &r, const QBrush &brush) const
-{
-    double h = r.height();
-    double h2 = r.height() / 2.0;
-    QPainterPath path;
-    path.addRect(r.x() + h2, r.y() + 0, r.width() - h2 * 2, r.height());
-    path.addEllipse(r.x(), r.y(), h, h);
-    path.addEllipse(r.x() + r.width() - h, r.y(), h, h);
-    path.setFillRule(Qt::WindingFill);
-    painter->setPen(Qt::NoPen);
-    painter->setBrush(brush);
-    painter->setRenderHint(QPainter::Antialiasing);
-    painter->drawPath(path);
-}
-
-void TWaitStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option,QPainter *painter, const QWidget *widget) const
-{
-    Q_ASSERT(option);
-    
-    switch (element) {
-        case PE_FrameFocusRect: break;
-        case PE_IndicatorRadioButton:
-        {
-            if (const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option)) {
-                bool hover = (button->state & State_Enabled) && (button->state & State_MouseOver);
-                painter->save();
-                QPixmap radio;
-                if (hover)
-                    drawHoverRect(painter, widget->rect(), option->palette.background() );
-
-                if (button->state & State_Sunken)
-                    radio = cached(":dwaitstyle/images/radiobutton-on.png", option->palette.color(QPalette::Background) );
-                else if (button->state & State_On)
-                    radio = cached(":dwaitstyle/images/radiobutton_on.png", option->palette.color(QPalette::Background));
-                else
-                    radio = cached(":dwaitstyle/images/radiobutton_off.png", option->palette.color(QPalette::Background));
-                painter->drawPixmap(button->rect.topLeft(), radio);
-
-                painter->restore();
-            }
-            else
-            {
-                QPlastiqueStyle::drawPrimitive(element, option, painter, widget);
-            }
-            break;
-        }
-        case PE_PanelButtonCommand:
-        {
-            const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option);
-            if (button) {
-                bool hover = (button->state & State_Enabled) && (button->state & State_MouseOver);
-
-                const QPushButton *pushButton = qobject_cast<const QPushButton *>(widget);
-                
-                if (! pushButton ) {
-                    QPlastiqueStyle::drawPrimitive(element, option, painter, widget);
-                    break;
-                }
-                
-                painter->save();
-                QWidget *parent = pushButton->parentWidget();
-
-                if (parent && qobject_cast<QGroupBox *>(parent)) {
-                    QLinearGradient lg(0, 0, 0, parent->height());
-                    lg.setColorAt(0, QColor(224,224,224));
-                    lg.setColorAt(1, QColor(255,255,255));
-                    painter->setPen(Qt::NoPen);
-                    painter->setBrush(lg);
-                    painter->setBrushOrigin(-widget->mapToParent(QPoint(0,0)));
-                    painter->drawRect(button->rect);
-                    painter->setBrushOrigin(0,0);
-                }
-                                
-                bool down = pushButton && ((button->state & State_Sunken) || (button->state & State_On));
-                
-                bool goodSize = pushButton && pushButton->height() > 22;
-                
-                QPixmap left, right, mid;
-
-                if (down && goodSize) {
-                    left = cached(":dwaitstyle/images/button_pressed_cap_left.png", 
-                                  option->palette.color(QPalette::Background));
-                    
-                    right = cached(":dwaitstyle/images/button_pressed_cap_right.png", 
-                                   option->palette.color(QPalette::Background));
-
-                    mid = cached(":dwaitstyle/images/button_pressed_stretch.png", 
-                                 option->palette.color(QPalette::Background));
-                } else if (goodSize) {
-                    left = cached(":dwaitstyle/images/button_normal_cap_left.png", 
-                                  option->palette.color(QPalette::Background));
-                    right = cached(":dwaitstyle/images/button_normal_cap_right.png", 
-                                   option->palette.color(QPalette::Background));
-                    mid = cached(":dwaitstyle/images/button_normal_stretch.png", 
-                                 option->palette.color(QPalette::Background));
-                }
-                
-                if (goodSize) {
-                    painter->drawPixmap(button->rect.topLeft(), left);
-                    painter->drawTiledPixmap(QRect(button->rect.x() + left.width(),button->rect.y(),
-                                             button->rect.width() - left.width() - right.width(),
-                                             left.height()), mid);
-                    painter->drawPixmap(button->rect.x() + button->rect.width() - right.width(),
-                                        button->rect.y(), right);
-                }
-                
-                if (hover)
-                    painter->fillRect(widget->rect().adjusted(3,5,-3,-5), QColor(41,57,127,63));
-
-                painter->restore();
-                
-                if (!goodSize)
-                    QPlastiqueStyle::drawPrimitive(element, option, painter, widget);
-
-            } else {
-                QPlastiqueStyle::drawPrimitive(element, option, painter, widget);
-            }
-            break;
-        }
-        case PE_Frame:
-        {
-            
-        }
-        break;
-        case PE_FrameGroupBox:
-        {
-            const QStyleOptionFrameV2 *group = qstyleoption_cast<const QStyleOptionFrameV2 *>(option);
-
-            if (group) {
-                const QRect &r = group->rect;
-
-                if (r.height() < 14) { // FIXME FIXME FIXME
-                    QPlastiqueStyle::drawPrimitive(element, option, painter, widget);
-                    return;
-                }
-                
-                painter->save();
-                int radius = 14;
-                int radius2 = radius*2;
-                QPainterPath clipPath;
-                clipPath.moveTo(radius, 0);
-                clipPath.arcTo(r.right() - radius2, 0, radius2, radius2, 90, -90);
-                clipPath.arcTo(r.right() - radius2, r.bottom() - radius2, radius2, radius2, 0, -90);
-                clipPath.arcTo(r.left(), r.bottom() - radius2, radius2, radius2, 270, -90);
-                clipPath.arcTo(r.left(), r.top(), radius2, radius2, 180, -90);
-                painter->setClipPath(clipPath);
-                QPixmap titleStretch = cached(":dwaitstyle/images/title_stretch.png", 
-                                              option->palette.color(QPalette::Background));
-                QPixmap topLeft = cached(":dwaitstyle/images/groupframe_topleft.png", 
-                                         option->palette.color(QPalette::Background));
-                QPixmap topRight = cached(":dwaitstyle/images/groupframe_topright.png", 
-                                          option->palette.color(QPalette::Background));
-                QPixmap bottomLeft = cached(":dwaitstyle/images/groupframe_bottom_left.png", 
-                                            option->palette.color(QPalette::Background));
-                QPixmap bottomRight = cached(":dwaitstyle/images/groupframe_bottom_right.png", 
-                                             option->palette.color(QPalette::Background));
-                QPixmap leftStretch = cached(":dwaitstyle/images/groupframe_left_stretch.png", 
-                                             option->palette.color(QPalette::Background));
-                QPixmap topStretch = cached(":dwaitstyle/images/groupframe_top_stretch.png", 
-                                            option->palette.color(QPalette::Background));
-                QPixmap rightStretch = cached(":dwaitstyle/images/groupframe_right_stretch.png", 
-                                              option->palette.color(QPalette::Background));
-                QPixmap bottomStretch = cached(":dwaitstyle/images/groupframe_bottom_stretch.png", 
-                                               option->palette.color(QPalette::Background));
-
-                QLinearGradient lg(0, 0, 0, r.height());
-                
-                lg.setColorAt(0, widget->palette().color(QPalette::Background));
-                lg.setColorAt(1, widget->palette().color(QPalette::Light));
-                
-                painter->setPen(Qt::NoPen);
-                painter->setBrush(lg);
-                painter->drawRect(r.adjusted(0, titleStretch.height()/2, 0, 0));
-                painter->setClipping(false);
-
-                int topFrameOffset = titleStretch.height()/2 - 2;
-                painter->drawPixmap(r.topLeft() + QPoint(0, topFrameOffset), topLeft);
-                painter->drawPixmap(r.topRight() - QPoint(topRight.width()-1, 0)
-                        + QPoint(0, topFrameOffset), topRight);
-                painter->drawPixmap(r.bottomLeft() - QPoint(0, bottomLeft.height()-1), bottomLeft);
-                painter->drawPixmap(r.bottomRight() - QPoint(bottomRight.width()-1,
-                        bottomRight.height()-1), bottomRight);
-
-                QRect left = r;
-                left.setY(r.y() + topLeft.height() + topFrameOffset);
-                left.setWidth(leftStretch.width());
-                left.setHeight(r.height() - topLeft.height() - bottomLeft.height() - topFrameOffset);
-                painter->drawTiledPixmap(left, leftStretch);
-
-                QRect top = r;
-                top.setX(r.x() + topLeft.width());
-                top.setY(r.y() + topFrameOffset);
-                top.setWidth(r.width() - topLeft.width() - topRight.width());
-                top.setHeight(topLeft.height());
-                painter->drawTiledPixmap(top, topStretch);
-
-                QRect right = r;
-                right.setX(r.right() - rightStretch.width()+1);
-                right.setY(r.y() + topRight.height() + topFrameOffset);
-                right.setWidth(rightStretch.width());
-                right.setHeight(r.height() - topRight.height() - bottomRight.height() - topFrameOffset);
-                painter->drawTiledPixmap(right, rightStretch);
-
-                QRect bottom = r;
-                bottom.setX(r.x() + bottomLeft.width());
-                bottom.setY(r.bottom() - bottomStretch.height()+1);
-                bottom.setWidth(r.width() - bottomLeft.width() - bottomRight.width());
-                bottom.setHeight(bottomLeft.height());
-                painter->drawTiledPixmap(bottom, bottomStretch);
-                painter->restore();
-            }
-            else
-            {
-                QPlastiqueStyle::drawPrimitive(element, option, painter, widget);
-            }
-            break;
-        }
-        default:
-            QPlastiqueStyle::drawPrimitive(element, option, painter, widget);
-            break;
-    }
-    
-    
-    return;
-}
-
-void TWaitStyle::drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
-{
-    switch (element) {
-        default:
-        {
-            QPlastiqueStyle::drawControl(element, option, painter, widget);
-        }
-        break;
-    }
-}
-
-void TWaitStyle::drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget) const
-{
-    switch (control) {
-        case CC_Slider:
-        {
-            if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
-                QRect groove = subControlRect(CC_Slider, option, SC_SliderGroove, widget);
-                QRect handle = subControlRect(CC_Slider, option, SC_SliderHandle, widget);
-
-                painter->save();
-
-                bool hover = (slider->state & State_Enabled) && (slider->state & State_MouseOver);
-                if (hover) {
-                    QRect moderated = widget->rect().adjusted(0, 4, 0, -4);
-                    drawHoverRect(painter, moderated, option->palette.background());
-                }
-
-                if ((option->subControls & SC_SliderGroove) && groove.isValid()) {
-                    QPixmap grv = cached(":dwaitstyle/images/slider_bar.png", 
-                                         option->palette.color(QPalette::Background));
-                    painter->drawPixmap(QRect(groove.x() + 5, groove.y(),
-                            groove.width() - 10, grv.height()), grv);
-                }
-
-                if ((option->subControls & SC_SliderHandle) && handle.isValid()) {
-                    QPixmap hndl = cached(":dwaitstyle/images/slider_thumb_on.png", 
-                                   option->palette.color(QPalette::Background));
-                    painter->drawPixmap(handle.topLeft(), hndl);
-                }
-
-                painter->restore();
-
-            } else {
-                QPlastiqueStyle::drawComplexControl(control, option, painter, widget);
-            }
-            
-            break;
-        }
-        case CC_GroupBox:
-        {
-            const QStyleOptionGroupBox *groupBox = qstyleoption_cast<const QStyleOptionGroupBox *>(option);
-            if (groupBox) {
-                QStyleOptionGroupBox groupBoxCopy(*groupBox);
-                groupBoxCopy.subControls &= ~SC_GroupBoxLabel;
-                QPlastiqueStyle::drawComplexControl(control, &groupBoxCopy, painter, widget);
-                
-                if (groupBox->subControls & SC_GroupBoxLabel) {
-                    const QRect &r = groupBox->rect;
-                    QPixmap titleLeft = cached(":dwaitstyle/images/title_cap_left.png", 
-                                               option->palette.color(QPalette::Background));
-                    QPixmap titleRight = cached(":dwaitstyle/images/title_cap_right.png", 
-                                                option->palette.color(QPalette::Background));
-                    QPixmap titleStretch = cached(":dwaitstyle/images/title_stretch.png", 
-                                                  option->palette.color(QPalette::Background));
-                    int txt_width = groupBox->fontMetrics.width(groupBox->text) + 20;
-                    painter->drawPixmap(r.center().x() - txt_width/2, 0, titleLeft);
-                    QRect tileRect = subControlRect(control, groupBox, SC_GroupBoxLabel, widget);
-                    painter->drawTiledPixmap(tileRect, titleStretch);
-                    painter->drawPixmap(tileRect.x() + tileRect.width(), 0, titleRight);
-                    int opacity = 31;
-                    painter->setPen(QColor(0, 0, 0, opacity));
-                    painter->drawText(tileRect.translated(0, 1),
-                            Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
-                    painter->drawText(tileRect.translated(2, 1),
-                            Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
-                    painter->setPen(QColor(0, 0, 0, opacity * 2));
-                    painter->drawText(tileRect.translated(1, 1),
-                            Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
-                    painter->setPen(Qt::white);
-                    painter->drawText(tileRect, Qt::AlignVCenter | Qt::AlignHCenter, groupBox->text);
-                }
-            } else {
-                QPlastiqueStyle::drawComplexControl(control, option, painter, widget);
-            }
-            break;
-        }
-        default:
-            QPlastiqueStyle::drawComplexControl(control, option, painter, widget);
-            break;
-    }
-    return;
-}
-
-QRect TWaitStyle::subControlRect(ComplexControl control, const QStyleOptionComplex *option, SubControl subControl, const QWidget *widget) const
-{
-    QRect rect;
-
-    switch (control) {
-        default:
-        {
-            rect = QPlastiqueStyle::subControlRect(control, option, subControl, widget);
-            break;
-        }
-#if QT_VERSION >= 0x040100
-        case CC_GroupBox:
-        {
-            if (const QStyleOptionGroupBox *group = qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
-                switch (subControl) {
-                    default:
-                        rect = QPlastiqueStyle::subControlRect(control, option, subControl, widget);
-                        break;
-#if QT_VERSION >= 0x040100
-                    case SC_GroupBoxContents:
-                        rect = QPlastiqueStyle::subControlRect(control, option, subControl, widget);
-                        if (group->text.length() < 4) {
-                            rect.adjust(0, 4, 0, 0);
-                        } else {
-                            rect.adjust(0, -10, 0, 0);
-                        }
-                        break;
-#endif
-                    case SC_GroupBoxFrame:
-                        rect = group->rect;
-                        break;
-                    case SC_GroupBoxLabel:
-                        QPixmap titleLeft = cached(":dwaitstyle/images/title_cap_left.png", 
-                                                   option->palette.color(QPalette::Background));
-                        QPixmap titleRight = cached(":dwaitstyle/images/title_cap_right.png", 
-                                                    option->palette.color(QPalette::Background));
-                        QPixmap titleStretch = cached(":dwaitstyle/images/title_stretch.png", 
-                                                      option->palette.color(QPalette::Background));
-                        int txt_width = group->fontMetrics.width(group->text) + 20;
-                        rect = QRect(group->rect.center().x() - txt_width/2 + titleLeft.width(), 0,
-                                txt_width - titleLeft.width() - titleRight.width(),
-                                titleStretch.height());
-                        break;
-                }
-            }
-            break;
-        }
-#endif
-    }
-
-    if (control == CC_Slider && subControl == SC_SliderHandle) {
-        rect.setWidth(13);
-        rect.setHeight(27);
-    } else if (control == CC_Slider && subControl == SC_SliderGroove) {
-        rect.setHeight(9);
-        rect.moveTop(27/2 - 9/2);
-    }
-
-    return rect;
-}
-
-QSize TWaitStyle::sizeFromContents(ContentsType type, const QStyleOption *option, const QSize &size, const QWidget *widget) const
-{
-    QSize newSize = QPlastiqueStyle::sizeFromContents(type, option, size, widget);
-
-    switch (type) {
-
-       /*
-        case CT_PushButton:
-            newSize.boundedTo (QSize(27, 20));
-            break;
-       */
-
-        case CT_Slider:
-            newSize.setHeight(20);
-            break;
-
-        default:
-            break;
-    }
-
-    return newSize;
-}
-
-int TWaitStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const QWidget *widget) const
-{
-    if (pm == PM_SliderLength)
-        return 13;
-    
-    switch (pm) {
-           case QStyle::PM_DockWidgetSeparatorExtent:
-           {
-                return 1;
-           }
-           break;
-
-           /*
-           case QStyle::PM_DockWidgetHandleExtent:
-           {
-               return 0;
-           }
-           break;
-           case QStyle::PM_DockWidgetFrameWidth:
-           {
-               return 0;
-           }
-           break;
-           case QStyle::PM_DockWidgetTitleMargin:
-           {
-               return 0;
-           }
-           break;
-           */
-
-           default: 
-           break;
-    }
-    
-    return QPlastiqueStyle::pixelMetric(pm, opt, widget);
-}
-
-void TWaitStyle::polish(QWidget *widget)
-{
-    QPlastiqueStyle::polish(widget);
-
-    if (widget->layout() && qobject_cast<QGroupBox *>(widget)) {
-        if (qFindChildren<QGroupBox *>(widget).size() == 0) {
-            widget->layout()->setSpacing(0);
-        } else {
-            widget->layout()->setMargin(10);
-            // widget->layout()->setSpacing(0);
-        }
-    }
-
-    if (qobject_cast<QPushButton *>(widget)
-           || qobject_cast<QRadioButton *>(widget)
-           || qobject_cast<QSlider *>(widget)) {
-        widget->setAttribute(Qt::WA_Hover);
-    }
-}
-
-void TWaitStyle::unpolish(QWidget *widget)
-{
-    if (qobject_cast<QPushButton *>(widget)
-        || qobject_cast<QRadioButton *>(widget)
-        || qobject_cast<QSlider *>(widget)) {
-        widget->setAttribute(Qt::WA_Hover, false);
-    }
-}
-
-void TWaitStyle::polish(QPalette &palette)
-{
-    Q_UNUSED(palette);
-    // palette.setColor(QPalette::Background, QColor(241, 241, 241));
-}
-
-QRect TWaitStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const
-{
-    QRect r;
-    switch (element) {
-        case SE_RadioButtonClickRect:
-            r = widget->rect();
-            break;
-        case SE_RadioButtonContents:
-            r = widget->rect().adjusted(20, 0, 0, 0);
-            break;
-        default:
-            r = QPlastiqueStyle::subElementRect(element, option, widget);
-            break;
-    }
-
-    if (qobject_cast<const QRadioButton*>(widget))
-        r = r.adjusted(5, 0, -5, 0);
-
-    return r;
-}
diff -Nru tupi-0.2+git04/src/framework/tgui/twaitstyle.h tupi-0.2+git05/src/framework/tgui/twaitstyle.h
--- tupi-0.2+git04/src/framework/tgui/twaitstyle.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/twaitstyle.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TUPISTYLE_H
-#define TUPISTYLE_H
-
-#include "tglobal.h"
-
-#include <QPlastiqueStyle>
-
-/**
- * @if english
- * Tupi style
- * @elseif spanish
- * Estilo Tupi 
- * @endif
- */
-
-class T_GUI_EXPORT TWaitStyle : public QPlastiqueStyle
-{
-    public:
-        TWaitStyle();
-
-        void drawHoverRect(QPainter *painter, const QRect &rect, const QBrush &brush) const;
-
-        void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
-                           QPainter *painter, const QWidget *widget = 0) const;
-        void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
-        void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
-                                QPainter *painter, const QWidget *widget) const;
-        QSize sizeFromContents(ContentsType type, const QStyleOption *option,
-                               const QSize &size, const QWidget *widget) const;
-
-        QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const;
-        QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
-                             SubControl sc, const QWidget *widget) const;
-
-        int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const;
-
-        void polish(QPalette &palette);
-        void polish(QWidget *widget);
-        void unpolish(QWidget *widget);
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/framework/tgui/twidgetlistview.cpp tupi-0.2+git05/src/framework/tgui/twidgetlistview.cpp
--- tupi-0.2+git04/src/framework/tgui/twidgetlistview.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/twidgetlistview.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,16 +34,13 @@
  ***************************************************************************/
 
 #include "twidgetlistview.h"
-#include "tdebug.h"
-
-#include <QHeaderView>
-#include <QResizeEvent>
 
 TWidgetListView::TWidgetListView(QWidget * parent) : QTableWidget(0,1,parent)
 {
     verticalHeader()->hide();
     horizontalHeader()->hide();
-    horizontalHeader()->setResizeMode(QHeaderView::Custom);
+    // horizontalHeader()->setResizeMode(QHeaderView::Custom);
+    horizontalHeader()->setSectionResizeMode(QHeaderView::Custom);
 }
 
 TWidgetListView::~TWidgetListView()
diff -Nru tupi-0.2+git04/src/framework/tgui/twidgetlistview.h tupi-0.2+git05/src/framework/tgui/twidgetlistview.h
--- tupi-0.2+git04/src/framework/tgui/twidgetlistview.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/twidgetlistview.h	2014-12-15 14:21:33.000000000 +0000
@@ -40,6 +40,8 @@
 
 #include <QTableWidget>
 #include <QMap>
+#include <QHeaderView>
+#include <QResizeEvent>
 
 /**
  * @if spanish
diff -Nru tupi-0.2+git04/src/framework/tgui/twizard.cpp tupi-0.2+git05/src/framework/tgui/twizard.cpp
--- tupi-0.2+git04/src/framework/tgui/twizard.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/twizard.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,14 +35,6 @@
 
 #include "twizard.h"
 
-#include "tvhbox.h"
-#include "tseparator.h"
-#include "tdebug.h"
-
-// Qt
-#include <QLabel>
-#include <QBitmap>
-
 TWizard::TWizard(QWidget *parent) : QDialog(parent)
 {
     m_cancelButton = new QPushButton(tr("Cancel"));
diff -Nru tupi-0.2+git04/src/framework/tgui/twizard.h tupi-0.2+git05/src/framework/tgui/twizard.h
--- tupi-0.2+git04/src/framework/tgui/twizard.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/twizard.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,17 +33,20 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef KWIZARD_H
-#define KWIZARD_H
+#ifndef TWIZARD_H
+#define TWIZARD_H
+
+#include "tglobal.h"
+#include "tvhbox.h"
+#include "tseparator.h"
 
 #include <QDialog>
 #include <QPushButton>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QStackedWidget>
-
-#include "tvhbox.h"
-#include "tglobal.h"
+#include <QLabel>
+#include <QBitmap>
 
 class TWizardPage;
 
@@ -82,7 +85,7 @@
 #include <QGridLayout>
 #include <QLabel>
 
-class TWizardPage : public TVHBox
+class T_GUI_EXPORT TWizardPage : public TVHBox
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tworkspacemainwindow.cpp tupi-0.2+git05/src/framework/tgui/tworkspacemainwindow.cpp
--- tupi-0.2+git04/src/framework/tgui/tworkspacemainwindow.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tworkspacemainwindow.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,12 +34,11 @@
  ***************************************************************************/
 
 #include "tworkspacemainwindow.h"
-#include <QWorkspace>
 
 TWorkspaceMainWindow::TWorkspaceMainWindow(QWidget *parent) : TMainWindow(parent)
 {
-    m_workspace = new QWorkspace;
-    setCentralWidget(m_workspace);
+    mdiArea = new QMdiArea;
+    setCentralWidget(mdiArea);
 }
 
 TWorkspaceMainWindow::~TWorkspaceMainWindow()
@@ -49,7 +48,7 @@
 void TWorkspaceMainWindow::addWidget(QWidget *widget, int perspective)
 {
     addToPerspective(widget, perspective);
-    m_workspace->addWindow(widget);
+    mdiArea->addSubWindow(widget);
     widget->show();
 }
 
diff -Nru tupi-0.2+git04/src/framework/tgui/tworkspacemainwindow.h tupi-0.2+git05/src/framework/tgui/tworkspacemainwindow.h
--- tupi-0.2+git04/src/framework/tgui/tworkspacemainwindow.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/tworkspacemainwindow.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,14 +36,16 @@
 #ifndef TWORKSPACEMAINWINDOW_H
 #define TWORKSPACEMAINWINDOW_H
 
+#include "tglobal.h"
 #include "tmainwindow.h"
-#include <QWorkspace>
+
+#include <QMdiArea>
 
 /**
  * @author David Cuadrado
 */
 
-class T_IDEAL_EXPORT TWorkspaceMainWindow : public TMainWindow
+class T_GUI_EXPORT TWorkspaceMainWindow : public TMainWindow
 {
     Q_OBJECT
 
@@ -54,7 +56,8 @@
         void removeWidget(QWidget *widget);
 
     private:
-        QWorkspace *m_workspace;
+        // QWorkspace *m_workspace;
+        QMdiArea *mdiArea;
 };
 
 #endif
diff -Nru tupi-0.2+git04/src/framework/tgui/txyspinbox.cpp tupi-0.2+git05/src/framework/tgui/txyspinbox.cpp
--- tupi-0.2+git04/src/framework/tgui/txyspinbox.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/txyspinbox.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,11 +34,6 @@
  ***************************************************************************/
 
 #include "txyspinbox.h"
-#include "tapplication.h"
-#include "tdebug.h"
-
-#include <QHBoxLayout>
-#include <QSizePolicy>
 
 TXYSpinBox::TXYSpinBox(const QString &title, QWidget *parent) : QGroupBox(title, parent), m_modifyTogether(false)
 {
diff -Nru tupi-0.2+git04/src/framework/tgui/txyspinbox.h tupi-0.2+git05/src/framework/tgui/txyspinbox.h
--- tupi-0.2+git04/src/framework/tgui/txyspinbox.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tgui/txyspinbox.h	2014-12-15 14:21:33.000000000 +0000
@@ -38,11 +38,14 @@
 
 #include "tglobal.h"
 #include "tapplicationproperties.h"
+#include "tapplication.h"
 
 #include <QGroupBox>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QLabel>
+#include <QHBoxLayout>
+#include <QSizePolicy>
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/framework/tplugins/tgstengine/tgstengine.cpp tupi-0.2+git05/src/framework/tplugins/tgstengine/tgstengine.cpp
--- tupi-0.2+git04/src/framework/tplugins/tgstengine/tgstengine.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tplugins/tgstengine/tgstengine.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,7 +35,6 @@
 
 #include "tgstengine.h"
 #include "talgorithm.h"
-#include "tdebug.h"
 
 #include <QtDebug>
 #include <QTimer>
diff -Nru tupi-0.2+git04/src/framework/tsound/taudioplayer.cpp tupi-0.2+git05/src/framework/tsound/taudioplayer.cpp
--- tupi-0.2+git04/src/framework/tsound/taudioplayer.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/framework/tsound/taudioplayer.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -33,9 +33,9 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
+#include "tglobal.h"
 #include "taudioplayer.h"
 #include "tglobal.h"
-#include "tdebug.h"
 
 #include <QDir>
 #include <QTimer>
diff -Nru tupi-0.2+git04/src/framework/tupconfig.pri tupi-0.2+git05/src/framework/tupconfig.pri
--- tupi-0.2+git04/src/framework/tupconfig.pri	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/framework/tupconfig.pri	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,2 @@
+
+DEFINES += HAVE_THEORA HAVE_LIBAV HAVE_QUAZIP HAVE_MULTIMEDIA HAVE_ZLIB VERSION=\\\"0.2\\\" CODE_NAME=\\\"Amandy\\\" REVISION=\\\"git05\\\" K_DEBUG
diff -Nru tupi-0.2+git04/src/libbase/libbase.pri tupi-0.2+git05/src/libbase/libbase.pri
--- tupi-0.2+git04/src/libbase/libbase.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/libbase.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,5 +1,9 @@
+unix {
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR -ltupibase
+}
 
-INCLUDEPATH += $$LIBBASE_DIR
-
-LIBS += -L$$LIBBASE_DIR -ltupibase
-
+win32 {
+    INCLUDEPATH += $$LIBBASE_DIR
+    LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+}
\ No newline at end of file
diff -Nru tupi-0.2+git04/src/libbase/libbase.pro tupi-0.2+git05/src/libbase/libbase.pro
--- tupi-0.2+git04/src/libbase/libbase.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/libbase.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,10 +1,13 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/libbase
-# Target is a library: tupibase
+QT += opengl core gui svg xml network
 
-!include(../../tupiglobal.pri) {
-    error("Please configure first")
+unix { 
+    !include(../../tupiglobal.pri) {
+        error("Please configure first")
+    }
+}
+
+win32 {
+    include(../../win.pri)
 }
 
 INSTALLS += target 
@@ -53,8 +56,6 @@
 
 FRAMEWORK_DIR = "../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-# QUAZIP_DIR = ../../3rdparty/quazip/
-# include($$QUAZIP_DIR/quazip.pri)
 LIBTUPI_DIR = ../libtupi
 include($$LIBTUPI_DIR/libtupi.pri)
 STORE_DIR = ../store
diff -Nru tupi-0.2+git04/src/libbase/tupanimationrenderer.cpp tupi-0.2+git05/src/libbase/tupanimationrenderer.cpp
--- tupi-0.2+git04/src/libbase/tupanimationrenderer.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupanimationrenderer.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -39,9 +39,6 @@
 #include "tupframe.h"
 #include "tupscene.h"
 #include "tupgraphicobject.h"
-#include "tdebug.h"
-
-#include <QPainter>
 
 struct TupAnimationRenderer::Private
 {
@@ -59,43 +56,50 @@
     int calculateTotalPhotograms(TupScene *scene);
 };
 
+TupAnimationRenderer::TupAnimationRenderer(const QColor color, TupLibrary *library) : k(new Private)
+{
+    k->bgColor = color;
+    k->scene = new TupGraphicsScene;
+    k->scene->setLibrary(library);
+    k->scene->setBackgroundBrush(k->bgColor);
+}
+
+TupAnimationRenderer::~TupAnimationRenderer()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupAnimationRenderer()]";
+        #else
+            TEND;
+        #endif
+    #endif
+
+    // SQA: Check why this instruction crashes the application 
+    // delete k;
+}
+
 int TupAnimationRenderer::Private::calculateTotalPhotograms(TupScene *scene)
 {
     Layers layers = scene->layers();
 
     int total = 0;
 
-    foreach (TupLayer *layer, layers.values()) {
-             if (layer)
-                 total = qMax(total, layer->frames().count());
+    int totalLayers = layers.size();
+    for (int i = 0; i < totalLayers; i++) {
+         TupLayer *layer = layers.at(i);
+         if (layer)
+             total = qMax(total, layer->frames().count());
     }
 
     return total;
 }
 
-TupAnimationRenderer::TupAnimationRenderer(const QColor color) : k(new Private)
-{
-    k->bgColor = color;
-    k->scene = new TupGraphicsScene;
-
-    int alpha = color.alpha();
-    if (alpha == 0)
-        k->scene->setBackgroundBrush(Qt::NoBrush);
-    else
-        k->scene->setBackgroundBrush(k->bgColor);
-}
-
-TupAnimationRenderer::~TupAnimationRenderer()
-{
-    delete k;
-}
-
 void TupAnimationRenderer::setScene(TupScene *scene, QSize dimension)
 {
     k->scene->setCurrentScene(scene);
     k->scene->setSceneRect(QRectF(QPointF(0,0), dimension));
 
-    k->scene->drawPhotogram(0, false); // ### SQA: Why whithout this doesn't work?
+    // k->scene->drawPhotogram(0, false); // ### SQA: Why whithout this doesn't work?
     k->currentPhotogram = -1;
 
     k->totalPhotograms = k->calculateTotalPhotograms(scene);
@@ -123,9 +127,6 @@
 
 void TupAnimationRenderer::render(QPainter *painter)
 {
-    // k->scene->render(painter, QRect(0, 0, painter->device()->width(), painter->device()->height()), 
-    //                  k->scene->sceneRect().toRect(), Qt::IgnoreAspectRatio);
-
     k->scene->render(painter, k->scene->sceneRect().toRect(), k->scene->sceneRect().toRect(), Qt::IgnoreAspectRatio);
 }
 
diff -Nru tupi-0.2+git04/src/libbase/tupanimationrenderer.h tupi-0.2+git05/src/libbase/tupanimationrenderer.h
--- tupi-0.2+git04/src/libbase/tupanimationrenderer.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupanimationrenderer.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,20 +36,24 @@
 #ifndef TUPANIMATIONRENDERER_H
 #define TUPANIMATIONRENDERER_H
 
+#include "tglobal.h"
+
 #include <QColor>
 #include <QSize>
+#include <QPainter>
 
 class QPainter;
 class TupScene;
+class TupLibrary;
 
 /**
  * @author David Cuadrado
 */
 
-class TupAnimationRenderer
+class TUPI_EXPORT TupAnimationRenderer
 {
     public:
-        TupAnimationRenderer(const QColor color);
+        TupAnimationRenderer(const QColor color, TupLibrary *library);
         ~TupAnimationRenderer();
 
         void setScene(TupScene *scene, QSize dimension);
diff -Nru tupi-0.2+git04/src/libbase/tupexportinterface.h tupi-0.2+git05/src/libbase/tupexportinterface.h
--- tupi-0.2+git04/src/libbase/tupexportinterface.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupexportinterface.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,8 +36,10 @@
 #ifndef TUPEXPORTINTERFACE_H
 #define TUPEXPORTINTERFACE_H
 
+#include "tglobal.h"
 #include "tupscene.h"
 #include "qplugin.h" // Q_EXPORT_PLUGIN
+#include "tuplibrary.h"
 
 #include <QStringList>
 #include <QDir>
@@ -73,8 +75,8 @@
         virtual ~TupExportInterface() {};
         virtual QString key() const = 0;
         virtual Formats availableFormats() = 0;
-        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, Format format, const QSize &size, int fps) = 0;
-        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size) = 0;
+        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, Format format, const QSize &size, int fps, TupLibrary *library) = 0;
+        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size, TupLibrary *library) = 0;
         virtual const char* getExceptionMsg() = 0;
 };
 
diff -Nru tupi-0.2+git04/src/libbase/tupexportpluginobject.h tupi-0.2+git05/src/libbase/tupexportpluginobject.h
--- tupi-0.2+git04/src/libbase/tupexportpluginobject.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupexportpluginobject.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef TUPEXPORTPLUGINOBJECT_H
 #define TUPEXPORTPLUGINOBJECT_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
 #include "tupexportinterface.h"
 
 #include <QObject>
diff -Nru tupi-0.2+git04/src/libbase/tupgraphicsscene.cpp tupi-0.2+git05/src/libbase/tupgraphicsscene.cpp
--- tupi-0.2+git04/src/libbase/tupgraphicsscene.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupgraphicsscene.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,6 @@
 #include "tupgraphicsscene.h"
 #include "tupscene.h"
 #include "tuplayer.h"
-
 #include "tupgraphicobject.h"
 #include "tupitemgroup.h"
 #include "tupprojectloader.h"
@@ -52,17 +51,8 @@
 #include "tuplineitem.h"
 #include "tuprectitem.h"
 #include "tupellipseitem.h"
-
-#include "tdebug.h"
 #include "tupguideline.h"
-
-#include <QGraphicsItem>
-#include <QSvgRenderer>
-#include <QGraphicsView>
-#include <QStyleOptionGraphicsItem>
-#include <QGraphicsSceneMouseEvent>
-#include <QKeyEvent>
-#include <QDesktopWidget>
+#include "tuplibrary.h"
 
 /**
  * This class defines the data structure and methods for handling animation scenes.
@@ -98,12 +88,17 @@
 
     QList<TupLineGuide *> lines;
     TupProject::Mode spaceMode;   
+    TupLibrary *library;
 };
 
 TupGraphicsScene::TupGraphicsScene() : QGraphicsScene(), k(new Private)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     setItemIndexMethod(QGraphicsScene::NoIndex);
@@ -128,17 +123,23 @@
 TupGraphicsScene::~TupGraphicsScene()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupGraphicsScene()]";
+        #else
+            TEND;
+        #endif
     #endif
 
     clearFocus();
     clearSelection();
 
-    foreach (QGraphicsView *view, this->views())
-             view->setScene(0);
-
-    foreach (QGraphicsItem *item, items())
-             removeItem(item);
+    // SQA: Check if these instructions are actually required
+    // foreach (QGraphicsView *view, this->views())
+    //          view->setScene(0);
+
+    // SQA: Check if these instructions are actually required
+    // foreach (QGraphicsItem *item, items())
+    //          removeItem(item);
 
     delete k;
 }
@@ -146,7 +147,11 @@
 void TupGraphicsScene::setCurrentFrame(int layer, int frame)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::setCurrentFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if ((frame != k->framePosition.frame && k->framePosition.frame >= 0) ||
@@ -166,7 +171,11 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::drawCurrentPhotogram()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -178,10 +187,9 @@
 
     if (k->spaceMode == TupProject::FRAMES_EDITION) {
         drawPhotogram(k->framePosition.frame, true);
-    // } else if (k->spaceMode == TupProject::STATIC_BACKGROUND_EDITION) {
     } else {
         cleanWorkSpace();
-        drawBackground(k->framePosition.frame);
+        drawSceneBackground(k->framePosition.frame);
     }
 }
 
@@ -189,27 +197,29 @@
 { 
     /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::drawPhotogram()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
-    // Q_CHECK_PTR(k->scene);
-
     if (photogram < 0 || !k->scene) 
         return;
 
     cleanWorkSpace();
+    // Painting the background
+    drawSceneBackground(photogram);
 
     bool valid = false;
 
     // Drawing frames from every layer
 
     for (int i=0; i < k->scene->layersTotal(); i++) {
-
          TupLayer *layer = k->scene->layer(i);
 
          if (layer->framesTotal() > 0 && photogram < layer->framesTotal()) {
-
              TupFrame *mainFrame = layer->frame(photogram);
 
              QString currentFrame = "";
@@ -219,14 +229,9 @@
 
                  if (layer) {
                      if (layer->isVisible()) {
-
-                         // Painting the background
-                         drawBackground(photogram);
-
                          // Painting previews frames
                          if (drawContext) {
                              if (k->onionSkin.previous > 0 && photogram > 0) {
-
                                  double opacity = k->opacity;
                                  double opacityFactor = opacity / (double)qMin(layer->frames().count(), k->onionSkin.previous);
 
@@ -250,9 +255,6 @@
                              }
                          }
 
-                         // valid = true;
-                         // k->layerCounter = i;
-                         // addFrame(mainFrame, Current);
                          addFrame(mainFrame);
 
                          // Painting next frames
@@ -280,6 +282,8 @@
                              }
                          }
 
+                         addLipSyncObjects(layer, photogram, mainFrame->getTopZLevel());
+
                          // SQA: Crashpoint when layers are deleted 
 
                          valid = true;
@@ -296,7 +300,6 @@
     if (valid) {
         addTweeningObjects(photogram);
         addSvgTweeningObjects(photogram);
-
         update();
     }
 
@@ -304,18 +307,29 @@
         k->tool->updateScene(this);
 }
 
-void TupGraphicsScene::drawBackground(int photogram)
+void TupGraphicsScene::drawSceneBackground(int photogram)
 {
-    /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::drawSceneBackground()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
-    */
 
     Q_CHECK_PTR(k->scene);
 
-    if (!k->scene)
+    if (!k->scene) {
+        #ifdef K_DEBUG
+            QString msg = "TupGraphicsScene::drawSceneBackground() - Warning: k->scene is NULL!";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
+        #endif
         return;
+    }
 
     TupBackground *bg = k->scene->background();
     if (bg) {
@@ -326,7 +340,12 @@
                     addFrame(frame, 1.0);
             } else {
                 #ifdef K_DEBUG
-                       tWarning() << "TupGraphicsScene::drawBackground() - Dynamic background frame is empty";
+                    QString msg = "TupGraphicsScene::drawSceneBackground() - Dynamic background frame is empty";
+                    #ifdef Q_OS_WIN32
+                        qWarning() << msg;
+                    #else
+                        tWarning() << msg;
+                    #endif
                 #endif
             }
         } else if (k->spaceMode == TupProject::FRAMES_EDITION) {
@@ -339,7 +358,12 @@
                        addItem(item);
                    } else {
                        #ifdef K_DEBUG
-                              tWarning() << "TupGraphicsScene::drawBackground() - Dynamic background frame is empty";
+                           QString msg = "TupGraphicsScene::drawSceneBackground() - Dynamic background frame is empty";
+                           #ifdef Q_OS_WIN32
+                               qWarning() << msg;
+                           #else
+                               tWarning() << msg;
+                           #endif
                        #endif
                    }
         }
@@ -362,7 +386,12 @@
                     addFrame(frame, 1.0);
             } else {
                 #ifdef K_DEBUG
-                       tWarning() << "TupGraphicsScene::drawBackground() - Static background frame is empty";
+                    QString msg = "TupGraphicsScene::drawSceneBackground() - Static background frame is empty";
+                    #ifdef Q_OS_WIN32
+                        qWarning() << msg;
+                    #else
+                        tWarning() << msg;
+                    #endif
                 #endif
             }
         }
@@ -373,7 +402,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::addFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -431,11 +464,13 @@
 
 void TupGraphicsScene::addGraphicObject(TupGraphicObject *object, double opacity)
 {
-    /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::addGraphicObject()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
-    */
 
     QGraphicsItem *item = object->item();
     k->onionSkin.opacityMap.insert(item, opacity);
@@ -444,17 +479,14 @@
         group->recoverChilds();
 
     if (! qgraphicsitem_cast<TupItemGroup *>(item->parentItem())) {
-
         item->setSelected(false);
         TupLayer *layer = k->scene->layer(k->framePosition.layer);
 
         if (layer) {
-
             TupFrame *frame = layer->frame(k->framePosition.frame);
 
             if (frame) {
                 item->setOpacity(opacity);
-                // k->objectCounter++;
                 addItem(item);
             }
         }
@@ -465,7 +497,11 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::addSvgObject()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -489,18 +525,33 @@
                 addItem(svgItem);
             } else {
                 #ifdef K_DEBUG
-                       tFatal() << "TupGraphicsScene::addSvgObject() - Error: Frame #" << k->framePosition.frame << " NO available!";
+                    QString msg = "TupGraphicsScene::addSvgObject() - Error: Frame #" + QString::number(k->framePosition.frame) + " NO available!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tFatal() << msg;
+                    #endif
                 #endif
             }
         } else {
                 #ifdef K_DEBUG
-                       tFatal() << "TupGraphicsScene::addSvgObject() - Error: Layer #" << k->framePosition.layer << " NO available!";
+                    QString msg = "TupGraphicsScene::addSvgObject() - Error: Layer #" + QString::number(k->framePosition.layer) + " NO available!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tFatal() << msg;
+                    #endif
                 #endif
         }
 
     } else {
         #ifdef K_DEBUG
-               tFatal() << "TupGraphicsScene::addSvgObject() - Error: No SVG item!";
+            QString msg = "TupGraphicsScene::addSvgObject() - Error: No SVG item!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
     } 
 } 
@@ -509,26 +560,27 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::addTweeningObjects()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
     QList<TupGraphicObject *> tweenList = k->scene->tweeningGraphicObjects();
 
     for (int i=0; i < tweenList.count(); i++) {
-
          TupGraphicObject *object = tweenList.at(i);
 
          if (object->frame()->layer()->isVisible()) {
              int origin = object->frame()->index();
 
              if (TupItemTweener *tween = object->tween()) {
-
                  int adjustX = object->item()->boundingRect().width()/2;
                  int adjustY = object->item()->boundingRect().height()/2;
 
                  if (origin == photogram) {
-
                      TupTweenerStep *stepItem = tween->stepAt(0);
                      object->item()->setToolTip(tween->tweenType() + ": " + tween->name() + tr("/Step: 0"));
 
@@ -536,7 +588,6 @@
                          object->item()->setTransformOriginPoint(tween->transformOriginPoint());
 
                          if (stepItem->has(TupTweenerStep::Position)) {
-                             // tFatal() << "TupGraphicsScene::addTweeningObjects() - Applying position...";
                              QPointF point = QPoint(-adjustX, -adjustY);
                              object->setLastTweenPos(stepItem->position() + point);
                              object->item()->setPos(tween->transformOriginPoint());
@@ -547,13 +598,8 @@
                              object->item()->setTransformOriginPoint(rect.center());
                              double angle = stepItem->rotation();
                              object->item()->setRotation(angle);
-                             // tFatal() << "TupGraphicsScene::addTweeningObjects() - Applying rotation - Angle: " << angle;
-                         } else {
-                             // tFatal() << "TupGraphicsScene::addTweeningObjects() - No rotation parameter!";
-                         }
-                         
+                         } 
                      } else {
-
                          if (stepItem->has(TupTweenerStep::Position)) {
                              QPointF point = QPoint(-adjustX, -adjustY);
                              object->setLastTweenPos(stepItem->position() + point);
@@ -604,7 +650,6 @@
                      }
 
                  } else if ((origin < photogram) && (photogram < origin + tween->frames())) {
-
                             int step = photogram - origin;
                             TupTweenerStep *stepItem = tween->stepAt(step);
                             object->item()->setToolTip(tween->tweenType() + ": " + tween->name() + tr("/Step: ") + QString::number(step));
@@ -703,26 +748,27 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::addSvgTweeningObjects()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
     QList<TupSvgItem *> svgList = k->scene->tweeningSvgObjects();
 
     for (int i=0; i < svgList.count(); i++) {
-
          TupSvgItem *object = svgList.at(i);
 
          if (object->frame()->layer()->isVisible()) {
              int origin = object->frame()->index();
 
              if (TupItemTweener *tween = object->tween()) {
-
                  int adjustX = object->boundingRect().width()/2;
                  int adjustY = object->boundingRect().height()/2;
 
                  if (origin == photogram) {
-
                      TupTweenerStep *stepItem = tween->stepAt(0);
                      object->setToolTip(tween->tweenType() + ": " + tween->name() + tr("/Step: 0"));
 
@@ -804,18 +850,65 @@
                  }
              } else {
                  #ifdef K_DEBUG
-                        tFatal() << "TupGraphicsScene::addSvgTweeningObjects() - No tween found!";
+                     QString msg = "TupGraphicsScene::addSvgTweeningObjects() - No tween found!";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tFatal() << msg;
+                     #endif
                  #endif
              }
          }
     }
 }
 
+void TupGraphicsScene::addLipSyncObjects(TupLayer *layer, int photogram, int zLevel)
+{
+    if (layer->lipSyncCount() > 0) {
+        Mouths mouths = layer->lipSyncList();
+        for (int i=0; i<mouths.count(); i++) {
+             TupLipSync *lipSync = mouths.at(i);
+             int initFrame = lipSync->initFrame();
+
+             if ((photogram >= initFrame) && (photogram <= initFrame + lipSync->framesTotal())) {
+                 QString name = lipSync->name();
+                 TupLibraryFolder *folder = k->library->getFolder(name);
+                 if (folder) {
+                     QList<TupVoice *> voices = lipSync->voices();
+                     int total = voices.count();
+                     for(int i=0; i < total; i++) {
+                         TupVoice *voice = voices.at(i);
+                         int index = photogram - initFrame; 
+                         if (voice->contains(index)) {
+                             // Add image here
+                             QString phoneme = voice->getPhoneme(index);
+                             TupLibraryObject *image = folder->getObject(phoneme + lipSync->picExtension());
+                             if (image) {
+                                 TupGraphicLibraryItem *item = new TupGraphicLibraryItem(image);
+                                 if (item) {
+                                     item->setPos(voice->mouthPos());
+                                     item->setToolTip(tr("lipsync:") + name + ":" + QString::number(i));
+                                     item->setZValue(zLevel);
+                                     addItem(item);
+                                 }
+                             }
+                         }
+                     }
+                 } 
+             }
+        }
+    }
+}
+
 void TupGraphicsScene::cleanWorkSpace()
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::cleanWorkSpace()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -834,7 +927,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::currentFrameIndex()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -845,7 +942,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::currentLayerIndex()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -856,13 +957,22 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::currentSceneIndex()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
     if (!k->scene) {
         #ifdef K_DEBUG
-               tError() << "TupGraphicsScene::currentSceneIndex() - Error: Scene index is -1";
+            QString msg = "TupGraphicsScene::currentSceneIndex() - Error: Scene index is -1";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return -1;
     }
@@ -874,7 +984,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::setNextOnionSkinCount()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -887,7 +1001,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::setPreviousOnionSkinCount()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -900,30 +1018,30 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32 
+            qDebug() << "[TupGraphicsScene::currentFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
     if (k->scene) {
-
         if (k->scene->layersTotal() > 0) {
-
             if (k->framePosition.layer < k->scene->layersTotal()) {
-  
-                if (k->scene->layers().contains(k->framePosition.layer)) {
-                    TupLayer *layer = k->scene->layer(k->framePosition.layer);
-                    Q_CHECK_PTR(layer);
-                    if (layer) {
-                        if (!layer->frames().isEmpty())
-                            return layer->frame(k->framePosition.frame);
-                    } else {
-                        #ifdef K_DEBUG
-                               tFatal() << "TupGraphicsScene::currentFrame - No layer available: " << k->framePosition.frame;
-                        #endif
-                    }
+                TupLayer *layer = k->scene->layer(k->framePosition.layer);
+                Q_CHECK_PTR(layer);
+                if (layer) {
+                    if (!layer->frames().isEmpty())
+                        return layer->frame(k->framePosition.frame);
                 } else {
                     #ifdef K_DEBUG
-                           tFatal() << "TupGraphicsScene::currentFrame - Layer index incorrect!"; 
+                        QString msg = "TupGraphicsScene::currentFrame - No layer available at -> " + QString::number(k->framePosition.frame); 
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tFatal() << msg;
+                        #endif
                     #endif
                 }
             } else {
@@ -943,13 +1061,15 @@
 
 void TupGraphicsScene::setCurrentScene(TupScene *scene)
 {
-    Q_CHECK_PTR(scene);
-
-    /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::setCurrentScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
-    */
+
+    Q_CHECK_PTR(scene);
 
     setCurrentFrame(0, 0);
 
@@ -965,7 +1085,7 @@
     if (k->spaceMode == TupProject::FRAMES_EDITION) {
         drawCurrentPhotogram();
     } else if (k->spaceMode == TupProject::STATIC_BACKGROUND_EDITION) {
-               drawBackground(k->framePosition.frame);
+               drawSceneBackground(k->framePosition.frame);
     }
 }
 
@@ -973,7 +1093,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::setLayerVisible()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -988,7 +1112,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::scene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -1000,20 +1128,23 @@
 
 void TupGraphicsScene::setTool(TupToolPlugin *tool)
 {
-    /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::setTool()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
-    */
 
+    // SQA: Check if this code is really required
     if (k->spaceMode == TupProject::FRAMES_EDITION) {
         drawCurrentPhotogram();
     } else {
         cleanWorkSpace();
-        drawBackground(k->framePosition.frame);
+        drawSceneBackground(k->framePosition.frame);
     }
 
-    /* SQA: Code under revision
+    /* SQA: Code under revision (related to Line Guides) 
     if (k->tool) {
         if (k->tool->toolType() == TupToolPlugin::Selection) {
             foreach (TupLineGuide *line, k->lines) {
@@ -1046,7 +1177,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::currentTool()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -1057,7 +1192,11 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::mousePressEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -1073,7 +1212,7 @@
                 return;
 
             if (k->tool->toolType() == TupToolPlugin::Tweener && event->isAccepted()) {
-                tFatal() << "TupGraphicsScene::mousePressEvent() - Tracing!";
+                // tFatal() << "TupGraphicsScene::mousePressEvent() - Tracing!";
                 if (k->tool->currentEditMode() == TupToolPlugin::Properties)
                     return;
             } 
@@ -1097,7 +1236,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::mouseMoveEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -1114,7 +1257,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::mouseMoved()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -1128,7 +1275,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::mouseReleaseEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -1145,7 +1296,11 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::mouseReleased()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -1158,7 +1313,12 @@
     if (currentFrame()) {
         if (currentFrame()->isLocked()) {
             #ifdef K_DEBUG
-                   tFatal() << "TupGraphicsScene::mouseReleased() - Frame is locked!";
+                QString msg = "TupGraphicsScene::mouseReleased() - Frame is locked!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tFatal() << msg;
+                #endif
             #endif
             return;
         }
@@ -1171,14 +1331,7 @@
             k->tool->release(k->inputInformation, k->brushManager, this);
             k->tool->end();
         }
-    } else {
-        if (k->tool) { 
-           if (k->tool->name().compare(tr("Zoom In")) == 0 || k->tool->name().compare(tr("Zoom Out")) == 0) {
-               if (event->button() != Qt::RightButton) 
-                   k->tool->release(k->inputInformation, k->brushManager, this);
-           }
-        }
-    }
+    } 
 
     k->isDrawing = false;
 }
@@ -1187,7 +1340,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::mouseDoubleClickEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -1225,14 +1382,10 @@
 
 /*
 
-// TODO: Check this code, not sure whether it does something or it's handy :S
+// SQA: Check this code, not sure whether it does something or it's handy :S
 
 void TupGraphicsScene::dragEnterEvent(QGraphicsSceneDragDropEvent * event)
 {
-    #ifdef K_DEBUG
-       T_FUNCINFO;
-    #endif
-
     if (event->mimeData()->hasFormat("tupi-ruler"))
         event->acceptProposedAction();
 
@@ -1292,7 +1445,11 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFOX("scene");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::sceneResponse()]";
+        #else
+            T_FUNCINFOX("scene");
+        #endif
     #endif
     */
 
@@ -1304,7 +1461,11 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFOX("scene");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::layerResponse()]";
+        #else
+            T_FUNCINFOX("layer");
+        #endif
     #endif
     */
 
@@ -1316,7 +1477,11 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFOX("scene");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::frameResponse()]";
+        #else
+            T_FUNCINFOX("frame");
+        #endif
     #endif
     */
 
@@ -1328,7 +1493,11 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFOX("scene");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::itemResponse()]";
+        #else
+            T_FUNCINFOX("item");
+        #endif
     #endif
     */
    
@@ -1366,7 +1535,11 @@
 {
     /*
     #ifdef K_DEBUG
-       T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicsScene::includeObject()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -1438,3 +1611,13 @@
     else
         return -1;
 }
+
+void TupGraphicsScene::setLibrary(TupLibrary *library)
+{
+    k->library = library;
+}
+
+void TupGraphicsScene::resetCurrentTool() 
+{
+    k->tool->init(this);
+}
diff -Nru tupi-0.2+git04/src/libbase/tupgraphicsscene.h tupi-0.2+git05/src/libbase/tupgraphicsscene.h
--- tupi-0.2+git04/src/libbase/tupgraphicsscene.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupgraphicsscene.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,12 +36,19 @@
 #ifndef TUPGRAPHICSSCENE_H
 #define TUPGRAPHICSSCENE_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
 #include "tupsvgitem.h"
 #include "tupproject.h"
 #include "tupprojectresponse.h"
 
 #include <QGraphicsScene>
+#include <QGraphicsItem>
+#include <QSvgRenderer>
+#include <QGraphicsView>
+#include <QStyleOptionGraphicsItem>
+#include <QGraphicsSceneMouseEvent>
+#include <QKeyEvent>
+#include <QDesktopWidget>
 
 /**
  * @author David Cuadrado
@@ -72,7 +79,7 @@
         void drawCurrentPhotogram();
         
         void drawPhotogram(int photogram, bool drawContext);
-        void drawBackground(int photogram);
+        void drawSceneBackground(int photogram);
 
         void cleanWorkSpace();
         void removeScene();
@@ -116,6 +123,10 @@
 
         int framesTotal();
 
+        void setLibrary(TupLibrary *library);
+
+        void resetCurrentTool(); 
+
     // private slots:
     //  void updateObjectInformation(const QString &value);
     //  void showInfoWidget();
@@ -130,6 +141,7 @@
         void addSvgObject(TupSvgItem *svgItem, double opacity = 1.0);
         void addTweeningObjects(int photogram);
         void addSvgTweeningObjects(int photogram);
+        void addLipSyncObjects(TupLayer *layer, int photogram, int zLevel);
 
     protected:
         virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
diff -Nru tupi-0.2+git04/src/libbase/tupguideline.cpp tupi-0.2+git05/src/libbase/tupguideline.cpp
--- tupi-0.2+git04/src/libbase/tupguideline.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupguideline.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,23 +35,15 @@
 
 #include "tupguideline.h"
 
-#include <QGraphicsScene>
-#include <QPainter>
-#include <QCursor>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsView>
-#include <QDebug>
-#include <QApplication>
-
 struct TupLineGuide::Private
 {
     Qt::Orientation orientation;
     bool enabled;
 };
 
-TupLineGuide::TupLineGuide(Qt::Orientation o ,QGraphicsScene *scene): QGraphicsItem(0, scene), k(new Private)
+TupLineGuide::TupLineGuide(Qt::Orientation orientation): QGraphicsItem(0), k(new Private)
 {
-    k->orientation = o;
+    k->orientation = orientation;
     k->enabled = true;
     // setAcceptsHoverEvents(true);
     // setAcceptedMouseButtons(0);
diff -Nru tupi-0.2+git04/src/libbase/tupguideline.h tupi-0.2+git05/src/libbase/tupguideline.h
--- tupi-0.2+git04/src/libbase/tupguideline.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupguideline.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,8 +36,15 @@
 #ifndef TUPLINEGUIDE_H
 #define TUPLINEGUIDE_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
+
 #include <QGraphicsItem>
+#include <QGraphicsScene>
+#include <QPainter>
+#include <QCursor>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QApplication>
 
 /**
  * @author Jorge Cuadrado
@@ -46,7 +53,7 @@
 class TUPI_EXPORT TupLineGuide : public QGraphicsItem
 {
     public:
-        TupLineGuide(Qt::Orientation o, QGraphicsScene *scene);
+        TupLineGuide(Qt::Orientation orientation);
         ~TupLineGuide();
         
         QRectF boundingRect() const;
diff -Nru tupi-0.2+git04/src/libbase/tupmodulewidgetbase.cpp tupi-0.2+git05/src/libbase/tupmodulewidgetbase.cpp
--- tupi-0.2+git04/src/libbase/tupmodulewidgetbase.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupmodulewidgetbase.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,11 +34,6 @@
  ***************************************************************************/
 
 #include "tupmodulewidgetbase.h"
-#include "tdebug.h"
-
-#include <QEvent>
-#include <QBoxLayout>
-#include <QDialog>
 
 struct TupModuleWidgetBase::Private
 {
diff -Nru tupi-0.2+git04/src/libbase/tupmodulewidgetbase.h tupi-0.2+git05/src/libbase/tupmodulewidgetbase.h
--- tupi-0.2+git04/src/libbase/tupmodulewidgetbase.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupmodulewidgetbase.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,17 +36,19 @@
 #ifndef TUPMODULEWIDGETBASE_H
 #define TUPMODULEWIDGETBASE_H
 
+#include "tglobal.h"
 #include "tosd.h"
 #include "tupprojectresponse.h"
 #include "tupabstractprojectresponsehandler.h"
-#include "tupglobal.h"
 
 #include <QLayout>
 #include <QSizePolicy> 
 #include <QObject>
 #include <QEvent>
-#include <QBoxLayout>
 #include <QDockWidget>
+#include <QEvent>
+#include <QBoxLayout>
+#include <QDialog>
 
 /**
  * @author Jorge Cuadrado
diff -Nru tupi-0.2+git04/src/libbase/tuppaintareabase.cpp tupi-0.2+git05/src/libbase/tuppaintareabase.cpp
--- tupi-0.2+git04/src/libbase/tuppaintareabase.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tuppaintareabase.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -44,22 +44,9 @@
 // Tupi Framework 
 #include "tupscene.h"
 #include "tconfig.h"
-#include "tdebug.h"
 #include "tapplication.h"
 #include "tosd.h"
 
-#include <QGraphicsScene>
-#include <QMouseEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsRectItem>
-#include <QPolygon>
-#include <QApplication>
-#include <QTimer>
-#include <QStyleOptionGraphicsItem>
-#include <QClipboard>
-
-#include <cmath>
-
 #ifdef QT_OPENGL_LIB
 
 #include <QGLWidget>
@@ -112,9 +99,10 @@
     QPen blackPen;
 };
 
-TupPaintAreaBase::TupPaintAreaBase(QWidget *parent, QSize dimension) : QGraphicsView(parent), k(new Private)
+TupPaintAreaBase::TupPaintAreaBase(QWidget *parent, QSize dimension, TupLibrary *library) : QGraphicsView(parent), k(new Private)
 {
     k->scene = new TupGraphicsScene();
+    k->scene->setLibrary(library);
     k->grid = 0;
 
     k->greenThickPen = QPen(QColor(0, 135, 0, 255), 2);
@@ -184,7 +172,13 @@
 
 void TupPaintAreaBase::setUseOpenGL(bool opengl)
 {
-    T_FUNCINFO << opengl;
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintAreaBase::setUseOpenGL()] - opengl: " << opengl;
+        #else
+            T_FUNCINFO << opengl;
+        #endif
+    #endif
 
     QCursor cursor(Qt::ArrowCursor);
     if (viewport())
@@ -198,7 +192,14 @@
         }
 #else
         Q_UNUSED(opengl);
-        kWarning() << tr("OpenGL isn't supported");
+        #ifdef K_DEBUG
+            QString msg = "OpenGL isn't supported";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                kWarning() << msg;
+            #endif
+        #endif
 #endif
 
     // to restore the cursor.
@@ -224,7 +225,12 @@
 {
     if (!scene()) {
         #ifdef K_DEBUG
-               tDebug() << "TupPaintAreaBase::setTool() - Fatal Error: No scene available";
+            QString msg = "TupPaintAreaBase::setTool() - Fatal Error: No scene available";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return;
     }
@@ -251,13 +257,23 @@
 void TupPaintAreaBase::mousePressEvent(QMouseEvent * event)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintAreaBase::mousePressEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (!canPaint()) { 
         #ifdef K_DEBUG
-               tDebug() << "TupPaintAreaBase::mousePressEvent -> I can't paint right now!";
+            QString msg = "TupPaintAreaBase::mousePressEvent() -> I can't paint right now!";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
+
         return;
     }
 
@@ -269,8 +285,14 @@
 {
     if (!canPaint()) { 
         #ifdef K_DEBUG
-               tWarning() << "TupPaintAreaBase::mouseMoveEvent() - The canvas is busy. Can't paint!";
+            QString msg = "TupPaintAreaBase::mouseMoveEvent() - Canvas is busy. Can't paint!";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
+
         return;
     }
 
@@ -482,7 +504,11 @@
 bool TupPaintAreaBase::canPaint() const
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupPaintAreaBase::canPaint()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (k->scene) {
@@ -492,7 +518,12 @@
         }
     } else {
         #ifdef K_DEBUG
-               tWarning() << "TupPaintAreaBase::canPaint() - Warning: Scene is NULL!";
+            QString msg = "TupPaintAreaBase::canPaint() - Warning: Scene is NULL!";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
     }
 
@@ -512,13 +543,6 @@
 void TupPaintAreaBase::wheelEvent(QWheelEvent *event)
 {
     scaleView(pow((double)2, event->delta() / 520.0));
-
-    /*
-    if (event->modifiers() == Qt::ControlModifier)
-        scaleView(pow((double)2, -event->delta() / 240.0));
-    else
-        QGraphicsView::wheelEvent(event);
-    */
 }
 
 bool TupPaintAreaBase::viewportEvent(QEvent *event)
@@ -535,8 +559,6 @@
 
 void TupPaintAreaBase::scaleView(qreal scaleFactor)
 {
-    // SQA: Check if this method is called for some class
-
     qreal factor = matrix().scale(scaleFactor, scaleFactor).mapRect(QRectF(0, 0, 1, 1)).width();
 
     if (factor < 0.07 || factor > 100)
diff -Nru tupi-0.2+git04/src/libbase/tuppaintareabase.h tupi-0.2+git05/src/libbase/tuppaintareabase.h
--- tupi-0.2+git04/src/libbase/tuppaintareabase.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tuppaintareabase.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,10 +36,21 @@
 #ifndef TUPPAINTAREABASE_H
 #define TUPPAINTAREABASE_H
 
+#include "tglobal.h"
 #include "tuptoolplugin.h"
-#include "tupglobal.h"
 
 #include <QGraphicsView>
+#include <QGraphicsScene>
+#include <QMouseEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsRectItem>
+#include <QPolygon>
+#include <QApplication>
+#include <QTimer>
+#include <QStyleOptionGraphicsItem>
+#include <QClipboard>
+
+#include <cmath>
 
 class QGraphicsRectItem;
 class TupBrushManager;
@@ -57,7 +68,7 @@
     Q_OBJECT
 
     public:
-        TupPaintAreaBase(QWidget * parent = 0, QSize dimension = QSize(0, 0));
+        TupPaintAreaBase(QWidget * parent = 0, QSize dimension = QSize(0, 0), TupLibrary *library = 0);
         ~TupPaintAreaBase();
 
         void setBgColor(const QColor color);
@@ -103,7 +114,7 @@
         void cursorPosition(const QPointF &pos);
         void requestTriggered(const TupProjectRequest *event);
         void changedZero(const QPointF &zero);
-        void scaled(double scaleFactor);
+        void scaled(qreal scaleFactor);
         void rotated(int angle);
 
     public slots:
diff -Nru tupi-0.2+git04/src/libbase/tuppaintarearotator.cpp tupi-0.2+git05/src/libbase/tuppaintarearotator.cpp
--- tupi-0.2+git04/src/libbase/tuppaintarearotator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tuppaintarearotator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,9 +35,6 @@
 
 #include "tuppaintarearotator.h"
 #include "tuppaintareabase.h"
-#include "tdebug.h"
-
-#include <QTimer>
 
 struct TupPaintAreaRotator::Private
 {
diff -Nru tupi-0.2+git04/src/libbase/tuppaintarearotator.h tupi-0.2+git05/src/libbase/tuppaintarearotator.h
--- tupi-0.2+git04/src/libbase/tuppaintarearotator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tuppaintarearotator.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,8 +36,10 @@
 #ifndef TUPPAINTAREAROTATOR_H
 #define TUPPAINTAREAROTATOR_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
+
 #include <QObject>
+#include <QTimer>
 
 class TupPaintAreaBase;
 
diff -Nru tupi-0.2+git04/src/libbase/tuppluginmanager.cpp tupi-0.2+git05/src/libbase/tuppluginmanager.cpp
--- tupi-0.2+git04/src/libbase/tuppluginmanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tuppluginmanager.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -37,11 +37,6 @@
 #include "tupfilterinterface.h"
 #include "tuptoolinterface.h"
 #include "tupexportinterface.h"
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QPluginLoader>
-#include <QDir>
 
 TupPluginManager *TupPluginManager::s_instance = 0;
 
@@ -73,7 +68,12 @@
 void TupPluginManager::loadPlugins()
 {
     #ifdef K_DEBUG
-           tWarning("plugins") << "TupPluginManager::loadPlugins() - Loading plugins...";
+        QString msg = "TupPluginManager::loadPlugins() - Loading plugins...";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
     #endif
 
     k->filters.clear();
@@ -87,7 +87,11 @@
              QObject *plugin = qobject_cast<QObject*>(loader->instance());
 
              #ifdef K_DEBUG
-                    tDebug("plugins") << "*** Trying to load plugin from: " << fileName;
+                 #ifdef Q_OS_WIN32
+                     qWarning() << "TupPluginManager::loadPlugins() - Trying to load plugin from: " << fileName;
+                 #else
+                     tWarning("plugins") << "*** Trying to load plugin from: " << fileName;
+                 #endif
              #endif
         
              if (plugin) {
@@ -110,7 +114,12 @@
                  k->loaders << loader;
              } else {
                  #ifdef K_DEBUG
-                        tError("plugins") << "TupPluginManager::loadPlugins() - Cannot load plugin, error was: " << loader->errorString();
+                     QString msg = "TupPluginManager::loadPlugins() - Cannot load plugin, error was: " + loader->errorString();
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
              }
     }
@@ -119,7 +128,12 @@
 void TupPluginManager::unloadPlugins()
 {
     #ifdef K_DEBUG
-           tWarning("plugins") << "TupPluginManager::unloadPlugins() - Unloading plugins...";
+        QString msg = "TupPluginManager::unloadPlugins() - Unloading plugins...";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
     #endif
 
     foreach (QPluginLoader *loader, k->loaders) {
diff -Nru tupi-0.2+git04/src/libbase/tuppluginmanager.h tupi-0.2+git05/src/libbase/tuppluginmanager.h
--- tupi-0.2+git04/src/libbase/tuppluginmanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tuppluginmanager.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,8 +36,11 @@
 #ifndef TUPPLUGINMANAGER_H
 #define TUPPLUGINMANAGER_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
+
 #include <QObject>
+#include <QPluginLoader>
+#include <QDir>
 
 class QPluginLoader;
 
diff -Nru tupi-0.2+git04/src/libbase/tuptoolinterface.h tupi-0.2+git05/src/libbase/tuptoolinterface.h
--- tupi-0.2+git04/src/libbase/tuptoolinterface.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tuptoolinterface.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,13 +33,13 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef ATOOLINTERFACE_H
-#define ATOOLINTERFACE_H
+#ifndef TUPTOOLINTERFACE_H
+#define TUPTOOLINTERFACE_H
 
+#include "tglobal.h"
 #include "tupframe.h"
 #include "taction.h"
 #include "qplugin.h" // Q_EXPORT_PLUGIN
-#include "tupglobal.h"
 
 #include <QStringList>
 #include <QRect>
@@ -69,7 +69,8 @@
             Fill,
             Selection,
             View,
-            Tweener
+            Tweener,
+            LipSync
         };
         
         virtual ~TupToolInterface() {};
diff -Nru tupi-0.2+git04/src/libbase/tuptoolplugin.cpp tupi-0.2+git05/src/libbase/tuptoolplugin.cpp
--- tupi-0.2+git04/src/libbase/tuptoolplugin.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tuptoolplugin.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -1,4 +1,5 @@
 /***************************************************************************
+
  *   Project TUPI: Magia 2D                                                *
  *   Project Contact: info@maefloresta.com                                 *
  *   Project Website: http://www.maefloresta.com                           *
@@ -38,12 +39,6 @@
 #include "tupinputdeviceinformation.h"
 #include "tupgraphicsscene.h"
 
-#include "tdebug.h"
-
-#include <QGraphicsView>
-#include <QCursor>
-#include <QMenu>
-
 struct TupToolPlugin::Private
 {
     QString currentTool;
@@ -80,12 +75,26 @@
 
 void TupToolPlugin::begin()
 {
-    tDebug("tools") << "Begin: " << k->currentTool;
+#ifdef K_DEBUG
+    QString msg = "TupToolPlugin::begin() - Begin: " + k->currentTool;
+    #ifdef Q_OS_WIN32
+        qWarning() << msg;
+    #else
+        tWarning() << msg;
+    #endif
+#endif
 }
 
 void TupToolPlugin::end()
 {
-    tDebug("tools") << "End: " << k->currentTool;
+#ifdef K_DEBUG
+    QString msg = "TupToolPlugin::end() - End: " + k->currentTool;
+    #ifdef Q_OS_WIN32
+        qWarning() << msg;
+    #else
+        tWarning("tools") << msg;
+    #endif
+#endif
 }
 
 void TupToolPlugin::sceneResponse(const TupSceneResponse *event)
@@ -157,9 +166,11 @@
     Q_UNUSED(factor);
 }
 
+/*
 void TupToolPlugin::autoZoom()
 {
 }
+*/
 
 void TupToolPlugin::setProjectSize(const QSize size)
 {
@@ -233,6 +244,7 @@
                  tool = TupToolPlugin::ContourTool;
             break;
 
+            /*
             case Qt::Key_Z:
                  menu = TupToolPlugin::ZoomMenu;
                  if (modifiers == Qt::ShiftModifier)
@@ -240,10 +252,11 @@
                  else
                      tool = TupToolPlugin::ZoomInTool;
             break;
+            */
 
             case Qt::Key_H:
                  menu = TupToolPlugin::ZoomMenu;
-                 tool = TupToolPlugin::HandTool;
+                 tool = TupToolPlugin::ShiftTool;
             break;
 
             case Qt::Key_Right:
@@ -288,3 +301,23 @@
     return TupToolPlugin::None;
 }
 
+void TupToolPlugin::setActiveView(const QString &viewID)
+{
+    Q_UNUSED(viewID);
+}
+
+/*
+void TupToolPlugin::addNewItem(const QString &id)
+{
+    Q_UNUSED(id);
+}
+*/
+
+void TupToolPlugin::setCurrentItem(const QString &id)
+{
+    Q_UNUSED(id);
+}
+
+void TupToolPlugin::updateWorkSpaceContext()
+{
+}
diff -Nru tupi-0.2+git04/src/libbase/tuptoolplugin.h tupi-0.2+git05/src/libbase/tuptoolplugin.h
--- tupi-0.2+git04/src/libbase/tuptoolplugin.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tuptoolplugin.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,12 +36,15 @@
 #ifndef TUPTOOLPLUGIN_H
 #define TUPTOOLPLUGIN_H
 
+#include "tglobal.h"
 #include "tuptoolinterface.h"
-#include "tupglobal.h"
 #include "tupprojectresponse.h"
 
 #include <QObject>
 #include <QSize>
+#include <QGraphicsView>
+#include <QCursor>
+#include <QMenu>
 
 class TupGraphicsScene;
 class QGraphicsView;
@@ -63,7 +66,8 @@
         enum BrushTools { InvalidBrush = -1, PencilTool = 0, InkTool, EraserTool, PolyLineTool, LineTool, RectangleTool, EllipseTool, TextTool, FrameBack, FrameForward, QuickCopy, Delete };
         enum SelectTools { InvalidSelection = -1, NodesTool = 0, ObjectsTool };
         enum FillTools { InvalidFill = -1, InsideTool = 0, ContourTool };
-        enum ViewTools { InvalidView = -1, ZoomInTool = 0, ZoomOutTool, HandTool };
+        // enum ViewTools { InvalidView = -1, ZoomInTool = 0, ZoomOutTool, ShiftTool };
+        enum ViewTools { InvalidView = -1, ShiftTool };
         enum ColorTools { InvalidColor = -1, ColorTool = 0 };
 
         enum Mode { Add = 1, Edit, View };
@@ -107,11 +111,17 @@
         virtual void resizeNodes(qreal factor);
         virtual void updateZoomFactor(qreal factor);
 
-        virtual void autoZoom();
+        // virtual void autoZoom();
         virtual void setProjectSize(const QSize size);
 
         virtual TupToolPlugin::Mode currentMode();
         virtual TupToolPlugin::EditMode currentEditMode();
+
+        virtual void setActiveView(const QString &viewID);
+        // virtual void addNewItem(const QString &id);
+        virtual void setCurrentItem(const QString &id);
+
+        virtual void updateWorkSpaceContext();
         
     signals:
         void requested(const TupProjectRequest *request);
diff -Nru tupi-0.2+git04/src/libbase/tupwebhunter.cpp tupi-0.2+git05/src/libbase/tupwebhunter.cpp
--- tupi-0.2+git04/src/libbase/tupwebhunter.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupwebhunter.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -33,15 +33,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#include <QtGui>
-#include <QtNetwork>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QDomDocument>
-#include <QEventLoop>
-
 #include "tupwebhunter.h"
-#include "tdebug.h"
 
 QString TupWebHunter::BROWSER_FINGERPRINT = QString("Tupi_Browser 1.0");
 
@@ -73,7 +65,8 @@
 
     QNetworkRequest request;
     request.setUrl(QUrl(k->url));
-    request.setRawHeader("User-Agent", BROWSER_FINGERPRINT.toAscii());
+    // request.setRawHeader("User-Agent", BROWSER_FINGERPRINT.toAscii());
+    request.setRawHeader("User-Agent", BROWSER_FINGERPRINT.toLatin1());
 
     QNetworkReply *reply = manager->get(request);
     connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(slotError(QNetworkReply::NetworkError)));
@@ -110,28 +103,63 @@
     switch (error) {
             case QNetworkReply::HostNotFoundError:
                  { 
-                     tError() << "TupWebHunter::slotError() - Network Error: Host not found";
+                 #ifdef K_DEBUG
+                     QString msg = "TupWebHunter::slotError() - Network Error: Host not found";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
+                 #endif
                  }
             break;
             case QNetworkReply::TimeoutError:
                  {
-                     tError() << "TupWebHunter::slotError() - Network Error: Time out!";
+                 #ifdef K_DEBUG
+                     QString msg = "TupWebHunter::slotError() - Network Error: Time out!";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
+                 #endif
                  }
             break;
             case QNetworkReply::ConnectionRefusedError:
                  {
-                     tError() << "TupWebHunter::slotError() - Network Error: Connection Refused!";
+                 #ifdef K_DEBUG
+                     QString msg = "TupWebHunter::slotError() - Network Error: Connection Refused!";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
+                 #endif
                  }
             break;
             case QNetworkReply::ContentNotFoundError:
                  {
-                     tError() << "TupWebHunter::slotError() - Network Error: Content not found!";
+                 #ifdef K_DEBUG
+                     QString msg = "TupWebHunter::slotError() - Network Error: Content not found!";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
+                 #endif
                  }
             break;
             case QNetworkReply::UnknownNetworkError:
             default:
                  {
-                     tError() << "TupWebHunter::slotError() - Network Error: Unknown Network error!";
+                 #ifdef K_DEBUG
+                     QString msg = "TupWebHunter::slotError() - Network Error: Unknown Network error!";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
+                 #endif
                  }
             break;
     }
diff -Nru tupi-0.2+git04/src/libbase/tupwebhunter.h tupi-0.2+git05/src/libbase/tupwebhunter.h
--- tupi-0.2+git04/src/libbase/tupwebhunter.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libbase/tupwebhunter.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,18 +36,23 @@
 #ifndef TUPWEBHUNTER_H
 #define TUPWEBHUNTER_H
 
+#include "tglobal.h"
 #include "tapplicationproperties.h"
 #include "tupsvgitem.h"
 
-#include <QWidget>
+#include <QObject>
+#include <QtNetwork>
 #include <QNetworkReply>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QFile>
 #include <QByteArray>
 #include <QList>
+#include <QtGui>
+#include <QDomDocument>
+#include <QEventLoop>
 
-class TupWebHunter : public QObject
+class TUPI_EXPORT TupWebHunter : public QObject
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/libtupi/libtupi.pri tupi-0.2+git05/src/libtupi/libtupi.pri
--- tupi-0.2+git04/src/libtupi/libtupi.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/libtupi.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,4 +1,9 @@
-INCLUDEPATH += $$LIBTUPI_DIR
-
-LIBS += -L$$LIBTUPI_DIR -ltupi 
+unix {
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR -ltupi 
+}
 
+win32 {
+    INCLUDEPATH += $$LIBTUPI_DIR
+    LIBS += -L$$LIBTUPI_DIR/release/ -ltupi 
+}
\ No newline at end of file
diff -Nru tupi-0.2+git04/src/libtupi/libtupi.pro tupi-0.2+git05/src/libtupi/libtupi.pro
--- tupi-0.2+git04/src/libtupi/libtupi.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/libtupi.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,10 +1,14 @@
-# File generated by kdevelop\'s qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/libtupi
-# Target is a library: tupi 
+QT += opengl core gui svg xml network
 
-!include(../../tupiglobal.pri) {
-    error("Please configure first")
+unix {
+    !include(../../tupiglobal.pri) {
+        error("Please configure first")
+    }
+}
+
+win32 {
+    include(../../quazip.win.pri)
+    include(../../win.pri)
 }
 
 INSTALLS += target 
@@ -22,7 +26,7 @@
 }
 
 HEADERS += tupgraphicalgorithm.h \
-           tupglobal.h \
+           # tupglobal.h \
            tuppaintareaproperties.h \
            tupgradientcreator.h \
            tupgradientselector.h \
@@ -37,7 +41,7 @@
            tupsocketbase.h \
            tupxmlparserbase.h \
            tupproxyitem.h \
-           tupinthash.h \
+           # tupinthash.h \
            tuppenthicknesswidget.h
 
 SOURCES += tupgraphicalgorithm.cpp \
@@ -66,6 +70,3 @@
 
 FRAMEWORK_DIR = "../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-
-# QUAZIP_DIR = "../../3rdparty/quazip/"
-# include($$QUAZIP_DIR/quazip.pri)
diff -Nru tupi-0.2+git04/src/libtupi/tupbrushmanager.cpp tupi-0.2+git05/src/libtupi/tupbrushmanager.cpp
--- tupi-0.2+git04/src/libtupi/tupbrushmanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupbrushmanager.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupbrushmanager.h"
-#include "tdebug.h"
 
 /**
  * This class handles the set of brushes for painting.
diff -Nru tupi-0.2+git04/src/libtupi/tupbrushmanager.h tupi-0.2+git05/src/libtupi/tupbrushmanager.h
--- tupi-0.2+git04/src/libtupi/tupbrushmanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupbrushmanager.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,10 +36,11 @@
 #ifndef TUPBRUSHMANAGER_H
 #define TUPBRUSHMANAGER_H
 
+#include "tglobal.h"
+
 #include <QObject>
 #include <QPen>
 #include <QBrush>
-#include "tupglobal.h"
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/libtupi/tupcompress.cpp tupi-0.2+git05/src/libtupi/tupcompress.cpp
--- tupi-0.2+git04/src/libtupi/tupcompress.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupcompress.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupcompress.h"
-#include <QByteArray>
 
 TupCompress::TupCompress()
 {
diff -Nru tupi-0.2+git04/src/libtupi/tupcompress.h tupi-0.2+git05/src/libtupi/tupcompress.h
--- tupi-0.2+git04/src/libtupi/tupcompress.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupcompress.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,14 +36,17 @@
 #ifndef TUPCOMPRESS_H
 #define TUPCOMPRESS_H
 
+#include "tglobal.h"
+
 #include <QString>
+#include <QByteArray>
 
 /**
  * This class (un)compress and (un)hash a string
  * @author David Cuadrado
 */
 
-class TupCompress
+class TUPI_EXPORT TupCompress
 {
     public:
         TupCompress();
diff -Nru tupi-0.2+git04/src/libtupi/tupglobal.h tupi-0.2+git05/src/libtupi/tupglobal.h
--- tupi-0.2+git04/src/libtupi/tupglobal.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupglobal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TUPGLOBAL_H
-#define TUPGLOBAL_H
-
-#include "tglobal.h"
-
-#define TUPI_EXPORT T_GUI_EXPORT
-
-#define LIBRARY_DIR CONFIG_DIR+"/libraries"
-
-/**
- * This class defines enumerations used in the whole code of the project.
- *
- * @author David Cuadrado
-*/
-
-namespace Tupi 
-{
-    enum RenderType
-      {
-       Image = 0,
-       OpenGL,
-       Native
-      };
-
-    enum MessageType
-      {
-       Information = 0,
-       Warning,
-       Error,
-       Critical
-      };
-};
-
-#endif
-
diff -Nru tupi-0.2+git04/src/libtupi/tupgradientcreator.cpp tupi-0.2+git05/src/libtupi/tupgradientcreator.cpp
--- tupi-0.2+git04/src/libtupi/tupgradientcreator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupgradientcreator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "tupgradientcreator.h"
-#include "tdebug.h"
-#include "tapplication.h"
-
-#include <QBoxLayout>
 
 struct TupGradientCreator::Private
 {
@@ -166,7 +162,12 @@
         }
     } else {
         #ifdef K_DEBUG
-               tError() << "TupGradientCreator::setGradient() - Error: Brush has no gradient (null)";
+		    QString msg = "TupGradientCreator::setGradient() - Error: Brush has no gradient (null)";
+		    #ifdef Q_OS_WIN32
+               qDebug() << msg;
+            #else
+               tError() << msg;
+            #endif
         #endif
     }
 }
diff -Nru tupi-0.2+git04/src/libtupi/tupgradientcreator.h tupi-0.2+git05/src/libtupi/tupgradientcreator.h
--- tupi-0.2+git04/src/libtupi/tupgradientcreator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupgradientcreator.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,14 @@
 #ifndef TUPGRADIENTMANAGER_H
 #define TUPGRADIENTMANAGER_H
 
+#include "tglobal.h"
+
+#include "tapplication.h"
 #include "tupgradientselector.h"
 #include "tupgradientviewer.h"
-
 #include "timagebutton.h"
 #include "tcirclebutton.h"
 #include "txyspinbox.h"
-#include "tupglobal.h"
 
 #include <QFrame>
 #include <QComboBox>
diff -Nru tupi-0.2+git04/src/libtupi/tupgradientselector.cpp tupi-0.2+git05/src/libtupi/tupgradientselector.cpp
--- tupi-0.2+git04/src/libtupi/tupgradientselector.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupgradientselector.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,17 +34,16 @@
  ***************************************************************************/
 
 #include "tupgradientselector.h"
-#include "tdebug.h"
-
-#include <qdrawutil.h>
-#include <QMatrix>
-#include <QPolygon>
 
 TupGradientSelector::TupGradientSelector(QWidget *parent) 
     : QAbstractSlider(parent), m_currentArrowIndex(0), m_gradient(0,0,1,1), m_update(true), m_maxArrows(10), m_currentColor(Qt::black)
-{
-    #ifdef K_DEBUG
-           TINIT;
+{	
+	#ifdef K_DEBUG
+		#ifdef Q_OS_WIN32
+            qDebug() << "[TupGradientSelector()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     _orientation = Qt::Horizontal;
@@ -74,7 +73,11 @@
 TupGradientSelector::~TupGradientSelector()
 {
     #ifdef K_DEBUG
-           TEND;
+	    #ifdef Q_OS_WIN32
+            qDebug() << "[~TupGradientSelector()]";
+        #else
+            TEND;
+        #endif
     #endif
 }
 
diff -Nru tupi-0.2+git04/src/libtupi/tupgradientselector.h tupi-0.2+git05/src/libtupi/tupgradientselector.h
--- tupi-0.2+git04/src/libtupi/tupgradientselector.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupgradientselector.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef TUPGRADIENTSELECTOR_H
 #define TUPGRADIENTSELECTOR_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
 
 #include <QAbstractSlider>
 #include <QColor>
@@ -49,7 +49,9 @@
 #include <QPoint>
 #include <QLinearGradient>
 #include <QPainterPath>
-
+#include <qdrawutil.h>
+#include <QMatrix>
+#include <QPolygon>
 #include <QList>
 
 /**
@@ -67,7 +69,7 @@
    
    private:
 
-      class TupGradientArrow : public QObject
+      class TUPI_EXPORT TupGradientArrow : public QObject
       {
          public:
 
diff -Nru tupi-0.2+git04/src/libtupi/tupgradientviewer.cpp tupi-0.2+git05/src/libtupi/tupgradientviewer.cpp
--- tupi-0.2+git04/src/libtupi/tupgradientviewer.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupgradientviewer.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,11 +34,6 @@
  ***************************************************************************/
 
 #include "tupgradientviewer.h"
-#include "tdebug.h"
-
-#include <QPainter>
-#include <QMouseEvent>
-#include <QRectF>
 
 class TupGradientViewer::ControlPoint
 {
@@ -152,7 +147,12 @@
             default:
             {
                 #ifdef K_DEBUG
-                       tError() << "TupGradientViewer::createGradient() - Fatal Error: the gradient type doesn't exists!";
+                    QString msg = "TupGradientViewer::createGradient() - Fatal Error: the gradient type doesn't exists!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
             }
     }
@@ -205,9 +205,14 @@
             default:
             {
                 #ifdef K_DEBUG
-                       tError() << "TupGradientViewer::gradient() - Fatal error: the gradient type doesn't exists!";
+                    QString msg = "TupGradientViewer::gradient() - Fatal error: the gradient type doesn't exists!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
-            }
+}
     }
 
     gradientNormalized.setStops(m_gradientStops);
@@ -274,9 +279,14 @@
                  break;
             }
             default:
-            {
+            { 
                  #ifdef K_DEBUG
-                        tError() << "TupGradientViewer::setGradient() - Fatal Error: the gradient type doesn't exists!";
+                     QString msg = "TupGradientViewer::setGradient() - Fatal Error: the gradient type doesn't exists!";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
             }
     }
diff -Nru tupi-0.2+git04/src/libtupi/tupgradientviewer.h tupi-0.2+git05/src/libtupi/tupgradientviewer.h
--- tupi-0.2+git04/src/libtupi/tupgradientviewer.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupgradientviewer.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,11 +36,14 @@
 #ifndef TUPGRADIENTVIEWER_H
 #define TUPGRADIENTVIEWER_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
 
 #include <QFrame>
 #include <QGradient>
 #include <QList>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QRectF>
 
 /**
  * @if english
diff -Nru tupi-0.2+git04/src/libtupi/tupgraphicalgorithm.cpp tupi-0.2+git05/src/libtupi/tupgraphicalgorithm.cpp
--- tupi-0.2+git04/src/libtupi/tupgraphicalgorithm.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupgraphicalgorithm.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -44,15 +44,10 @@
 
 #include "tupgraphicalgorithm.h"
 
-#include <cmath>
-
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
 
-#include "tdebug.h"
-#include <QDebug>
-
 #define MAXPOINTS    1000        /* The most points you can have */
 
 class FitVector
diff -Nru tupi-0.2+git04/src/libtupi/tupgraphicalgorithm.h tupi-0.2+git05/src/libtupi/tupgraphicalgorithm.h
--- tupi-0.2+git04/src/libtupi/tupgraphicalgorithm.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupgraphicalgorithm.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,17 +33,15 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef __TUPGRAPHICALGORITHM_H__
-#define __TUPGRAPHICALGORITHM_H__
+#ifndef TUPGRAPHICALGORITHM_H
+#define TUPGRAPHICALGORITHM_H
 
+#include "tglobal.h"
+
+#include <cmath>
 #include <QString>
 #include <QPolygon>
 #include <QPainterPath>
-#include "tupglobal.h"
-
-/**
- * @author Jorge Cuadrado
- */
 
 class TUPI_EXPORT TupGraphicalAlgorithm
 {
diff -Nru tupi-0.2+git04/src/libtupi/tupinputdeviceinformation.cpp tupi-0.2+git05/src/libtupi/tupinputdeviceinformation.cpp
--- tupi-0.2+git04/src/libtupi/tupinputdeviceinformation.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupinputdeviceinformation.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,11 +34,6 @@
  ***************************************************************************/
 
 #include "tupinputdeviceinformation.h"
-#include "tdebug.h"
-
-#include <QGraphicsSceneMouseEvent>
-#include <QMouseEvent>
-#include <QTabletEvent>
 
 /**
  * This class captures and process all the mouse/tablet events.
@@ -112,7 +107,7 @@
 
 void TupInputDeviceInformation::updateFromTabletEvent(QTabletEvent *event)
 {
-    tError() << "updateFromTabletEvent() - Pressure: " << event->pressure();
+    // tError() << "updateFromTabletEvent() - Pressure: " << event->pressure();
 
     k->tabletInfo.pressure = event->pressure();
     k->tabletInfo.rotation = event->rotation();
@@ -125,7 +120,7 @@
 
 double TupInputDeviceInformation::pressure() const
 {
-    tError() << "TupInputDeviceInformation::pressure() - Testing pressure: " << k->tabletInfo.pressure;
+    //tError() << "TupInputDeviceInformation::pressure() - Testing pressure: " << k->tabletInfo.pressure;
     return k->tabletInfo.pressure;
 }
 
diff -Nru tupi-0.2+git04/src/libtupi/tupinputdeviceinformation.h tupi-0.2+git05/src/libtupi/tupinputdeviceinformation.h
--- tupi-0.2+git04/src/libtupi/tupinputdeviceinformation.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupinputdeviceinformation.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,10 +36,13 @@
 #ifndef TUPINPUTDEVICEINFORMATION_H
 #define TUPINPUTDEVICEINFORMATION_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
 
 #include <QObject>
 #include <QPoint>
+#include <QGraphicsSceneMouseEvent>
+#include <QMouseEvent>
+#include <QTabletEvent>
 
 class QGraphicsSceneMouseEvent;
 class QMouseEvent;
diff -Nru tupi-0.2+git04/src/libtupi/tupinthash.h tupi-0.2+git05/src/libtupi/tupinthash.h
--- tupi-0.2+git04/src/libtupi/tupinthash.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupinthash.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,263 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez                                                     *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TUPINTHASH_H
-#define TUPINTHASH_H
-
-#include <QHash>
-
-/**
- * @author David Cuadrado
-*/
-
-template<typename T>
-class TupIntHash
-{
-    public:
-        TupIntHash();
-        TupIntHash(const TupIntHash<T> &other);
-        ~TupIntHash();
-        
-        void removeObject(int pos);
-        void remove(int pos);
-        void copyObject(int from, int to);
-        void exchangeObject(int from, int to);
-        
-        int objectIndex(T val);
-        
-        T value(int pos);
-        T takeObject(int pos);
-        
-        void clear(bool alsoDelete = false)
-        {
-            k->dataHash.clear();
-
-            if (alsoDelete)
-                qDeleteAll(k->dataHash);
- 
-            k->counter = 0;
-        }
-        
-        int count() const
-        {
-            return k->dataHash.count();
-        }
-        
-        bool contains(int pos);
-        
-        void insert(int pos, T value);
-        void add(T value);
-        
-        void expandValue(int index, int times);
-        
-        T operator[](int index) const;
-        QList<T> values() const;
-        
-        QList<int> indexes() const;
-        
-        bool isEmpty();
-        
-    public:
-        TupIntHash &operator=(const TupIntHash &other);
-        
-    private:
-        struct Private;
-        Private *const k;
-};
-
-template<typename T>
-struct TupIntHash<T>::Private
-{
-    Private() : counter(0) {}
-    QHash<int, T> dataHash;
-    int counter;
-};
-
-template<typename T>
-TupIntHash<T>::TupIntHash() : k(new Private)
-{
-}
-
-template<typename T>
-TupIntHash<T>::TupIntHash(const TupIntHash<T> &other) : k(new Private)
-{
-    k->dataHash = other.k->dataHash;
-    k->counter = other.k->counter;
-}
-
-template<typename T>
-TupIntHash<T>::~TupIntHash()
-{
-    delete k;
-}
-
-template<typename T>
-void TupIntHash<T>::removeObject(int pos)
-{
-    if (contains(pos)) {
-        k->dataHash.remove(pos);
-        k->counter--;
-    } 
-}
-
-template<typename T>
-bool TupIntHash<T>::contains(int pos)
-{
-    return k->dataHash.contains(pos);
-}
-
-template<typename T>
-void TupIntHash<T>::copyObject(int from, int to)
-{
-    if (contains(from) && contains(to)) {
-        T fromValue = this->value(from);
-        this->insert(to, fromValue);
-    } 
-}
-
-template<typename T>
-void TupIntHash<T>::exchangeObject(int from, int to)
-{
-    if (contains(from) && contains(to)) {
-        T fromValue = this->value(from);
-        T toValue = this->value(to);
-        this->insert(to, fromValue);
-        this->insert(from, toValue);
-    }
-}
-
-template<typename T>
-TupIntHash<T> &TupIntHash<T>::operator=(const TupIntHash<T> &other)
-{
-    k->dataHash = other.k->dataHash;
-    k->counter = other.k->counter;
-    
-    return *this;
-}
-
-template<typename T>
-int TupIntHash<T>::objectIndex(T val)
-{
-    return k->dataHash.key(val);
-}
-
-template<typename T>
-T TupIntHash<T>::value(int pos)
-{
-    if (contains(pos)) 
-        return k->dataHash.value(pos);
-    
-    return k->dataHash.value(-1);
-}
-
-template<typename T>
-T TupIntHash<T>::takeObject(int pos)
-{
-    if (contains(pos))
-        return k->dataHash.take(pos);
-    
-    return k->dataHash.take(-1);
-}
-
-template<typename T>
-void TupIntHash<T>::insert(int pos, T value)
-{
-    if (k->dataHash.contains(pos))
-        qDebug("######   OVERRIDING!! %d", pos);
-    else
-        k->counter++;
-
-    k->dataHash.insert(pos, value);
-}
-
-template<typename T>
-void TupIntHash<T>::remove(int pos)
-{
-    if (contains(pos)) {
-        if (pos == count()-1) {
-            k->dataHash.remove(pos);
-        } else {
-            int total = count() - 1;
-            for (int i=pos+1;i<=total;i++) {
-                 T value = this->takeObject(i); 
-                 int index = i - 1;
-                 k->dataHash.insert(index, value);
-            }
-        }
-        k->counter--;
-    } 
-}
-
-template<typename T>
-void TupIntHash<T>::add(T value)
-{
-    this->insert(k->counter, value);
-}
-
-template<typename T>
-void TupIntHash<T>::expandValue(int index, int times)
-{
-    int limit = index + times;
-    T value = this->value(index);
-
-    for (int i=index+1; i<=limit; i++)
-         k->dataHash.insert(i, value);
-}
-
-template<typename T>
-T TupIntHash<T>::operator[](int index) const
-{
-    return k->dataHash.value(index);
-}
-
-template<typename T>
-QList<T> TupIntHash<T>::values() const
-{
-    return k->dataHash.values();
-}
-
-template<typename T>
-QList<int> TupIntHash<T>::indexes() const
-{
-    return k->dataHash.keys();
-}
-
-template<typename T>
-bool TupIntHash<T>::isEmpty()
-{
-    return k->dataHash.isEmpty();
-}
-
-#endif
diff -Nru tupi-0.2+git04/src/libtupi/tupitempreview.cpp tupi-0.2+git05/src/libtupi/tupitempreview.cpp
--- tupi-0.2+git04/src/libtupi/tupitempreview.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupitempreview.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,14 +34,6 @@
  ***************************************************************************/
 
 #include "tupitempreview.h"
-#include "tupproxyitem.h"
-#include "tdebug.h"
-
-#include <QGraphicsItem>
-#include <QGraphicsTextItem>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
-#include <QGraphicsSvgItem>
 
 struct TupItemPreview::Private
 {
@@ -67,15 +59,17 @@
 
 QSize TupItemPreview::sizeHint() const
 {
+    /*
     if (k->proxy) {
         int maxY = k->proxy->boundingRect().size().height();
         if (maxY < 100)
             return k->proxy->boundingRect().size().toSize() + QSize(10, 110 - maxY);
         else
-            return k->proxy->boundingRect().size().toSize() + QSize(10,10);
+            return k->proxy->boundingRect().size().toSize() + QSize(10, 10);
     }
+    */
     
-    return QWidget::sizeHint().expandedTo(QSize(100,100));
+    return QWidget::sizeHint().expandedTo(QSize(100, 100));
 }
 
 void TupItemPreview::render(QGraphicsItem *item)
@@ -114,7 +108,6 @@
 
         // If preview is for a "path" object
         if (QGraphicsPathItem *path = qgraphicsitem_cast<QGraphicsPathItem *>(k->proxy->item())) {
-
             int pathWidth = path->path().boundingRect().width();
             int pathHeight = path->path().boundingRect().height();
 
@@ -151,16 +144,12 @@
                 newPosX = -path->path().boundingRect().topLeft().x();
                 newPosY = -path->path().boundingRect().topLeft().y(); 
                 painter.translate(newPosX, newPosY);
-
             } else { // if object is smaller than canvas, just show it
-
                 painter.translate((rect().width() - pathWidth)/2, (rect().height() - pathHeight)/2);
                 painter.translate(-path->path().boundingRect().topLeft().x(), -path->path().boundingRect().topLeft().y());
-
             }
-
-        } else { // if preview is for images or svg objects 
-
+        } else { 
+                // if preview is for images or svg objects 
                 // if object is bigger than canvas, resize
                 if (opt.exposedRect.width() > rect().width() || opt.exposedRect.height() > rect().height()) {
                     float distance = 0;
diff -Nru tupi-0.2+git04/src/libtupi/tupitempreview.h tupi-0.2+git05/src/libtupi/tupitempreview.h
--- tupi-0.2+git04/src/libtupi/tupitempreview.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupitempreview.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,15 @@
 #ifndef TUPITEMPREVIEW_H
 #define TUPITEMPREVIEW_H
 
+#include "tglobal.h"
+#include "tupproxyitem.h"
+
 #include <QWidget>
+#include <QGraphicsItem>
+#include <QGraphicsTextItem>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+#include <QGraphicsSvgItem>
 
 class QGraphicsItem;
 
@@ -45,7 +53,7 @@
  * @author David Cuadrado
 */
 
-class TupItemPreview : public QWidget
+class TUPI_EXPORT TupItemPreview : public QWidget
 {
     Q_OBJECT
     
diff -Nru tupi-0.2+git04/src/libtupi/tuppackagehandler.cpp tupi-0.2+git05/src/libtupi/tuppackagehandler.cpp
--- tupi-0.2+git04/src/libtupi/tuppackagehandler.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tuppackagehandler.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,15 +34,6 @@
  ***************************************************************************/
 
 #include "tuppackagehandler.h"
-#include "quazip.h"
-#include "quazipfile.h"
-#include "tdebug.h"
-#include "tglobal.h"
-#include "tapplicationproperties.h"
-
-#include <QFile>
-#include <QFileInfo>
-#include <QDir>
 
 /**
  * This class manages the file format for Tupi projects.
@@ -66,27 +57,48 @@
 
 bool TupPackageHandler::makePackage(const QString &projectPath, const QString &packagePath)
 {
-    if (!QFile::exists(projectPath)) {
+    if (!QFile::exists(projectPath)) {        
         #ifdef K_DEBUG
-               tError() << "TupPackageHandler::makePackage() - Project path doesn't exist -> " << projectPath;
+            QString msg = "TupPackageHandler::makePackage() - Project path doesn't exist -> " + projectPath;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         return false;
     }
+
+    // SQA: This code will be enabled in the future
+    // return JlCompress::compressDir(packagePath, projectPath, true);
     
     QFileInfo packageInfo(packagePath);
     QuaZip zip(packagePath);
 
     if (!zip.open(QuaZip::mdCreate)) {
         #ifdef K_DEBUG
-               tError() << "TupPackageHandler::makePackage() - Error while create package: " << zip.getZipError();
+            QString msg = "TupPackageHandler::makePackage() - Error while create package: " + QString::number(zip.getZipError());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+        
         return false;
     }
 
     if (! compress(&zip, projectPath)) {
         #ifdef K_DEBUG
-               tError() << "TupPackageHandler::makePackage() - Error while compress project" << zip.getZipError();
+            QString msg = "TupPackageHandler::makePackage() - Error while compress project: " + QString::number(zip.getZipError());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         return false;
     }
     
@@ -94,8 +106,14 @@
 
     if (zip.getZipError() != 0) {
         #ifdef K_DEBUG
-               tError() << "TupPackageHandler::makePackage() - Error: " << zip.getZipError();
+            QString msg = "TupPackageHandler::makePackage() - Error: " + QString::number(zip.getZipError());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+        
         return false;
     }
     
@@ -128,8 +146,14 @@
 
              if (!inFile.open(QIODevice::ReadOnly)) {
                  #ifdef K_DEBUG
-                        tError() << "Error opening file " << inFile.fileName() << " : " << inFile.errorString();
+                     QString msg = "Error opening file " + inFile.fileName() + " : " + inFile.errorString();
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
+
                  return false;
              }
 
@@ -161,12 +185,36 @@
 
 bool TupPackageHandler::importPackage(const QString &packagePath)
 {
+    /* SQA: Handy code to include in the future
+    QFileInfo file(packagePath);
+    k->importedProjectPath = CACHE_DIR + file.baseName();
+    QStringList list = JlCompress::extractDir(packagePath, k->importedProjectPath);
+    if (list.size() == 0) {
+        #ifdef K_DEBUG
+            QString msg = "TupPackageHandler::importPackage() - Project file is empty! -> " + packagePath;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+
+        return false;
+    }
+    */
+        
     QuaZip zip(packagePath);
     
     if (!zip.open(QuaZip::mdUnzip)) {
         #ifdef K_DEBUG
-               tDebug() << "TupPackageHandler::importPackage() - Error while open package: " << zip.getZipError();
+            QString msg = "TupPackageHandler::importPackage() - Error while open package: " + QString::number(zip.getZipError());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         return false;
     }
 
@@ -180,22 +228,39 @@
     bool next = zip.goToFirstFile();
 
     while (next) {
-
            if (!zip.getCurrentFileInfo(&info)) {
                #ifdef K_DEBUG
-                      tError() << "TupPackageHandler::importPackage() - Can't get current file: " << zip.getZipError();
+                   QString msg = "TupPackageHandler::importPackage() - Can't get current file: " + QString::number(zip.getZipError());
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
                #endif
+
                return false;
            }
         
            if (!file.open(QIODevice::ReadOnly)) {
                #ifdef K_DEBUG
-                      tError() << "TupPackageHandler::importPackage() - Can't open file "<< file.getZipError();
+                   QString msg = "TupPackageHandler::importPackage() - Can't open file " + QString::number(file.getZipError());
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
                #endif
+
                return false;
            }
-        
-           name = CACHE_DIR + file.getActualFileName();
+
+           #ifdef Q_OS_WIN32
+               name = file.getActualFileName();
+            #else
+               name = CACHE_DIR + file.getActualFileName();    
+           #endif
+
+           // name = CACHE_DIR + file.getActualFileName();
 
            if (name.endsWith(QDir::separator()))
                name.remove(name.count()-1, 1);
@@ -203,23 +268,38 @@
            if (name.endsWith(".tpp"))
                k->importedProjectPath = QFileInfo(name).path();
         
-           if (file.getZipError() != UNZ_OK) {
+           if (file.getZipError() != UNZ_OK) {           
                #ifdef K_DEBUG
-                      tError() << "TupPackageHandler::importPackage() - Error while open package " << file.getZipError();
+                   QString msg = "TupPackageHandler::importPackage() - Error while open package " + QString::number(file.getZipError());
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
                #endif
+               
                return false;
            }
         
            if (createPath(name)) {
-
                out.setFileName(name);
         
-               if (! out.open(QIODevice::WriteOnly)) {
+               if (! out.open(QIODevice::WriteOnly)) {               
                    #ifdef K_DEBUG
-                          tError() << "TupPackageHandler::importPackage() - Error while open file: " << out.fileName(); 
-                          tError() << "TupPackageHandler::importPackage() - Error Description: " << out.errorString();
-                          tError() << "TupPackageHandler::importPackage() - Error type: " << out.error(); 
-                   #endif
+                       QString msg1 = "TupPackageHandler::importPackage() - Error while open file: " + out.fileName();
+                       QString msg2 = "TupPackageHandler::importPackage() - Error Description: " + out.errorString();
+                       QString msg3 = "TupPackageHandler::importPackage() - Error type: " + QString::number(out.error());
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg1;
+                           qDebug() << msg2;
+                           qDebug() << msg3;
+                       #else
+                           tError() << msg1;
+                           tError() << msg2;
+                           tError() << msg3;
+                       #endif
+                   #endif                   
+
                    return false;
                }
         
@@ -227,23 +307,39 @@
                       out.putChar(c);
 
                out.close();
-           } else {
+           } else {           
                #ifdef K_DEBUG
-                      tError() << "TupPackageHandler::importPackage() - Error creating path: " << name; 
+                   QString msg = "TupPackageHandler::importPackage() - Error creating path: " + name;
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
                #endif
+               
                return false;
            }
 
            if (file.getZipError()!=UNZ_OK) {
                #ifdef K_DEBUG
-                      tError() << "TupPackageHandler::importPackage() - Error while open package " << file.getZipError();
+                   QString msg = "TupPackageHandler::importPackage() - Error while open package " + QString::number(file.getZipError());
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
                #endif
                return false;
            }
 
            if (!file.atEnd()) {
                #ifdef K_DEBUG
-                      tError() << "TupPackageHandler::importPackage() - Not EOF Error";
+                   QString msg = "TupPackageHandler::importPackage() - Not EOF Error";
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
                #endif
                return false;
            }
@@ -252,7 +348,12 @@
 
            if (file.getZipError()!=UNZ_OK) {
                #ifdef K_DEBUG
-                      tError() << "TupPackageHandler::importPackage() - Error while open package " << file.getZipError();
+                   QString msg = "TupPackageHandler::importPackage() - Error while open package " + QString::number(file.getZipError());
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
                #endif
                return false;
            }
@@ -264,7 +365,12 @@
 
     if (zip.getZipError() != UNZ_OK) {
         #ifdef K_DEBUG
-               tError() << "TupPackageHandler::importPackage() - Error while open package " << file.getZipError();
+            QString msg = "TupPackageHandler::importPackage() - Error while open package " + QString::number(file.getZipError());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return false;
     }
@@ -277,7 +383,7 @@
     QFileInfo info(filePath);
     QDir path = info.dir();
     QString target = path.path();
-
+    
     if (!path.exists()) 
         return path.mkpath(target);
     else 
diff -Nru tupi-0.2+git04/src/libtupi/tuppackagehandler.h tupi-0.2+git05/src/libtupi/tuppackagehandler.h
--- tupi-0.2+git04/src/libtupi/tuppackagehandler.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tuppackagehandler.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,11 +36,20 @@
 #ifndef TUPPACKAGEHANDLER_H
 #define TUPPACKAGEHANDLER_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+#include "quazip.h"
+#include "quazipfile.h"
+
+// SQA: Pending to enable in the future
+// #include <JlCompress.h>
 
 #include <QString>
+#include <QFile>
+#include <QFileInfo>
+#include <QDir>
 
-class QuaZip;
+// class QuaZip;
 
 /**
  * @author David Cuadrado
diff -Nru tupi-0.2+git04/src/libtupi/tuppaintareaproperties.h tupi-0.2+git05/src/libtupi/tuppaintareaproperties.h
--- tupi-0.2+git04/src/libtupi/tuppaintareaproperties.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tuppaintareaproperties.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef TUPPAINTAREAPROPERTIES_H 
 #define TUPPAINTAREAPROPERTIES_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
 #include <QColor>
 
 /**
diff -Nru tupi-0.2+git04/src/libtupi/tuppenthicknesswidget.cpp tupi-0.2+git05/src/libtupi/tuppenthicknesswidget.cpp
--- tupi-0.2+git04/src/libtupi/tuppenthicknesswidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tuppenthicknesswidget.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tuppenthicknesswidget.h"
-#include "tdebug.h"
 
 struct TupPenThicknessWidget::Private
 {
@@ -104,7 +103,8 @@
      painter.fillRect(0, 0, width(), height(), QColor(255, 255, 255));
 
      QPen border(QColor(0, 0, 0));
-     border.setWidth(0.5);
+     // border.setWidth(0.5);
+     border.setWidth(1);
      painter.setPen(border);
      painter.drawRect(0, 0, width(), height());
 
@@ -123,7 +123,15 @@
                  // tFatal() << "TupPenThicknessWidget::paintEvent() - Setting gradient brush";
                  brush = k->currentBrush;
              } else {
-                 // tFatal() << "TupPenThicknessWidget::paintEvent() - Warning! NO gradient!";
+                #ifdef K_DEBUG
+                    QString msg = "TupPenThicknessWidget::paintEvent() - Warning! NO gradient!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
+                #endif
+                return;
              }
          }
          QPen pen(Qt::NoPen);
diff -Nru tupi-0.2+git04/src/libtupi/tuppenthicknesswidget.h tupi-0.2+git05/src/libtupi/tuppenthicknesswidget.h
--- tupi-0.2+git04/src/libtupi/tuppenthicknesswidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tuppenthicknesswidget.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,6 +36,7 @@
 #ifndef TUPPENTHICKNESSWIDGET_H
 #define TUPPENTHICKNESSWIDGET_H
 
+#include "tglobal.h"
 #include "tapplicationproperties.h"
 
 #include <QWidget>
@@ -49,7 +50,7 @@
  * @author Gustav Gonzalez <info@maefloresta.com>
  **/
 
-class TupPenThicknessWidget : public QWidget
+class TUPI_EXPORT TupPenThicknessWidget : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/libtupi/tupprojectactionbar.cpp tupi-0.2+git05/src/libtupi/tupprojectactionbar.cpp
--- tupi-0.2+git04/src/libtupi/tupprojectactionbar.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupprojectactionbar.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,17 +34,6 @@
  ***************************************************************************/
 
 #include "tupprojectactionbar.h"
-#include "tupglobal.h"
-#include "tdebug.h"
-#include "tseparator.h"
-#include "tconfig.h"
-#include "toptionaldialog.h"
-#include "timagebutton.h"
-
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QSpacerItem>
-#include <QDesktopWidget>
 
 struct TupProjectActionBar::Private
 {
@@ -105,9 +94,8 @@
 
    if (actions & InsertLayer) {
         TImageButton *button = new TImageButton(QIcon(THEME_DIR + "icons/add_layer.png"), size);
-        button->setToolTip(tr("Insert a layer"));
+        button->setToolTip(tr("Insert layer"));
         button->setShortcut(QKeySequence(tr("F5")));
-        //button->setEnabled(false);
 
         k->actions.addButton(button, InsertLayer);
 
@@ -117,9 +105,8 @@
 
     if (actions & RemoveLayer) {
         TImageButton *button = new TImageButton(QIcon(THEME_DIR + "icons/remove_layer.png"), size);
-        button->setToolTip(tr("Remove the layer"));
+        button->setToolTip(tr("Remove layer"));
         button->setShortcut(QKeySequence(tr("F6")));
-        //button->setEnabled(false);
 
         k->actions.addButton(button, RemoveLayer);
 
@@ -157,7 +144,8 @@
     if (actions & InsertFrame) {
         TImageButton *button = new TImageButton(QIcon(THEME_DIR + "icons/add_frame.png"), size);
         button->setToolTip(tr("Insert frame"));
-        button->setShortcut(QKeySequence(Qt::Key_Plus));
+        // SQA: This short-cut has been moved to Zoom In feature
+        // button->setShortcut(QKeySequence(Qt::Key_Plus));
         
         k->actions.addButton(button, InsertFrame);
         
@@ -167,8 +155,9 @@
     
     if (actions & RemoveFrame) {
         TImageButton *button = new TImageButton(QIcon(THEME_DIR + "icons/remove_frame.png"), size);
-        button->setToolTip(tr("Remove the frame"));
-        button->setShortcut(QKeySequence(Qt::Key_Minus));
+        button->setToolTip(tr("Remove frame"));
+        // SQA: This short-cut has been moved to Zoom Out feature
+        // button->setShortcut(QKeySequence(Qt::Key_Minus));
         
         k->actions.addButton(button, RemoveFrame);
         
@@ -176,7 +165,7 @@
         button->setAnimated(k->isAnimated);
     }
      
-    if (actions & MoveFrameUp) {
+    if (actions & MoveFrameBackward) {
         TImageButton *button = 0;
         if (k->container.compare("Exposure") == 0) {
             button = new TImageButton(QIcon(THEME_DIR + "icons/move_frame_up.png"), size);
@@ -185,16 +174,16 @@
                 button = new TImageButton(QIcon(THEME_DIR + "icons/move_frame_backward.png"), size);
         }
         
-        button->setToolTip(tr("Move frame up"));
+        button->setToolTip(tr("Move frame backward"));
         button->setShortcut(QKeySequence(tr("F8")));
 
-        k->actions.addButton(button, MoveFrameUp);
+        k->actions.addButton(button, MoveFrameBackward);
         
         k->buttonLayout->addWidget(button);
         button->setAnimated(k->isAnimated);
     }
     
-    if (actions & MoveFrameDown) {
+    if (actions & MoveFrameForward) {
         TImageButton *button = 0;
 
         if (k->container.compare("Exposure") == 0) {
@@ -204,10 +193,10 @@
                 button = new TImageButton(QIcon(THEME_DIR + "icons/move_frame_forward.png"), size);
         }
  
-        button->setToolTip(tr("Move frame down"));
+        button->setToolTip(tr("Move frame forward"));
         button->setShortcut(QKeySequence(tr("F9")));
         
-        k->actions.addButton(button, MoveFrameDown);
+        k->actions.addButton(button, MoveFrameForward);
         
         k->buttonLayout->addWidget(button);
         button->setAnimated(k->isAnimated);
@@ -236,7 +225,7 @@
 
     if (actions & InsertScene) {
         TImageButton *button = new TImageButton(QIcon(THEME_DIR + "icons/add_scene.png"), size);  // TODO
-        button->setToolTip(tr("Insert a scene"));
+        button->setToolTip(tr("Insert scene"));
         
         k->actions.addButton(button, InsertScene);
         
@@ -246,7 +235,7 @@
      
     if (actions & RemoveScene) {
         TImageButton *button = new TImageButton(QIcon(THEME_DIR + "icons/remove_scene.png"), size);  // TODO
-        button->setToolTip(tr("Remove the scene"));
+        button->setToolTip(tr("Remove scene"));
 
         k->actions.addButton(button, RemoveScene);
         
diff -Nru tupi-0.2+git04/src/libtupi/tupprojectactionbar.h tupi-0.2+git05/src/libtupi/tupprojectactionbar.h
--- tupi-0.2+git04/src/libtupi/tupprojectactionbar.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupprojectactionbar.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,11 +36,19 @@
 #ifndef TUPPROJECTACTIONBAR_H
 #define TUPPROJECTACTIONBAR_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
 #include "tapplicationproperties.h"
+#include "tseparator.h"
+#include "tconfig.h"
+#include "toptionaldialog.h"
+#include "timagebutton.h"
 
 #include <QWidget>
 #include <QButtonGroup>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QSpacerItem>
+#include <QDesktopWidget>
 
 class TImageButton;
 class QBoxLayout;
@@ -60,8 +68,8 @@
             
             InsertFrame = 1 << 1,
             RemoveFrame = 1 << 2,
-            MoveFrameUp = 1 << 3,
-            MoveFrameDown = 1 << 4,
+            MoveFrameBackward = 1 << 3,
+            MoveFrameForward = 1 << 4,
             LockFrame = 1 << 5,
             
             InsertLayer = 1 << 6,
@@ -77,11 +85,11 @@
             LockScene = 1 << 15,
             Separator = 1 << 16,
 
-            AllActions = InsertFrame | RemoveFrame | MoveFrameUp | MoveFrameDown | LockFrame | InsertLayer | RemoveLayer 
+            AllActions = InsertFrame | RemoveFrame | MoveFrameBackward | MoveFrameForward | LockFrame | InsertLayer | RemoveLayer 
                                      | MoveLayerUp | MoveLayerDown | InsertScene | RemoveScene | MoveSceneUp | MoveSceneDown,
 
-            FrameActions = InsertFrame | RemoveFrame | MoveFrameUp | MoveFrameDown,
-            LayerActions = InsertLayer | RemoveLayer | MoveLayerUp | MoveLayerDown,
+            FrameActions = InsertFrame | RemoveFrame | MoveFrameBackward | MoveFrameForward | LockFrame,
+            LayerActions = InsertLayer | RemoveLayer | MoveLayerUp | MoveLayerDown | LockLayer,
             SceneActions = InsertScene | RemoveScene | MoveSceneUp | MoveSceneDown
         };
         
diff -Nru tupi-0.2+git04/src/libtupi/tupproxyitem.cpp tupi-0.2+git05/src/libtupi/tupproxyitem.cpp
--- tupi-0.2+git04/src/libtupi/tupproxyitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupproxyitem.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,9 +34,6 @@
  ***************************************************************************/
 
 #include "tupproxyitem.h"
-#include "tdebug.h"
-
-#include <QPainter>
 
 /**
  * This class defines a copy of a graphic object.
@@ -87,7 +84,7 @@
     return QRectF(0, 0, 0, 0);
 }
 
-void TupProxyItem::paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
+void TupProxyItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
 {
     if (k->realItem)
         k->realItem->paint(painter, option, widget);
diff -Nru tupi-0.2+git04/src/libtupi/tupproxyitem.h tupi-0.2+git05/src/libtupi/tupproxyitem.h
--- tupi-0.2+git04/src/libtupi/tupproxyitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupproxyitem.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,16 @@
 #ifndef TUPPROXYITEM_H
 #define TUPPROXYITEM_H
 
+#include "tglobal.h"
+
 #include <QGraphicsItem>
+#include <QPainter>
 
 /**
  * @author David Cuadrado
 */
 
-class TupProxyItem : public QGraphicsItem
+class TUPI_EXPORT TupProxyItem : public QGraphicsItem
 {
     public:
         TupProxyItem(QGraphicsItem *item = 0);
diff -Nru tupi-0.2+git04/src/libtupi/tupsocketbase.cpp tupi-0.2+git05/src/libtupi/tupsocketbase.cpp
--- tupi-0.2+git04/src/libtupi/tupsocketbase.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupsocketbase.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,10 +34,6 @@
  ***************************************************************************/
 
 #include "tupsocketbase.h"
-#include "tdebug.h"
-
-#include <QTextStream>
-#include <QQueue>
 
 struct TupSocketBase::Private
 {
@@ -73,8 +69,6 @@
 
 void TupSocketBase::send(const QString &message)
 {
-    tError() << "TupSocketBase::send() - message: " << message;
-
     if (state() == QAbstractSocket::ConnectedState) {
         QTextStream stream(this);
         stream.setCodec("UTF-8");
diff -Nru tupi-0.2+git04/src/libtupi/tupsocketbase.h tupi-0.2+git05/src/libtupi/tupsocketbase.h
--- tupi-0.2+git04/src/libtupi/tupsocketbase.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupsocketbase.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,8 +36,10 @@
 #ifndef TUPSOCKETBASE_H
 #define TUPSOCKETBASE_H
 
-#include "tupglobal.h"
+#include "tglobal.h"
 
+#include <QTextStream>
+#include <QQueue>
 #include <QTcpSocket>
 #include <QDomDocument>
 
diff -Nru tupi-0.2+git04/src/libtupi/tupsvg2qt.cpp tupi-0.2+git05/src/libtupi/tupsvg2qt.cpp
--- tupi-0.2+git04/src/libtupi/tupsvg2qt.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupsvg2qt.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,14 +34,11 @@
  ***************************************************************************/
 
 #include "tupsvg2qt.h"
-#include <cmath>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
 
-#include "tdebug.h"
-
 TupSvg2Qt::TupSvg2Qt()
 {
 }
@@ -198,9 +195,8 @@
     QList<qreal> points;
     QString temp;
     
-    while ((*itr).isSpace()) {
-        ++itr;
-    }
+    while ((*itr).isSpace())
+           ++itr;
     
     while ((*itr).isNumber() || (*itr) == QLatin1Char('-') 
            || (*itr) == QLatin1Char('+') || (*itr) == QLatin1Char('.')) {
@@ -233,9 +229,8 @@
         while ((*itr).isSpace())
                ++itr;
         
-        if ((*itr) == QLatin1Char(',')) {
+        if ((*itr) == QLatin1Char(','))
             ++itr;
-        }
         
         bool ok = false;
         qreal number = temp.toDouble(&ok);
@@ -246,9 +241,47 @@
             points.append(0.0f);
         
         // eat the rest of space
-        while ((*itr).isSpace()) {
+        while ((*itr).isSpace())
                ++itr;
-        }
+    }
+
+    return points;
+}
+
+QList<int> TupSvg2Qt::parseIntList(QString::const_iterator &itr)
+{
+    QList<int> points;
+    QString temp;
+
+    while ((*itr).isSpace())
+           ++itr;
+
+    while ((*itr).isNumber()) {
+           temp = QString();
+
+           while ((*itr).isDigit())
+                  temp += *itr++;
+
+           while ((*itr).isDigit())
+                  temp += *itr++;
+
+           while ((*itr).isSpace())
+                  ++itr;
+
+           if ((*itr) == QLatin1Char(','))
+               ++itr;
+   
+           bool ok = false;
+           int number = temp.toInt(&ok);
+   
+           if (ok)
+               points.append(number);
+           else
+               points.append(0);
+
+           // eat the rest of space
+           while ((*itr).isSpace())
+                  ++itr;
     }
 
     return points;
@@ -278,7 +311,8 @@
                qreal offsetX = x;        // correction offsets
                qreal offsetY = y;        // for relative commands
 
-               switch (pathElem.toAscii()) {
+               // switch (pathElem.toAscii()) {
+               switch (pathElem.toLatin1()) {
                        case 'm': 
                        {
                            x = x0 = arg[0] + offsetX;
@@ -500,7 +534,8 @@
                        break;
             }
 
-            lastMode = pathElem.toAscii();
+            // lastMode = pathElem.toAscii();
+            lastMode = pathElem.toLatin1();
         }
     }
 
diff -Nru tupi-0.2+git04/src/libtupi/tupsvg2qt.h tupi-0.2+git05/src/libtupi/tupsvg2qt.h
--- tupi-0.2+git04/src/libtupi/tupsvg2qt.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupsvg2qt.h	2014-12-15 14:21:33.000000000 +0000
@@ -32,15 +32,18 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifndef TUPSVG2QT_H
 #define TUPSVG2QT_H
 
+#include "tglobal.h"
+
+#include <cmath>
 #include <QString>
 #include <QPainterPath>
 #include <QPen>
 #include <QXmlAttributes>
 #include <QBrush>
-#include "tupglobal.h"
 
 /**
  * @author David Cuadrado
@@ -61,6 +64,7 @@
         static bool parseBrush(QBrush &brush, const QXmlAttributes &attributes);
         
         static QList<qreal> parseNumbersList(QString::const_iterator &itr);
+        static QList<int> parseIntList(QString::const_iterator &itr);
 };
 
 #endif
diff -Nru tupi-0.2+git04/src/libtupi/tupxmlparserbase.cpp tupi-0.2+git05/src/libtupi/tupxmlparserbase.cpp
--- tupi-0.2+git04/src/libtupi/tupxmlparserbase.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupxmlparserbase.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupxmlparserbase.h"
-#include "tdebug.h"
 
 struct TupXmlParserBase::Private
 {
@@ -111,15 +110,34 @@
 
 bool TupXmlParserBase::error(const QXmlParseException & exception)
 {
-     tWarning() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
-     tWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;
+#ifdef K_DEBUG	
+    #ifdef Q_OS_WIN32
+        QString msg1 = exception.lineNumber() + QString("x") + exception.columnNumber() + QString(": ") + exception.message();
+        qDebug() << msg1;
+    #else
+	    tWarning() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
+        tWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;		
+        #endif
+#else
+     Q_UNUSED(exception);
+#endif
      return true;
 }
 
 bool TupXmlParserBase::fatalError(const QXmlParseException & exception)
 {
-     tFatal() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
-     tWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;
+#ifdef K_DEBUG	
+    #ifdef Q_OS_WIN32
+        QString msg1 = exception.lineNumber() + QString("x") + exception.columnNumber() + QString(": ") + exception.message();
+        qDebug() << msg1;
+    #else
+        tFatal() << exception.lineNumber() << "x" << exception.columnNumber() << ": " << exception.message();
+        tWarning() << __PRETTY_FUNCTION__ << " Document: " << k->document;	
+    #endif
+#else
+     Q_UNUSED(exception);
+#endif
+
      return true;
 }
 
@@ -139,6 +157,7 @@
 }
 
 QString TupXmlParserBase::root() const
+
 {
      return k->root;
 }
@@ -158,12 +177,18 @@
      return reader.parse(&xmlsource);
 }
 
-
 bool TupXmlParserBase::parse(QFile *file)
 {
      if (!file->isOpen()) {
          if (! file->open(QIODevice::ReadOnly | QIODevice::Text)) {
-             tWarning() << "Cannot open file " << file->fileName();
+#ifdef K_DEBUG
+             QString msg = "TupXmlParserBase::parse() - Cannot open file " + file->fileName();
+             #ifdef Q_OS_WIN32
+                 qDebug() << msg;
+             #else
+                 tWarning() << msg;
+             #endif
+#endif
              return false;
          }
      }
diff -Nru tupi-0.2+git04/src/libtupi/tupxmlparserbase.h tupi-0.2+git05/src/libtupi/tupxmlparserbase.h
--- tupi-0.2+git04/src/libtupi/tupxmlparserbase.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libtupi/tupxmlparserbase.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPXMLPARSERBASE_H
 #define TUPXMLPARSERBASE_H
 
+#include "tglobal.h"
+
 #include <QXmlDefaultHandler>
 
 /**
  * @author David Cuadrado
 */
 
-class TupXmlParserBase : public QXmlDefaultHandler
+class TUPI_EXPORT TupXmlParserBase : public QXmlDefaultHandler
 {
     public:
         ~TupXmlParserBase();
diff -Nru tupi-0.2+git04/src/libui/libui.pri tupi-0.2+git05/src/libui/libui.pri
--- tupi-0.2+git04/src/libui/libui.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/libui.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,9 +1,14 @@
 ANIMATION_DIR = ../components/animation
-
 INCLUDEPATH += $$LIBUI_DIR
 INCLUDEPATH += $$ANIMATION_DIR
 
-LIBS += -L$$LIBUI_DIR -ltupigui
+unix {
+    LIBS += -L$$LIBUI_DIR -ltupigui
+}
+
+win32 {
+    LIBS += -L$$LIBUI_DIR/release/ -ltupigui
+}
 
 linux-g++ {
     PRE_TARGETDEPS += $$LIBUI_DIR/libtupigui.so
diff -Nru tupi-0.2+git04/src/libui/libui.pro tupi-0.2+git05/src/libui/libui.pro
--- tupi-0.2+git04/src/libui/libui.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/libui.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,10 +1,14 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/libui
-# Target is a library: ui
+QT += opengl core gui svg xml network
 
-!include(../../tupiglobal.pri) {
-    error("Please configure first")
+unix {
+    !include(../../tupiglobal.pri) {
+        error("Please configure first")
+    }
+}
+
+win32 {
+    include(../../quazip.win.pri)
+    include(../../win.pri)
 }
 
 INSTALLS += images images-en 
diff -Nru tupi-0.2+git04/src/libui/tupabout.cpp tupi-0.2+git05/src/libui/tupabout.cpp
--- tupi-0.2+git04/src/libui/tupabout.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/tupabout.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,17 +34,6 @@
  ***************************************************************************/
 
 #include "tupabout.h"
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QFile>
-#include <QDomDocument>
-#include <QTextStream>
-#include <QPixmap>
-#include <QLabel>
-#include <QScrollArea>
-#include <QTextBrowser>
-#include <QDir>
 
 /**
  * This class defines the About dialog of Tupi.
@@ -54,15 +43,20 @@
 
 TupAbout::TupAbout(QWidget *parent) : TabDialog(Cancel, parent)
 {
+    // SQA: Check if these instructions are doing something for real
     setWindowIcon(QIcon(THEME_DIR + "icons" + QDir::separator() + "about.png"));
-    setWindowTitle(tr("About Tupi"));
+    setWindowTitle(tr("About Tupi"));    
     setFixedSize(525, 458);
 
     QStringList path;
-    QString resources = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator();
+#ifdef Q_OS_WIN32
+    QString resources = SHARE_DIR + "help" + QDir::separator();
+#else
+	QString resources = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator();
+#endif
     path << resources + "css";
     path << resources + "images";
-
+	
     QString lang = "en";
     if (QString(QLocale::system().name()).length() > 1)
         lang = QString(QLocale::system().name()).left(2);
@@ -81,14 +75,24 @@
 
     if (!file.open(QIODevice::ReadOnly)) {
         #ifdef K_DEBUG
-               tError() << "TupAbout::TupAbout() - Fatal Error: Can't open \"credits.xml\" file";
+            QString msg = "TupAbout::TupAbout() - Fatal Error: Can't open \"credits.xml\" file";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return;
     }
 
     if (!doc.setContent(&file)) {
         #ifdef K_DEBUG
-               tError() << "TupAbout::TupAbout() - Fatal Error: File \"credits.xml\" is corrupt!";
+            QString msg = "TupAbout::TupAbout() - Fatal Error: File \"credits.xml\" is corrupt!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         file.close();
         return;
@@ -117,32 +121,49 @@
 
     // Acknowledgment Tab 
 
+    QString sponsorFile = QString() + "help" + QDir::separator() + lang + QDir::separator() + "thanks.html";
+#ifdef Q_OS_WIN32
+    QString sponsorPath = SHARE_DIR + sponsorFile;
+#else
+    QString sponsorPath = SHARE_DIR + "data" + QDir::separator() + sponsorFile;
+#endif
     QTextBrowser *sponsorsText = new QTextBrowser;
     sponsorsText->setSearchPaths(path);
     sponsorsText->setOpenExternalLinks(true);
-    sponsorsText->setSource(SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator() + lang + QDir::separator() + "thanks.html");
+    sponsorsText->setSource(QUrl::fromLocalFile(sponsorPath));
     sponsorsText->moveCursor(QTextCursor::Start);
 
     addTab(sponsorsText, tr("Thanks"));
 
     // Tupi Description Tab 
 
+    QString tupiFile = QString() + "help" + QDir::separator() + lang + QDir::separator() + "tupi_short.html";
+#ifdef Q_OS_WIN32
+    QString tupiPath = SHARE_DIR + tupiFile;
+#else
+    QString tupiPath = SHARE_DIR + "data" + QDir::separator() + tupiFile;
+#endif
     QTextBrowser *tupiText = new QTextBrowser;
     tupiText->setSearchPaths(path);
     tupiText->setOpenExternalLinks(true);
-    tupiText->setSource(SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator() + lang + QDir::separator() + "tupi_short.html");
+    tupiText->setSource(QUrl::fromLocalFile(tupiPath));
     tupiText->moveCursor(QTextCursor::Start);
 
     addTab(tupiText, tr("About"));
 
     // 4: License Terms Tab
 
+    QString licenseFile = QString() + "help" + QDir::separator() + lang + QDir::separator() + "philosophy.html"; 
+#ifdef Q_OS_WIN32
+    QString licensePath = SHARE_DIR + licenseFile;
+#else
+    QString licensePath = SHARE_DIR + "data" + QDir::separator() + licenseFile;
+#endif
     QTextBrowser *licenseText = new QTextBrowser;
     licenseText->setSearchPaths(path);
     licenseText->setOpenExternalLinks(true);
-    licenseText->setSource(SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator() + lang + QDir::separator() + "philosophy.html");
+    licenseText->setSource(QUrl::fromLocalFile(licensePath));
     licenseText->moveCursor(QTextCursor::Start);
-
     addTab(licenseText, tr("License Agreement"));
     setButtonText(Cancel, tr("Close"));
 }
diff -Nru tupi-0.2+git04/src/libui/tupabout.h tupi-0.2+git05/src/libui/tupabout.h
--- tupi-0.2+git04/src/libui/tupabout.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/tupabout.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,19 @@
 #ifndef TUPABOUT_H
 #define TUPABOUT_H
 
+#include "tglobal.h"
+#include "tapplicationproperties.h"
 #include "tabdialog.h"
 #include "tanimwidget.h"
-#include "tapplicationproperties.h"
 
 #include <QTextBrowser>
 #include <QLabel>
 #include <QPixmap>
+#include <QFile>
+#include <QDomDocument>
+#include <QTextStream>
+#include <QScrollArea>
+#include <QDir>
 
 /**
  * @brief Class that handles the about dialog box
@@ -62,7 +68,7 @@
  * Moreover, it provides an OK Button and a Cancel Button.
  */
 
-class TupAbout : public TabDialog
+class TUPI_EXPORT TupAbout : public TabDialog
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/libui/tuppaintareaconfig.cpp tupi-0.2+git05/src/libui/tuppaintareaconfig.cpp
--- tupi-0.2+git04/src/libui/tuppaintareaconfig.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/tuppaintareaconfig.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,14 +34,6 @@
  ***************************************************************************/
 
 #include "tuppaintareaconfig.h"
-#include "tcolorbutton.h"
-#include "tconfig.h"
-#include "tdebug.h"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QLabel>
 
 /**
  * This class handles the preferences dialog for the paint area settings.
diff -Nru tupi-0.2+git04/src/libui/tuppaintareaconfig.h tupi-0.2+git05/src/libui/tuppaintareaconfig.h
--- tupi-0.2+git04/src/libui/tuppaintareaconfig.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/tuppaintareaconfig.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,15 +36,23 @@
 #ifndef TUPPAINTAREACONFIG_H
 #define TUPPAINTAREACONFIG_H
 
+#include "tglobal.h"
+#include "tcolorbutton.h"
+#include "tconfig.h"
+
 #include <QWidget>
 #include <QSpinBox>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QLabel>
 
 class TColorButton;
 
 /**
  * @author David Cuadrado
 */
-class TupPaintAreaConfig : public QWidget
+class TUPI_EXPORT TupPaintAreaConfig : public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/libui/tuppreferences.cpp tupi-0.2+git05/src/libui/tuppreferences.cpp
--- tupi-0.2+git04/src/libui/tuppreferences.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/tuppreferences.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,15 +35,12 @@
 
 #include "tuppreferences.h"
 #include "tuppaintareaconfig.h"
-#include "tglobal.h"
-#include "tdebug.h"
 #include "tapplication.h"
 #include "tformfactory.h"
 
 #include <QFile>
 #include <QTextStream>
 #include <QTextCodec>
-
 #include <QLabel>
 #include <QLineEdit>
 #include <QComboBox>
diff -Nru tupi-0.2+git04/src/libui/tuppreferences.h tupi-0.2+git05/src/libui/tuppreferences.h
--- tupi-0.2+git04/src/libui/tuppreferences.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/tuppreferences.h	2014-12-15 14:21:33.000000000 +0000
@@ -41,23 +41,22 @@
  * @brief Include this file if you need the class TupPreferences
  */
 
-#include <QLineEdit>
-#include <QLabel>
-#include <QRadioButton>
-
+#include "tglobal.h"
 #include "tfontchooser.h"
 #include "tabdialog.h"
 #include "tconfigurationdialog.h"
-
 #include "tupthemeselector.h"
-#include "tupglobal.h"
+
+#include <QLineEdit>
+#include <QLabel>
+#include <QRadioButton>
 
 class ColorSchemePref;
 class TupPaintAreaConfig;
 
-class TupPreferences : public TConfigurationDialog
+class TUPI_EXPORT TupPreferences : public TConfigurationDialog
 {
-    Q_OBJECT;
+    Q_OBJECT
     
     public:
         TupPreferences(QWidget *parent);
diff -Nru tupi-0.2+git04/src/libui/tupthemeselector.cpp tupi-0.2+git05/src/libui/tupthemeselector.cpp
--- tupi-0.2+git04/src/libui/tupthemeselector.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/tupthemeselector.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,8 +34,6 @@
  ***************************************************************************/
 
 #include "tupthemeselector.h"
-#include "tglobal.h"
-#include "tdebug.h"
 #include "tseparator.h"
 #include "tcolorbutton.h"
 #include "tapplication.h"
@@ -173,7 +171,8 @@
     
     m_allSchemes = new QTreeWidget;
     m_allSchemes->setHeaderLabels(QStringList() << tr("Schema") << tr("Owner") << tr("Date"));
-    m_allSchemes->header()->setResizeMode(QHeaderView::Stretch);
+    // m_allSchemes->header()->setResizeMode(QHeaderView::Stretch);
+    m_allSchemes->header()->setSectionResizeMode(QHeaderView::Stretch);
     
     schemaLayout->addWidget(m_allSchemes);
     
@@ -308,8 +307,12 @@
         
         if (! item->text(0).isEmpty()) {
             #ifdef K_DEBUG
-                T_FUNCINFO;
-            #endif
+                #ifdef Q_OS_WIN32
+                    qDebug() << "[TupThemeSelector::loadSchemaFromListView()]";
+                #else
+                    T_FUNCINFO;
+                #endif
+            #endif 			
             TCONFIG->beginGroup("General");
             TCONFIG->setValue("ThemeFile", SHARE_DIR + "themes/" + item->text(0));
             m_lastFile = SHARE_DIR + "themes/" + item->text(0);
diff -Nru tupi-0.2+git04/src/libui/tupthemeselector.h tupi-0.2+git05/src/libui/tupthemeselector.h
--- tupi-0.2+git04/src/libui/tupthemeselector.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/libui/tupthemeselector.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,6 +36,11 @@
 #ifndef TUPTHEMESELECTOR_H
 #define TUPTHEMESELECTOR_H
 
+#include "tglobal.h"
+#include "themedocument.h"
+#include "tvhbox.h"
+#include "tapplicationproperties.h"
+
 #include <QMap>
 #include <QTreeWidget>
 #include <QGroupBox>
@@ -48,17 +53,13 @@
 #include <QGridLayout>
 #include <QButtonGroup>
 
-#include "themedocument.h"
-#include "tvhbox.h"
-#include "tapplicationproperties.h"
-
 class QCheckBox;
 
 /**
  * @author David Cuadrado
 */
 
-class TupThemeSelector : public TVHBox
+class TUPI_EXPORT TupThemeSelector : public TVHBox
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/net/net.pri tupi-0.2+git05/src/net/net.pri
--- tupi-0.2+git04/src/net/net.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/net.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,6 +1,12 @@
-
+# QT += network
 INCLUDEPATH += $$NET_DIR
 
-LIBS += -L$$NET_DIR -ltupinet
+unix {
+    LIBS += -L$$NET_DIR -ltupinet
+}
+
+win32 {
+    LIBS += -L$$NET_DIR/release/ -ltupinet
+}
+
 
-QT += network
diff -Nru tupi-0.2+git04/src/net/net.pro tupi-0.2+git05/src/net/net.pro
--- tupi-0.2+git04/src/net/net.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/net.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,10 +1,13 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/net
-# Target is a library: net
+QT += opengl core gui svg xml network
 
-!include(../../tupiglobal.pri) {
-    error("Please configure first")
+unix {
+    !include(../../tupiglobal.pri) {
+        error("Please configure first")
+    }
+}
+
+win32 {
+    include(../../win.pri)
 }
 
 INSTALLS += target
diff -Nru tupi-0.2+git04/src/net/tupackparser.h tupi-0.2+git05/src/net/tupackparser.h
--- tupi-0.2+git04/src/net/tupackparser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupackparser.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,14 @@
 #ifndef TUPACKPARSER_H
 #define TUPACKPARSER_H
 
+#include "tglobal.h"
 #include "tupxmlparserbase.h"
 
 /**
  * @author David Cuadrado 
 */
 
-class TupAckParser : public TupXmlParserBase
+class TUPI_EXPORT TupAckParser : public TupXmlParserBase
 {
     public:
         TupAckParser();
diff -Nru tupi-0.2+git04/src/net/tupchat.cpp tupi-0.2+git05/src/net/tupchat.cpp
--- tupi-0.2+git04/src/net/tupchat.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupchat.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,18 +34,8 @@
  ***************************************************************************/
 
 #include "tupchat.h"
-#include "tdebug.h"
 
-#include <QTextBrowser>
-#include <QLineEdit>
-#include <QGridLayout>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QTime>
-#include <QList>
-#include <QKeyEvent>
-
-class TupChat::Private
+struct TupChat::Private
 {
     public:
         Private()
diff -Nru tupi-0.2+git04/src/net/tupchat.h tupi-0.2+git05/src/net/tupchat.h
--- tupi-0.2+git04/src/net/tupchat.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupchat.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,14 +36,23 @@
 #ifndef TUPCHAT_H
 #define TUPCHAT_H
 
+#include "tglobal.h"
+
 #include <QWidget>
 #include <QKeyEvent>
+#include <QTextBrowser>
+#include <QLineEdit>
+#include <QGridLayout>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QTime>
+#include <QList>
 
 /**
  * @author David Cuadrado 
 */
 
-class TupChat : public QWidget
+class TUPI_EXPORT TupChat : public QWidget
 {
     Q_OBJECT
     
diff -Nru tupi-0.2+git04/src/net/tupchatpackage.h tupi-0.2+git05/src/net/tupchatpackage.h
--- tupi-0.2+git04/src/net/tupchatpackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupchatpackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPCHATPACKAGE_H
 #define TUPCHATPACKAGE_H
 
+#include "tglobal.h"
+
 #include <QDomDocument>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupChatPackage: public QDomDocument
+class TUPI_EXPORT TupChatPackage: public QDomDocument
 {
     public:
         TupChatPackage(const QString &text);
diff -Nru tupi-0.2+git04/src/net/tupcommunicationparser.h tupi-0.2+git05/src/net/tupcommunicationparser.h
--- tupi-0.2+git04/src/net/tupcommunicationparser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupcommunicationparser.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,14 @@
 #ifndef TUPCOMMUNICATIONPARSER_H
 #define TUPCOMMUNICATIONPARSER_H
 
+#include "tglobal.h"
 #include "tupxmlparserbase.h"
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupCommunicationParser : public TupXmlParserBase
+class TUPI_EXPORT TupCommunicationParser : public TupXmlParserBase
 {
     public:
         TupCommunicationParser();
diff -Nru tupi-0.2+git04/src/net/tupconnectdialog.cpp tupi-0.2+git05/src/net/tupconnectdialog.cpp
--- tupi-0.2+git04/src/net/tupconnectdialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupconnectdialog.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,18 +34,6 @@
  ***************************************************************************/
 
 #include "tupconnectdialog.h"
-#include "tupnetprojectmanagerparams.h"
-#include "tconfig.h"
-#include "tformfactory.h"
-#include "tosd.h"
-
-#include <QLineEdit>
-#include <QCheckBox>
-#include <QGridLayout>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QSpinBox>
-#include <QDialogButtonBox>
 
 struct TupConnectDialog::Private
 {
diff -Nru tupi-0.2+git04/src/net/tupconnectdialog.h tupi-0.2+git05/src/net/tupconnectdialog.h
--- tupi-0.2+git04/src/net/tupconnectdialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupconnectdialog.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,15 +36,28 @@
 #ifndef TUPCONNECTDIALOG_H
 #define TUPCONNECTDIALOG_H
 
+#include "tglobal.h"
+#include "tupnetprojectmanagerparams.h"
+#include "tconfig.h"
+#include "tformfactory.h"
+#include "tosd.h"
+
 #include <QDialog>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QSpinBox>
+#include <QDialogButtonBox>
 
-class TupNetProjectManagerParams;
+// class TupNetProjectManagerParams;
 
 /**
  * @author David Cuadrado
 */
 
-class TupConnectDialog : public QDialog
+class TUPI_EXPORT TupConnectDialog : public QDialog
 {
     Q_OBJECT
 
@@ -68,7 +81,7 @@
         void saveSettings();
         
     private:
-        class Private;
+        struct Private;
         Private *const k;
 };
 
diff -Nru tupi-0.2+git04/src/net/tupconnectpackage.cpp tupi-0.2+git05/src/net/tupconnectpackage.cpp
--- tupi-0.2+git04/src/net/tupconnectpackage.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupconnectpackage.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,11 +34,6 @@
  ***************************************************************************/
 
 #include "tupconnectpackage.h"
-#include "talgorithm.h"
-#include "tdebug.h"
-
-#include <QCryptographicHash>
-#include <QStringList>
 
 /*
 <user_connect version="0">
diff -Nru tupi-0.2+git04/src/net/tupconnectpackage.h tupi-0.2+git05/src/net/tupconnectpackage.h
--- tupi-0.2+git04/src/net/tupconnectpackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupconnectpackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,18 @@
 #ifndef TUPCONNECTPACKAGE_H
 #define TUPCONNECTPACKAGE_H
 
+#include "tglobal.h"
+#include "talgorithm.h"
+
 #include <QDomDocument>
+#include <QCryptographicHash>
+#include <QStringList>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupConnectPackage : public QDomDocument
+class TUPI_EXPORT TupConnectPackage : public QDomDocument
 {
     public:
         TupConnectPackage(const QString &server, const QString &username, const QString &passwd);
diff -Nru tupi-0.2+git04/src/net/tupimageexportpackage.h tupi-0.2+git05/src/net/tupimageexportpackage.h
--- tupi-0.2+git04/src/net/tupimageexportpackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupimageexportpackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPIMAGEEXPORTPACKAGE_H
 #define TUPIMAGEEXPORTPACKAGE_H
 
+#include "tglobal.h"
+
+#include <QDomDocument>
+
 /**
  * @author Gustav Gonzalez
 */
 
-#include <QDomDocument>
-
-class TupImageExportPackage : public QDomDocument
+class TUPI_EXPORT TupImageExportPackage : public QDomDocument
 {
     public:
         TupImageExportPackage(int frameIndex, int sceneIndex, const QString &title, const QString &topics, const QString &description);
diff -Nru tupi-0.2+git04/src/net/tupimportprojectpackage.cpp tupi-0.2+git05/src/net/tupimportprojectpackage.cpp
--- tupi-0.2+git04/src/net/tupimportprojectpackage.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupimportprojectpackage.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupimportprojectpackage.h"
-#include <QFile>
 
 TupImportProjectPackage::TupImportProjectPackage(const QString &projectPath)
 {
diff -Nru tupi-0.2+git04/src/net/tupimportprojectpackage.h tupi-0.2+git05/src/net/tupimportprojectpackage.h
--- tupi-0.2+git04/src/net/tupimportprojectpackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupimportprojectpackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,16 @@
 #ifndef TUPIMPORTPROJECTPACKAGE_H
 #define TUPIMPORTPROJECTPACKAGE_H 
 
+#include "tglobal.h"
+
 #include <QDomDocument>
+#include <QFile>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupImportProjectPackage : public QDomDocument
+class TUPI_EXPORT TupImportProjectPackage : public QDomDocument
 {
     public:
         TupImportProjectPackage(const QString &projectPath);
diff -Nru tupi-0.2+git04/src/net/tuplistpackage.h tupi-0.2+git05/src/net/tuplistpackage.h
--- tupi-0.2+git04/src/net/tuplistpackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tuplistpackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPLISTPACKAGE_H
 #define TUPLISTPACKAGE_H
 
+#include "tglobal.h"
+
 #include <QDomDocument>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupListPackage : public QDomDocument
+class TUPI_EXPORT TupListPackage : public QDomDocument
 {
     public:
         enum Type {
diff -Nru tupi-0.2+git04/src/net/tuplistprojectdialog.cpp tupi-0.2+git05/src/net/tuplistprojectdialog.cpp
--- tupi-0.2+git04/src/net/tuplistprojectdialog.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tuplistprojectdialog.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,16 +34,6 @@
  ***************************************************************************/
 
 #include "tuplistprojectdialog.h"
-#include "treelistwidget.h"
-#include "treewidgetsearchline.h"
-#include "tdebug.h"
-
-#include <QToolButton>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QPushButton>
-#include <QLabel>
 
 struct TupListProjectDialog::Private
 {
diff -Nru tupi-0.2+git04/src/net/tuplistprojectdialog.h tupi-0.2+git05/src/net/tuplistprojectdialog.h
--- tupi-0.2+git04/src/net/tuplistprojectdialog.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tuplistprojectdialog.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,18 +36,28 @@
 #ifndef TUPLISTPROJECTDIALOG_H
 #define TUPLISTPROJECTDIALOG_H
 
+#include "tglobal.h"
 #include "tapplicationproperties.h"
+#include "treelistwidget.h"
+#include "treewidgetsearchline.h"
 
 #include <QDialog>
 #include <QTreeWidget>
+#include <QToolButton>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QLabel>
+#include <QTreeWidgetItem>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class QTreeWidgetItem;
+// class QTreeWidgetItem;
 
-class TupListProjectDialog : public QDialog
+class TUPI_EXPORT TupListProjectDialog : public QDialog
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/net/tuplistprojectspackage.h tupi-0.2+git05/src/net/tuplistprojectspackage.h
--- tupi-0.2+git04/src/net/tuplistprojectspackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tuplistprojectspackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPLISTPROJECTSPACKAGE_H
 #define TUPLISTPROJECTSPACKAGE_H
 
+#include "tglobal.h"
+
 #include <QDomDocument>
 
 /**
  * @author David Cuadrado
 */
 
-class TupListProjectsPackage : public QDomDocument
+class TUPI_EXPORT TupListProjectsPackage : public QDomDocument
 {
     public:
         TupListProjectsPackage();
diff -Nru tupi-0.2+git04/src/net/tupnetfilemanager.cpp tupi-0.2+git05/src/net/tupnetfilemanager.cpp
--- tupi-0.2+git04/src/net/tupnetfilemanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnetfilemanager.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -33,14 +33,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#include <QFile>
-#include <QTextStream>
-#include <QDomDocument>
-#include <QDomElement>
-
 #include "tupnetfilemanager.h"
-#include "tupproject.h"
-#include "tupnetprojectmanagerparams.h"
 
 TupNetFileManager::TupNetFileManager() : TupFileManager()
 {
@@ -54,7 +47,7 @@
 {
 }
 
-bool TupNetFileManager::save(const QString &_filename, const TupProject *project)
+bool TupNetFileManager::save(const QString &_filename, TupProject *project)
 {
     QString filename = _filename;
     
diff -Nru tupi-0.2+git04/src/net/tupnetfilemanager.h tupi-0.2+git05/src/net/tupnetfilemanager.h
--- tupi-0.2+git04/src/net/tupnetfilemanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnetfilemanager.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,17 +36,24 @@
 #ifndef TUPNETFILEMANAGER_H
 #define TUPNETFILEMANAGER_H 
 
+#include "tglobal.h"
 #include "tupfilemanager.h"
+#include "tupproject.h"
+#include "tupnetprojectmanagerparams.h"
 
 #include <QString>
+#include <QFile>
+#include <QTextStream>
+#include <QDomDocument>
+#include <QDomElement>
 
-class TupNetProjectManagerParams;
+// class TupNetProjectManagerParams;
 
 /**
  * @author David Cuadrado
 */
 
-class TupNetFileManager : public TupFileManager 
+class TUPI_EXPORT TupNetFileManager : public TupFileManager 
 {
     public:
 
@@ -54,7 +61,8 @@
         TupNetFileManager(const QString &server, int port);
         ~TupNetFileManager();
         
-        virtual bool save(const QString &filename, const TupProject *project);
+        // virtual bool save(const QString &filename, const TupProject *project);
+        virtual bool save(const QString &filename, TupProject *project);
         virtual bool load(const QString &filename, TupProject *project);
         
         TupNetProjectManagerParams *params(const QString &filename);
diff -Nru tupi-0.2+git04/src/net/tupnetprojectmanagerhandler.cpp tupi-0.2+git05/src/net/tupnetprojectmanagerhandler.cpp
--- tupi-0.2+git04/src/net/tupnetprojectmanagerhandler.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnetprojectmanagerhandler.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,41 +34,6 @@
  ***************************************************************************/
 
 #include "tupnetprojectmanagerhandler.h"
-#include "tupnetprojectmanagerparams.h"
-#include "tupprojectresponse.h"
-#include "tdebug.h"
-#include "tosd.h"
-
-#include "tupprojectcommand.h"
-#include "tupcommandexecutor.h"
-#include "tupnetsocket.h"
-#include "tupprojectrequest.h"
-#include "tupnewprojectpackage.h"
-#include "tupconnectpackage.h"
-#include "tupimageexportpackage.h"
-#include "tupvideoexportpackage.h"
-#include "tupstoryboardupdatepackage.h"
-#include "tupstoryboardexportpackage.h"
-#include "tupstoryboardparser.h"
-#include "tupnetfilemanager.h"
-#include "tupopenpackage.h"
-#include "tupchatpackage.h"
-#include "tupnotificationparser.h"
-#include "tupprojectlistparser.h"
-#include "tupprojectparser.h"
-#include "tuprequestparser.h"
-#include "tupackparser.h"
-#include "tupcommunicationparser.h"
-#include "tuprequestbuilder.h"
-#include "tupproject.h"
-#include "tuplistprojectdialog.h"
-#include "tupchat.h"
-#include "tupnotice.h"
-
-#include <QTemporaryFile>
-#include <QTabWidget>
-#include <QDesktopWidget>
-#include <QMessageBox>
 
 struct TupNetProjectManagerHandler::Private
 {
@@ -94,7 +59,11 @@
 TupNetProjectManagerHandler::TupNetProjectManagerHandler(QObject *parent) : TupAbstractProjectHandler(parent), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupNetProjectManagerHandler()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     k->socket = new TupNetSocket(this);
@@ -125,9 +94,14 @@
 TupNetProjectManagerHandler::~TupNetProjectManagerHandler()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupNetProjectManagerHandler()]";
+        #else
+            TEND;
+        #endif
     #endif
 
+
     k->chat->close();
     delete k;
 }
@@ -135,7 +109,11 @@
 void TupNetProjectManagerHandler::handleProjectRequest(const TupProjectRequest* request)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupNetProjectManagerHandler::handleProjectRequest()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     // This comes from the project before the command execution
@@ -144,7 +122,12 @@
 
     if (k->socket->state() == QAbstractSocket::ConnectedState) {
         #ifdef K_DEBUG
-               tWarning() << "TupNetProjectManagerHandler::handleProjectRequest() - SENDING PACKAGE: " << request->xml();
+            QString msg = "TupNetProjectManagerHandler::handleProjectRequest() - SENDING PACKAGE: " + request->xml();
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
 
         if (request->isValid()) {
@@ -152,7 +135,12 @@
             k->socket->send(request->xml());
         } else {
             #ifdef K_DEBUG
-                   tFatal() << "TupNetProjectManagerHandler::handleProjectRequest() - INVALID REQUEST! ID: " << request->id();
+                QString msg = "TupNetProjectManagerHandler::handleProjectRequest() - INVALID REQUEST! ID: " + QString::number(request->id());
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tFatal() << msg;
+                #endif
             #endif
         }
     }
@@ -161,7 +149,11 @@
 bool TupNetProjectManagerHandler::commandExecuted(TupProjectResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupNetProjectManagerHandler::commandExecuted()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (response->mode() == TupProjectResponse::Do) {
@@ -187,7 +179,11 @@
 bool TupNetProjectManagerHandler::saveProject(const QString &fileName, TupProject *project)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupNetProjectManagerHandler::saveProject()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     Q_UNUSED(fileName);
@@ -227,14 +223,19 @@
 {
     TupNetProjectManagerParams *netparams = dynamic_cast<TupNetProjectManagerParams*>(params);
 
-    if (! netparams) 
+    if (!netparams) 
         return;
     
     k->params = netparams;
     
     #ifdef K_DEBUG
-           tDebug("net") << "TupNetProjectManagerHandler::initialize() - Connecting to " << netparams->server() << ":" << netparams->port();
-    #endif    
+        QString msg = "TupNetProjectManagerHandler::initialize() - Connecting to " + netparams->server() + ":" + QString::number(netparams->port());
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning("net") << msg;
+        #endif
+    #endif
 
     k->socket->connectToHost(k->params->server(), k->params->port());
     bool connected = k->socket->waitForConnected(1000);
@@ -252,11 +253,15 @@
 {
     TupNetProjectManagerParams *netparams = dynamic_cast<TupNetProjectManagerParams*>(params);
     
-    if (! netparams) 
+    if (!netparams) 
         return false;
     
     #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+           qWarning() << "netparams->projectName() : " << netparams->projectName();
+        #else
            SHOW_VAR(netparams->projectName());
+        #endif
     #endif    
 
     k->projectName = netparams->projectName();
@@ -296,12 +301,16 @@
 void TupNetProjectManagerHandler::handlePackage(const QString &root, const QString &package)
 {
     #ifdef K_DEBUG
+        QString msg = "TupNetProjectManagerHandler::handlePackage() - PKG:";
+        #ifdef Q_OS_WIN32
+           qDebug() << "[TupNetProjectManagerHandler::handlePackage()]";
+           qDebug() << msg;
+           qWarning() << package;
+        #else
            T_FUNCINFOX("net");
-    #endif
-
-    #ifdef K_DEBUG
-           tDebug() << "TupNetProjectManagerHandler::handlePackage() - PKG:";
+           tDebug() << msg;
            tWarning() << package;
+        #endif
     #endif
 
     if (root == "user_denied") {
@@ -337,11 +346,16 @@
 
                } else { // SQA: show error 
                    #ifdef K_DEBUG
-                          tError() << "TupNetProjectManagerHandler::handlePackage() - Error parsing net request";
+                       QString msg = "TupNetProjectManagerHandler::handlePackage() - Error parsing net request";
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
                    #endif
                }
     } else if (root == "project_storyboard_update") {
-               tError() << "TupNetProjectManagerHandler::handlePackage() - Updating the storyboard...";
+               // tError() << "TupNetProjectManagerHandler::handlePackage() - Updating the storyboard...";
                TupStoryboardParser parser(package);
 
                if (parser.checksum()) {
@@ -351,13 +365,24 @@
                        k->project->scene(parser.sceneIndex())->setStoryboard(storyboard);
                    } else {
                        #ifdef K_DEBUG
-                              tError() << "ProjectManager::handlePackage() - [ Fatal Error ] - Can't parse project_storyboard package";
+                           QString msg = "ProjectManager::handlePackage() - [ Fatal Error ] - Can't parse project_storyboard package";
+                           #ifdef Q_OS_WIN32
+                               qDebug() << msg;
+                           #else
+                               tError() << msg;
+                           #endif
                        #endif
                    }
                } else {
                    #ifdef K_DEBUG
-                          tError() << "ProjectManager::handlePackage() - [ Fatal Error ] - Can't parse project_storyboard package";
+                       QString msg = "ProjectManager::handlePackage() - [ Fatal Error ] - Can't parse project_storyboard package"; 
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
                    #endif
+
                }
     } else if (root == "server_ack") {
                // Checking the package
@@ -384,13 +409,23 @@
                                emit openNewArea(k->project->projectName(), parser.partners());
                            } else {
                                #ifdef K_DEBUG
-                                      tError() << "TupNetProjectManagerHandler::handlePackage() - Error: Net project can't be opened";
+                                   QString msg = "TupNetProjectManagerHandler::handlePackage() - Error: Net project can't be opened";
+                                   #ifdef Q_OS_WIN32
+                                       qDebug() << msg;
+                                   #else
+                                       tError() << msg;
+                                   #endif
                                #endif
                            }
                            delete manager;
                        } else {
                            #ifdef K_DEBUG
-                                  tError() << "TupNetProjectManagerHandler::handlePackage() - Error: Can't open project";
+                               QString msg = "TupNetProjectManagerHandler::handlePackage() - Error: Can't open project";
+                               #ifdef Q_OS_WIN32
+                                   qDebug() << msg;
+                               #else
+                                   tError() << msg;
+                               #endif
                            #endif
                        }
                    }
@@ -416,7 +451,12 @@
 
                        if (k->dialog->exec() == QDialog::Accepted && !k->dialog->projectID().isEmpty()) {
                            #ifdef K_DEBUG
-                                  tDebug() << "TupNetProjectManagerHandler::handlePackage() - opening project " << k->dialog->projectID();
+                               QString msg = "TupNetProjectManagerHandler::handlePackage() - opening project -> " + k->dialog->projectID();
+                               #ifdef Q_OS_WIN32
+                                   qWarning() << msg;
+                               #else
+                                   tWarning() << msg;
+                               #endif
                            #endif
                            k->dialogIsOpen = false;
                            if (k->dialog->workIsMine())
@@ -430,7 +470,12 @@
                    } else {
                        TOsd::self()->display(tr("Information"), tr("User has no available projects in the server"), TOsd::Warning);
                        #ifdef K_DEBUG
-                              tError() << "TupNetProjectManagerHandler::handlePackage() - Info: User has no available projects in the server";
+                           QString msg = "TupNetProjectManagerHandler::handlePackage() - Info: User has no available projects in the server";
+                           #ifdef Q_OS_WIN32
+                               qDebug() << msg;
+                           #else
+                               tError() << msg;
+                           #endif
                        #endif
                        closeConnection();
                    }
@@ -494,7 +539,12 @@
                // SQA: storyboard package must be parsed and the related scene must be updated  
     } else {
       #ifdef K_DEBUG
-             tError("net") << "TupNetProjectManagerHandler::handlePackage() - Error: Unknown package: " << root;
+          QString msg = "TupNetProjectManagerHandler::handlePackage() - Error: Unknown package: " + root;
+          #ifdef Q_OS_WIN32
+              qDebug() << msg;
+          #else
+              tError() << msg;
+          #endif
       #endif
     }
 }
@@ -506,7 +556,7 @@
 
 void TupNetProjectManagerHandler::sendPackage(const QDomDocument &doc)
 {
-    tError() << "TupNetProjectManagerHandler::sendPackage() - xml: " << doc.toString();
+    // tError() << "TupNetProjectManagerHandler::sendPackage() - xml: " << doc.toString();
     k->socket->send(doc);
 }
 
@@ -529,9 +579,15 @@
 void TupNetProjectManagerHandler::connectionLost()
 {
     #ifdef K_DEBUG
-           tWarning() << "TupNetProjectManagerHandler::connectionLost() - The socket has been closed";
+        QString msg = "TupNetProjectManagerHandler::connectionLost() - The socket has been closed";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
     #endif
 
+
     if (k->dialogIsOpen) {
         if (k->dialog) {
             if (k->dialog->isVisible())
@@ -553,7 +609,11 @@
                                                          const QString &title, const QString &topics, const QString &description)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupNetProjectManagerHandler::sendExportImageRequest()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TupImageExportPackage package(frameIndex, sceneIndex, title, topics, description);
@@ -563,7 +623,11 @@
 void TupNetProjectManagerHandler::sendVideoRequest(const QString &title, const QString &topics, const QString &description, int fps, const QList<int> sceneIndexes)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupNetProjectManagerHandler::sendVideoRequest()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TupVideoExportPackage package(title, topics, description, fps, sceneIndexes);
@@ -573,7 +637,11 @@
 void TupNetProjectManagerHandler::updateStoryboardRequest(TupStoryboard *storyboard, int sceneIndex)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupNetProjectManagerHandler::updateStoryboardRequest()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     QDomDocument doc;
@@ -585,7 +653,11 @@
 void TupNetProjectManagerHandler::postStoryboardRequest(int sceneIndex)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupNetProjectManagerHandler::postStoryboardRequest()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TupStoryboardExportPackage package(sceneIndex);
diff -Nru tupi-0.2+git04/src/net/tupnetprojectmanagerhandler.h tupi-0.2+git05/src/net/tupnetprojectmanagerhandler.h
--- tupi-0.2+git04/src/net/tupnetprojectmanagerhandler.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnetprojectmanagerhandler.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,25 +33,61 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef TUPNETPROJECTMANAGER_H
-#define TUPNETPROJECTMANAGER_H
+#ifndef TUPNETPROJECTMANAGERHANDLER_H
+#define TUPNETPROJECTMANAGERHANDLER_H
 
+#include "tglobal.h"
 #include "tupabstractprojectmanagerhandler.h"
 #include "tupstoryboard.h"
 
+#include "tupnetprojectmanagerparams.h"
+#include "tupprojectresponse.h"
+#include "tosd.h"
+#include "tupprojectcommand.h"
+#include "tupcommandexecutor.h"
+#include "tupnetsocket.h"
+#include "tupprojectrequest.h"
+#include "tupnewprojectpackage.h"
+#include "tupconnectpackage.h"
+#include "tupimageexportpackage.h"
+#include "tupvideoexportpackage.h"
+#include "tupstoryboardupdatepackage.h"
+#include "tupstoryboardexportpackage.h"
+#include "tupstoryboardparser.h"
+#include "tupnetfilemanager.h"
+#include "tupopenpackage.h"
+#include "tupchatpackage.h"
+#include "tupnotificationparser.h"
+#include "tupprojectlistparser.h"
+#include "tupprojectparser.h"
+#include "tuprequestparser.h"
+#include "tupackparser.h"
+#include "tupcommunicationparser.h"
+#include "tuprequestbuilder.h"
+#include "tupproject.h"
+#include "tuplistprojectdialog.h"
+#include "tupchat.h"
+#include "tupnotice.h"
+
 #include <QDomDocument>
 #include <QTabWidget>
+#include <QTemporaryFile>
+#include <QTabWidget>
+#include <QDesktopWidget>
+#include <QMessageBox>
 
+/*
 class TupChat;
 class TupProjectCommand;
 class TupNetSocket;
 class TupNetProjectManagerParams;
+*/
 
 /**
  * @author David Cuadrado
 */
 
-class TupNetProjectManagerHandler : public TupAbstractProjectHandler
+class TUPI_EXPORT TupNetProjectManagerHandler : public TupAbstractProjectHandler
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/net/tupnetprojectmanagerparams.h tupi-0.2+git05/src/net/tupnetprojectmanagerparams.h
--- tupi-0.2+git04/src/net/tupnetprojectmanagerparams.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnetprojectmanagerparams.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,14 @@
 #ifndef TUPNETPROJECTMANAGERPARAMS_H
 #define TUPNETPROJECTMANAGERPARAMS_H
 
+#include "tglobal.h"
 #include "tupprojectmanagerparams.h"
 
 /**
  * @author David Cuadrado
 */
 
-class TupNetProjectManagerParams : public TupProjectManagerParams
+class TUPI_EXPORT TupNetProjectManagerParams : public TupProjectManagerParams
 {
     public:
         TupNetProjectManagerParams();
diff -Nru tupi-0.2+git04/src/net/tupnetsocket.cpp tupi-0.2+git05/src/net/tupnetsocket.cpp
--- tupi-0.2+git04/src/net/tupnetsocket.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnetsocket.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,12 +34,6 @@
  ***************************************************************************/
 
 #include "tupnetsocket.h"
-#include "tupnetprojectmanagerhandler.h"
-#include "tupcompress.h"
-#include "tdebug.h"
-
-#include <QTextStream>
-#include <QDataStream>
 
 TupNetSocket::TupNetSocket(TupNetProjectManagerHandler *handler) : TupSocketBase(handler), m_handler(handler)
 {
@@ -52,8 +46,14 @@
 void TupNetSocket::readed(const QString &readed)
 {
     #ifdef K_DEBUG
-        tDebug("net") << "TupNetSocket::readed() - PACKAGE ARRIVING: ";
-        tWarning("net")  << readed;
+        QString msg = "TupNetSocket::readed() - PACKAGE ARRIVING: ";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+            qWarning()  << readed;
+        #else
+            tWarning() << msg;
+            tWarning("net")  << readed;
+        #endif
     #endif
 
     QDomDocument doc;
@@ -63,8 +63,12 @@
         m_handler->handlePackage(root, readed);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupNetSocket::readed() - Error: Package isn't a DOM document";
+            QString msg = "TupNetSocket::readed() - Error: Package isn't a DOM document";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
-
diff -Nru tupi-0.2+git04/src/net/tupnetsocket.h tupi-0.2+git05/src/net/tupnetsocket.h
--- tupi-0.2+git04/src/net/tupnetsocket.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnetsocket.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,7 +36,13 @@
 #ifndef TUPNETSOCKET_H
 #define TUPNETSOCKET_H
 
+#include "tglobal.h"
+#include "tupnetprojectmanagerhandler.h"
 #include "tupsocketbase.h"
+#include "tupcompress.h"
+
+#include <QTextStream>
+#include <QDataStream>
 
 class TupNetProjectManagerHandler;
 
@@ -44,7 +50,7 @@
  * @author David Cuadrado
 */
 
-class TupNetSocket : public TupSocketBase
+class TUPI_EXPORT TupNetSocket : public TupSocketBase
 {
     Q_OBJECT
     
diff -Nru tupi-0.2+git04/src/net/tupnewprojectpackage.h tupi-0.2+git05/src/net/tupnewprojectpackage.h
--- tupi-0.2+git04/src/net/tupnewprojectpackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnewprojectpackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPNEWPROJECTPACKAGE_H
 #define TUPNEWPROJECTPACKAGE_H
 
+#include "tglobal.h"
+
 #include <QDomDocument>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupNewProjectPackage : public QDomDocument
+class TUPI_EXPORT TupNewProjectPackage : public QDomDocument
 {
     public:
         TupNewProjectPackage(const QString & name, const QString & author, const QString & description, 
diff -Nru tupi-0.2+git04/src/net/tupnotice.cpp tupi-0.2+git05/src/net/tupnotice.cpp
--- tupi-0.2+git04/src/net/tupnotice.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnotice.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,14 +35,7 @@
 
 #include "tupnotice.h"
 
-#include <QTextEdit>
-#include <QLineEdit>
-#include <QGridLayout>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QTime>
-
-class TupNotice::Private
+struct TupNotice::Private
 {
     public:
         Private()
diff -Nru tupi-0.2+git04/src/net/tupnotice.h tupi-0.2+git05/src/net/tupnotice.h
--- tupi-0.2+git04/src/net/tupnotice.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnotice.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,21 @@
 #ifndef TUPNOTICE_H
 #define TUPNOTICE_H
 
+#include "tglobal.h"
+
 #include <QDialog>
+#include <QTextEdit>
+#include <QLineEdit>
+#include <QGridLayout>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QTime>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupNotice: public QWidget
+class TUPI_EXPORT TupNotice: public QWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/net/tupnoticepackage.h tupi-0.2+git05/src/net/tupnoticepackage.h
--- tupi-0.2+git04/src/net/tupnoticepackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnoticepackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPNOTICEPACKAGE_H
 #define TUPNOTICEPACKAGE_H
 
+#include "tglobal.h"
+
 #include <QDomDocument>
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupNoticePackage : public QDomDocument
+class TUPI_EXPORT TupNoticePackage : public QDomDocument
 {
     public:
         TupNoticePackage(const QString &text);
diff -Nru tupi-0.2+git04/src/net/tupnotificationparser.h tupi-0.2+git05/src/net/tupnotificationparser.h
--- tupi-0.2+git04/src/net/tupnotificationparser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupnotificationparser.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,14 @@
 #ifndef TUPERRORPARSER_H
 #define TUPERRORPARSER_H
 
+#include "tglobal.h"
+#include "tupxmlparserbase.h"
+
 /**
  * @author Jorge Cuadrado
 */
 
-#include "tupxmlparserbase.h"
-
-class TupNotificationParser : public TupXmlParserBase
+class TUPI_EXPORT TupNotificationParser : public TupXmlParserBase
 {
     public:
         
diff -Nru tupi-0.2+git04/src/net/tupopenpackage.h tupi-0.2+git05/src/net/tupopenpackage.h
--- tupi-0.2+git04/src/net/tupopenpackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupopenpackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,14 @@
 #ifndef TUPOPENPACKAGE_H
 #define TUPOPENPACKAGE_H
 
+#include "tglobal.h"
+#include <QDomDocument>
+
 /**
- * @author Jorge Cuadrado 
+ * @author Jorge Cuadrado
 */
 
-#include <QDomDocument>
-
-class TupOpenPackage: public QDomDocument
+class TUPI_EXPORT TupOpenPackage: public QDomDocument
 {
     public:
         TupOpenPackage(const QString &projectID, const QString &owner);
diff -Nru tupi-0.2+git04/src/net/tupprojectlistparser.cpp tupi-0.2+git05/src/net/tupprojectlistparser.cpp
--- tupi-0.2+git04/src/net/tupprojectlistparser.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupprojectlistparser.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupprojectlistparser.h"
-#include "tdebug.h"
 
 struct TupProjectListParser::Private
 {
@@ -54,7 +53,6 @@
 bool TupProjectListParser::startTag(const QString &tag, const QXmlAttributes &atts)
 {
     if (root() == "server_projectlist") {
- 
         if (tag == "works") {
             k->pivot = false;
         } else if (tag == "contributions") {
diff -Nru tupi-0.2+git04/src/net/tupprojectlistparser.h tupi-0.2+git05/src/net/tupprojectlistparser.h
--- tupi-0.2+git04/src/net/tupprojectlistparser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupprojectlistparser.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,14 @@
 #ifndef TUPPROJECTLISTPARSER_H
 #define TUPPROJECTLISTPARSER_H
 
+#include "tglobal.h"
 #include "tupxmlparserbase.h"
 
 /**
  * @author Jorge Cuadrado
 */
 
-class TupProjectListParser : public TupXmlParserBase
+class TUPI_EXPORT TupProjectListParser : public TupXmlParserBase
 {
     public:
         struct ProjectInfo
diff -Nru tupi-0.2+git04/src/net/tupprojectparser.cpp tupi-0.2+git05/src/net/tupprojectparser.cpp
--- tupi-0.2+git04/src/net/tupprojectparser.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupprojectparser.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupprojectparser.h"
-#include "tdebug.h"
 
 struct TupProjectParser::Private
 {
diff -Nru tupi-0.2+git04/src/net/tupprojectparser.h tupi-0.2+git05/src/net/tupprojectparser.h
--- tupi-0.2+git04/src/net/tupprojectparser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupprojectparser.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,16 +33,17 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef TUPROJECTPARSER_H
+#ifndef TUPPROJECTPARSER_H
 #define TUPPROJECTPARSER_H
 
 /**
  * @author Jorge Cuadrado
 */
 
+#include "tglobal.h"
 #include "tupxmlparserbase.h"
 
-class TupProjectParser : public TupXmlParserBase
+class TUPI_EXPORT TupProjectParser : public TupXmlParserBase
 {
     public:
         TupProjectParser();
diff -Nru tupi-0.2+git04/src/net/tupsavepackage.h tupi-0.2+git05/src/net/tupsavepackage.h
--- tupi-0.2+git04/src/net/tupsavepackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupsavepackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPSAVEPACKAGE_H
 #define TUPSAVEPACKAGE_H
 
-/**
- * @author Gustav Gonzalez  
-*/
+#include "tglobal.h"
 
 #include <QDomDocument>
 
-class TupSavePackage: public QDomDocument
+/**
+ * @author Gustav Gonzalez
+*/
+
+class TUPI_EXPORT TupSavePackage: public QDomDocument
 {
     public:
         TupSavePackage(bool exitFlag);
diff -Nru tupi-0.2+git04/src/net/tupstoryboardexportpackage.h tupi-0.2+git05/src/net/tupstoryboardexportpackage.h
--- tupi-0.2+git04/src/net/tupstoryboardexportpackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupstoryboardexportpackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPSTORYBOARDEXPORTPACKAGE_H
 #define TUPSTORYBOARDEXPORTPACKAGE_H
 
+#include "tglobal.h"
+
+#include <QDomDocument>
+
 /**
  * @author Gustav Gonzalez
 */
 
-#include <QDomDocument>
-
-class TupStoryboardExportPackage : public QDomDocument
+class TUPI_EXPORT TupStoryboardExportPackage : public QDomDocument
 {
     public:
         TupStoryboardExportPackage(int sceneIndex);
diff -Nru tupi-0.2+git04/src/net/tupstoryboardparser.cpp tupi-0.2+git05/src/net/tupstoryboardparser.cpp
--- tupi-0.2+git04/src/net/tupstoryboardparser.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupstoryboardparser.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupstoryboardparser.h"
-#include <QTextStream>
 
 struct TupStoryboardParser::Private
 {
diff -Nru tupi-0.2+git04/src/net/tupstoryboardparser.h tupi-0.2+git05/src/net/tupstoryboardparser.h
--- tupi-0.2+git04/src/net/tupstoryboardparser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupstoryboardparser.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,26 +36,29 @@
 #ifndef TUPSTORYBOARDPARSER_H
 #define TUPSTORYBOARDPARSER_H
 
+#include "tglobal.h"
+
 #include <QString>
 #include <QDomDocument>
+#include <QTextStream>
 
 /**
    @author Gustav Gonzalez 
 **/
 
-class TupStoryboardParser
+class TUPI_EXPORT TupStoryboardParser
 {
-   public:
-      TupStoryboardParser(const QString &package);
-      ~TupStoryboardParser();
-      bool checksum();
-      int sceneIndex();
-      QString storyboardXml() const;
-      QDomDocument request() const;
-
-   private:
-      struct Private;
-      Private *const k;
+    public:
+        TupStoryboardParser(const QString &package);
+        ~TupStoryboardParser();
+        bool checksum();
+        int sceneIndex();
+        QString storyboardXml() const;
+        QDomDocument request() const;
+
+     private:
+        struct Private;
+        Private *const k;
 };
 
 #endif
diff -Nru tupi-0.2+git04/src/net/tupstoryboardupdatepackage.h tupi-0.2+git05/src/net/tupstoryboardupdatepackage.h
--- tupi-0.2+git04/src/net/tupstoryboardupdatepackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupstoryboardupdatepackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,14 +36,16 @@
 #ifndef TUPSTORYBOARDUPDATEPACKAGE_H
 #define TUPSTORYBOARDUPDATEPACKAGE_H
 
-/**
- * @author Gustav Gonzalez
-*/
+#include "tglobal.h"
 
 #include <QDomDocument>
 #include <QDomElement>
 
-class TupStoryboardUpdatePackage : public QDomDocument
+/**
+ * @author Gustav Gonzalez
+*/
+
+class TUPI_EXPORT TupStoryboardUpdatePackage : public QDomDocument
 {
     public:
         TupStoryboardUpdatePackage(const QDomElement storyboard, int sceneIndex);
diff -Nru tupi-0.2+git04/src/net/tupvideoexportpackage.cpp tupi-0.2+git05/src/net/tupvideoexportpackage.cpp
--- tupi-0.2+git04/src/net/tupvideoexportpackage.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupvideoexportpackage.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupvideoexportpackage.h"
-#include "tdebug.h"
 
 // <project_video version="0">
 //     <video fps="24" scenes="0, 1, 2, N" />
@@ -60,9 +59,12 @@
     indexes.remove(indexes.length() - 1, 1);
 
     video.setAttribute("scenes", indexes);
-    QDomText titleDom = createTextNode(Qt::escape(title));
-    QDomText topicDom = createTextNode(Qt::escape(topics));
-    QDomText descDom = createTextNode(Qt::escape(description));
+    // QDomText titleDom = createTextNode(Qt::escape(title));
+    // QDomText topicDom = createTextNode(Qt::escape(topics));
+    // QDomText descDom = createTextNode(Qt::escape(description));
+    QDomText titleDom = createTextNode(title.toHtmlEscaped());
+    QDomText topicDom = createTextNode(topics.toHtmlEscaped());
+    QDomText descDom = createTextNode(description.toHtmlEscaped());
 
     video.appendChild(createElement("title")).appendChild(titleDom);
     video.appendChild(createElement("topics")).appendChild(topicDom);
diff -Nru tupi-0.2+git04/src/net/tupvideoexportpackage.h tupi-0.2+git05/src/net/tupvideoexportpackage.h
--- tupi-0.2+git04/src/net/tupvideoexportpackage.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/net/tupvideoexportpackage.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,17 +33,19 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef TUPVIDEOEXPORTTPACKAGE_H
+#ifndef TUPVIDEOEXPORTPACKAGE_H
 #define TUPVIDEOEXPORTPACKAGE_H
 
-/**
- * @author Gustav Gonzalez
-*/
+#include "tglobal.h"
 
 #include <QDomDocument>
 #include <QList>
 
-class TupVideoExportPackage : public QDomDocument
+/**
+ * @author Gustav Gonzalez
+*/
+
+class TUPI_EXPORT TupVideoExportPackage : public QDomDocument
 {
     public:
         TupVideoExportPackage(const QString &title, const QString &topics, const QString &description, int fps, const QList<int> sceneIndexes);
diff -Nru tupi-0.2+git04/src/plugins/export/apngplugin/apngplugin.cpp tupi-0.2+git05/src/plugins/export/apngplugin/apngplugin.cpp
--- tupi-0.2+git04/src/plugins/export/apngplugin/apngplugin.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/apngplugin/apngplugin.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -35,16 +35,6 @@
 
 #include "apngplugin.h"
 
-// Tupi Framework
-#include "tdebug.h"
-#include "tglobal.h"
-
-#include "tuplayer.h"
-#include "tupanimationrenderer.h"
-
-#include <QImage>
-#include <QPainter>
-
 APNGPlugin::APNGPlugin()
 {
 }
@@ -130,6 +120,6 @@
     return errorMsg;
 }
 
-#ifdef HAVE_THEORA
-       Q_EXPORT_PLUGIN( APNGPlugin );
-#endif
+// #ifdef HAVE_THEORA
+//        Q_EXPORT_PLUGIN( APNGPlugin );
+// #endif
diff -Nru tupi-0.2+git04/src/plugins/export/apngplugin/apngplugin.h tupi-0.2+git05/src/plugins/export/apngplugin/apngplugin.h
--- tupi-0.2+git04/src/plugins/export/apngplugin/apngplugin.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/apngplugin/apngplugin.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,17 +36,24 @@
 #ifndef APNGPLUGIN_H
 #define APNGPLUGIN_H
 
+#include "tglobal.h"
 #include "tupexportpluginobject.h"
 #include "tupexportinterface.h"
 #include "tmoviegeneratorinterface.h"
+#include "tuplayer.h"
+#include "tupanimationrenderer.h"
+
+#include <QImage>
+#include <QPainter>
 
 /**
  * @author Gustav Gonzalez
 */
 
-class APNGPlugin : public TupExportPluginObject
+class TUPI_EXPORT APNGPlugin : public TupExportPluginObject
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "apngplugin.json")
 
     public:
         APNGPlugin();
diff -Nru tupi-0.2+git04/src/plugins/export/apngplugin/apngplugin.json tupi-0.2+git05/src/plugins/export/apngplugin/apngplugin.json
--- tupi-0.2+git04/src/plugins/export/apngplugin/apngplugin.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/apngplugin/apngplugin.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "APngPlugin" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/export/apngplugin/apngplugin.pro tupi-0.2+git05/src/plugins/export/apngplugin/apngplugin.pro
--- tupi-0.2+git04/src/plugins/export/apngplugin/apngplugin.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/apngplugin/apngplugin.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,20 +1,26 @@
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
 INSTALLS += target
 target.path = /plugins/
 
 HEADERS += apngplugin.h
-
 SOURCES += apngplugin.cpp
 
 CONFIG += plugin warn_on
 TEMPLATE = lib 
 TARGET = tupiapngplugin
 
-#LIBS += -ltheora -ltheoraenc -ltheoradec -logg
+INCLUDEPATH += ../../../libbase
+INCLUDEPATH += ../../../store
+INCLUDEPATH += ../../../libtupi
+LIBS += -L../../../libbase
+LIBS += -L../../../store
+LIBS += -L../../../libtupi
 
 FRAMEWORK_DIR = "../../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
 include(../export_config.pri)
-
-!include(../../../../tupiglobal.pri){
-    error("Please run configure first")
-}
diff -Nru tupi-0.2+git04/src/plugins/export/export_config.pri tupi-0.2+git05/src/plugins/export/export_config.pri
--- tupi-0.2+git04/src/plugins/export/export_config.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/export_config.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,7 +1,7 @@
 
-STORE_DIR = ../../../store
-LIBTUPI_DIR = ../../../libtupi
-LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../store
+LIBTUPI_DIR = ../../libtupi
+LIBBASE_DIR = ../../libbase
 
 include($$STORE_DIR/store.pri)
 include($$LIBTUPI_DIR/libtupi.pri)
diff -Nru tupi-0.2+git04/src/plugins/export/export.pro tupi-0.2+git05/src/plugins/export/export.pro
--- tupi-0.2+git04/src/plugins/export/export.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/export.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,17 +1,20 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/export
-# Target is a subdirs project 
+unix {
+    !include(../../../tupiglobal.pri) {
+        error("Please configure first")
+    }
+}
 
-include(../../../tupiglobal.pri)
+win32 {
+    include(../../../win.pri)
+}
 
-SUBDIRS += genericexportplugin 
+SUBDIRS += imageplugin 
 
 # SMIL plugin will be disabled temporary 
-# smilexportplugin 
+# smileplugin 
 
-contains(DEFINES, HAVE_FFMPEG) {
-        SUBDIRS += ffmpegplugin
+contains(DEFINES, HAVE_LIBAV) {
+        SUBDIRS += libavplugin 
 }
 
 contains(DEFINES, HAVE_THEORA) {
@@ -19,7 +22,9 @@
 }
 
 # Experimental code
-SUBDIRS += apngplugin
+contains(DEFINES, HAVE_APNG) {
+         SUBDIRS += apngplugin
+}
 
 CONFIG += ordered warn_on 
 TEMPLATE = subdirs 
diff -Nru tupi-0.2+git04/src/plugins/export/ffmpegplugin/ffmpegplugin.cpp tupi-0.2+git05/src/plugins/export/ffmpegplugin/ffmpegplugin.cpp
--- tupi-0.2+git04/src/plugins/export/ffmpegplugin/ffmpegplugin.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/ffmpegplugin/ffmpegplugin.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "ffmpegplugin.h"
-
-// Tupi Framework
-#include "tdebug.h"
-#include "tglobal.h"
-#include "tffmpegmoviegenerator.h"
-
-#include "tuplayer.h"
-#include "tupanimationrenderer.h"
-
-#include <QImage>
-#include <QPainter>
-
-FFMpegPlugin::FFMpegPlugin()
-{
-}
-
-FFMpegPlugin::~FFMpegPlugin()
-{
-}
-
-QString FFMpegPlugin::key() const
-{
-    return "Video Formats";
-}
-
-TupExportInterface::Formats FFMpegPlugin::availableFormats()
-{
-    return TupExportInterface::WEBM | TupExportInterface::OGV | TupExportInterface::MPEG | TupExportInterface::SWF 
-           | TupExportInterface::AVI | TupExportInterface::ASF | TupExportInterface::MOV | TupExportInterface::GIF;
-}
-
-TMovieGeneratorInterface::Format FFMpegPlugin::videoFormat(TupExportInterface::Format format)
-{
-    switch (format) {
-            case TupExportInterface::WEBM:
-                 {
-                   return TFFMpegMovieGenerator::WEBM;
-                 }
-                 break;
-            case TupExportInterface::OGV:
-                 {
-                   return TFFMpegMovieGenerator::OGV;
-                 }
-                 break;
-            case TupExportInterface::SWF:
-                 {
-                   return TFFMpegMovieGenerator::SWF;
-                 }
-                 break;
-            case TupExportInterface::MPEG:
-                 {
-                   return TFFMpegMovieGenerator::MPEG;
-                 }
-                 break;
-            case TupExportInterface::AVI:
-                 {
-                   return TFFMpegMovieGenerator::AVI;
-                 }
-                 break;
-            case TupExportInterface::MOV:
-                 {
-                   return TFFMpegMovieGenerator::MOV;
-                 }
-                 break;
-            case TupExportInterface::ASF:
-                 {
-                   return TFFMpegMovieGenerator::ASF;
-                 }
-                 break;
-            case TupExportInterface::GIF:
-                 {
-                   return TFFMpegMovieGenerator::GIF;
-                 }
-                 break;
-            case TupExportInterface::PNG:
-            case TupExportInterface::JPEG:
-            case TupExportInterface::XPM:
-            case TupExportInterface::SMIL:
-            case TupExportInterface::NONE:
-                 {
-                   return TFFMpegMovieGenerator::NONE;
-                 }
-            default:
-                 {
-                   return TFFMpegMovieGenerator::NONE;
-                 }
-                 break;
-    }
-
-    return TFFMpegMovieGenerator::NONE;
-}
-
-bool FFMpegPlugin::exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format fmt, const QSize &size, int fps)
-{
-    qreal duration = 0;
-    foreach (TupScene *scene, scenes)
-             duration += (qreal) scene->framesTotal() / (qreal) fps;
-
-    TFFMpegMovieGenerator *generator = 0;
-    TMovieGeneratorInterface::Format format = videoFormat(fmt);
-
-    if (format == TFFMpegMovieGenerator::NONE)
-        return false;
-
-    generator = new TFFMpegMovieGenerator(format, size, fps, duration);
-
-    TupAnimationRenderer renderer(color);
-    {
-         if (!generator->movieHeaderOk()) {
-             errorMsg = generator->getErrorMsg();
-             #ifdef K_DEBUG
-                    tError() << "FFMpegPlugin::exportToFormat() - [ Fatal Error ] - Can't create video -> " << filePath;
-             #endif
-             delete generator;
-             return false;
-         }
-
-         QPainter painter(generator);
-         painter.setRenderHint(QPainter::Antialiasing, true);
-
-         foreach (TupScene *scene, scenes) {
-                  renderer.setScene(scene, size);
-
-                  while (renderer.nextPhotogram()) {
-                         renderer.render(&painter);
-                         generator->nextFrame();
-                         generator->reset();
-                  }
-         }
-    }
-
-    generator->saveMovie(filePath);
-    delete generator;
-
-    return true;
-}
-
-bool FFMpegPlugin::exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size)
-{
-    Q_UNUSED(frameIndex);
-    Q_UNUSED(color);
-    Q_UNUSED(filePath);
-    Q_UNUSED(scene);
-    Q_UNUSED(size);
-
-    return false;
-}
-
-const char* FFMpegPlugin::getExceptionMsg() {
-    return errorMsg;
-}
-
-#ifdef HAVE_FFMPEG
-       Q_EXPORT_PLUGIN( FFMpegPlugin );
-#endif
-
diff -Nru tupi-0.2+git04/src/plugins/export/ffmpegplugin/ffmpegplugin.h tupi-0.2+git05/src/plugins/export/ffmpegplugin/ffmpegplugin.h
--- tupi-0.2+git04/src/plugins/export/ffmpegplugin/ffmpegplugin.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/ffmpegplugin/ffmpegplugin.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef FFMPEGPLUGIN_H
-#define FFMPEGPLUGIN_H
-
-#include "tupexportpluginobject.h"
-#include "tupexportinterface.h"
-#include "tmoviegeneratorinterface.h"
-
-/**
- * @author David Cuadrado
-*/
-
-class FFMpegPlugin : public TupExportPluginObject
-{
-    Q_OBJECT
-
-    public:
-        FFMpegPlugin();
-        virtual ~FFMpegPlugin();
-        virtual QString key() const;
-        TupExportInterface::Formats availableFormats();
-
-        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps);
-        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size);
-
-        virtual const char* getExceptionMsg();
-        const char *errorMsg;
-
-    private:
-        TMovieGeneratorInterface::Format videoFormat(TupExportInterface::Format format);
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/export/ffmpegplugin/ffmpegplugin.pro tupi-0.2+git05/src/plugins/export/ffmpegplugin/ffmpegplugin.pro
--- tupi-0.2+git04/src/plugins/export/ffmpegplugin/ffmpegplugin.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/ffmpegplugin/ffmpegplugin.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/export/ffmpegplugin
-# Target is a library:  
-
-INSTALLS += target
-target.path = /plugins/
-#INSTALL_ROOT = /tmp/test
-
-HEADERS += tffmpegmoviegenerator.h \
-           ffmpegplugin.h
-
-SOURCES += tffmpegmoviegenerator.cpp \
-           ffmpegplugin.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib 
-TARGET = tupiffmpegplugin
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../export_config.pri)
-
-!include(../../../../tupiglobal.pri){
-    error("Please run configure first")
-}
diff -Nru tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.arch.cpp tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.arch.cpp
--- tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.arch.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.arch.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,567 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#define INT64_C
-#define __STDC_CONSTANT_MACROS
-#include <stdint.h>
-
-#include "tffmpegmoviegenerator.h"
-#include "tdebug.h"
-#include "talgorithm.h"
-
-#include <QDir>
-
-#ifdef __cplusplus
-extern "C" {
-#include "libavformat/avformat.h"
-#include "libavcodec/avcodec.h"
-#include "libavutil/mathematics.h"
-}
-#endif
-
-struct TFFMpegMovieGenerator::Private
-{
-    AVFrame *picture;
-    AVFrame *tmpPicture;
-
-    QString movieFile;
-    int fps;
-    double video_pts;
-    uint8_t *videOutbuf;
-    int frameCount;
-    int videOutbufSize;
-    double streamDuration;
-    bool exception;
-    const char *errorMsg;
-
-    AVStream *video_st;
-    AVFormatContext *oc;
-    AVOutputFormat *fmt;
-
-    void chooseFileExtension(int format);
-    bool openVideo(AVFormatContext *oc, AVStream *st);
-    void RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height);
-    bool writeVideoFrame(const QImage &image);
-    void closeVideo(AVStream *st);
-};
-
-static AVStream *addVideoStream(AVFormatContext *oc, int codec_id, int width, int height, int fps, const char *errorMsg)
-{
-    AVCodecContext *c;
-    AVStream *st;
-
-    int w = width;
-    int h = height;
-
-    // st = av_new_stream(oc, 0);
-    st = avformat_new_stream(oc, 0);
-    if (!st) {
-        errorMsg = "ffmpeg error: Could not alloc stream. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::addVideoStream() - " << errorMsg;
-        #endif
-        return 0;
-    }
-
-    c = st->codec;
-    // c->codec_id = CodecID(codec_id);
-    c->codec_id = AVCodecID(codec_id);
-    c->codec_type = AVMEDIA_TYPE_VIDEO;   
-
-    /* put sample parameters */
-    // c->bit_rate = 800000;
-    c->bit_rate = 6000000;
-
-    /* resolution must be a multiple of two */
-    c->width = w;  
-    c->height = h; 
-
-    c->time_base.den = fps;
-    c->time_base.num = 1;
-    // c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-    c->gop_size = 2;
-    c->pix_fmt = PIX_FMT_YUV420P;
-
-    // c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-    if (c->codec_id == CODEC_ID_MPEG2VIDEO) {
-	/* just for testing, we also add B frames */
-	c->max_b_frames = 2;
-    }
-
-    if (c->codec_id == CODEC_ID_MPEG1VIDEO) {
-        /* needed to avoid using macroblocks in which some coeffs overflow
-           this doesnt happen with normal video, it just happens here as the
-           motion of the chroma plane doesnt match the luma plane */
-           c->mb_decision=2;
-    }
-
-    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-	
-    return st;
-}
-
-static AVFrame *allocPicture(enum PixelFormat pix_fmt, int width, int height)
-{
-    AVFrame *picture;
-    uint8_t *picture_buf;
-    int size;
- 
-    picture = avcodec_alloc_frame();
-
-    if (!picture) 
-        return 0;
-	
-    size = avpicture_get_size(pix_fmt, width, height);
-    picture_buf = (uint8_t *)malloc(size);
-
-    if (!picture_buf) {
-	av_free(picture);
-	return 0;
-    }
-
-    avpicture_fill((AVPicture *)picture, picture_buf, pix_fmt, width, height);
-
-    return picture;
-}
-
-void TFFMpegMovieGenerator::Private::chooseFileExtension(int format)
-{
-    switch (format) {
-            case WEBM:
-                 movieFile += ".webm";
-                 break;
-            case OGV:
-                 movieFile += ".ogv";
-                 break;
-            case SWF:
-                 movieFile += ".swf";
-                 break;
-            case MPEG:
-                 movieFile += ".mpg";
-                 break;
-            case ASF:
-                 movieFile += ".asf";
-                 break;
-            case AVI:
-                 movieFile += ".avi";
-                 break;
-            case MOV:
-                 movieFile += ".mov";
-                 break;
-            case GIF:
-                 movieFile += ".gif";
-                 break;
-            default:
-                 movieFile += ".mpg";
-                 break;
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::openVideo(AVFormatContext *oc, AVStream *st)
-{
-    AVCodec *codec;
-    AVCodecContext *c;
-
-    c = st->codec;
-
-    /* find the video encoder */
-    codec = avcodec_find_encoder(c->codec_id);
-
-    if (!codec) {
-        errorMsg = "ffmpeg error: Video codec not found. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. It's very possible your system is missing codecs. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-
-        return false;
-    }
-
-    /* open the codec */
-    // if (avcodec_open(c, codec) < 0) {
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        errorMsg = "ffmpeg error: Could not open video codec. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-        return false;
-    }
-
-    videOutbuf = 0;
-    if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) {
-        videOutbufSize = 200000;
-        videOutbuf = (uint8_t *) av_malloc(videOutbufSize);
-    }
-
-    /* allocate the encoded raw m_picture */
-    picture = allocPicture(c->pix_fmt, c->width, c->height);
-
-    if (!picture) {
-        errorMsg = "ffmpeg error: Could not allocate m_picture. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif 
-        return false;
-    }
-
-    tmpPicture = 0;
-
-    if (c->pix_fmt != PIX_FMT_YUV420P) {
-        tmpPicture = allocPicture(PIX_FMT_YUV420P, c->width, c->height);
-        if (!tmpPicture) {
-            errorMsg = "ffmpeg error: Could not allocate temporary picture. This is not a problem directly related to Tupi. \
-                        Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-            #ifdef K_DEBUG
-                   tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-            #endif
-            return false;
-        }
-    }
-	
-    return true;
-}
-
-#define RGBtoYUV(r, g, b, y, u, v) \
-  y = (uint8_t)(((int)30*r + (int)59*g + (int)11*b)/100); \
-  u = (uint8_t)(((int)-17*r - (int)33*g + (int)50*b + 12800)/100); \
-  v = (uint8_t)(((int)50*r - (int)42*g - (int)8*b + 12800)/100);
-
-void TFFMpegMovieGenerator::Private::RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height)
-{
-    const unsigned iPlaneSize = width * height;
-    const unsigned iHalfWidth = width >> 1;
-
-    // get pointers to the data
-    uint8_t *yplane  = bufferYUV;
-    uint8_t *uplane  = bufferYUV + iPlaneSize;
-    uint8_t *vplane  = bufferYUV + iPlaneSize + (iPlaneSize >> 2);
-    const uint8_t *bufferRGBIndex = bufferRGB;
-
-    int iRGBIdx[3];
-    iRGBIdx[0] = 0;
-    iRGBIdx[1] = 1;
-    iRGBIdx[2] = 2;
-    if (bSwapRGB)  {
-        iRGBIdx[0] = 2;
-        iRGBIdx[2] = 0;
-    }
- 
-    for (int y = 0; y < (int) height; y++) {
-         uint8_t *yline  = yplane + (y * width);
-         uint8_t *uline  = uplane + ((y >> 1) * iHalfWidth);
-         uint8_t *vline  = vplane + ((y >> 1) * iHalfWidth);
-
-         for (int x=0; x<width; x+=2) {
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              uline++;
-              vline++;
-         }
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::writeVideoFrame(const QImage &image)
-{
-    #ifdef K_DEBUG
-           tWarning() << "TFFMpegMovieGenerator::writeVideoFrame() - Generating frame #" << frameCount;
-    #endif
-
-    AVCodecContext *c = video_st->codec;
-    AVFrame *picturePtr = 0;
-    double nbFrames = ((int)(streamDuration * fps));
-
-    if (frameCount < nbFrames) {
-        int w = c->width;
-        int h = c->height;
-
-        int size = avpicture_get_size(PIX_FMT_YUV420P, w, h);
-        uint8_t *pic_dat = (uint8_t *) av_malloc(size);
-        RGBtoYUV420P(image.bits(), pic_dat, image.depth()/8, true, w, h);
-
-        picturePtr = avcodec_alloc_frame();
-        picturePtr->quality = 1;
-
-        avpicture_fill((AVPicture *)picturePtr, pic_dat,
-                   PIX_FMT_YUV420P, w, h);
-    }
-
-    int out_size = -1, ret = -1;
-
-    if (oc->oformat->flags & AVFMT_RAWPICTURE) { // Exporting images array
-        AVPacket pkt;
-        av_init_packet(&pkt);
-
-        // pkt.flags |= PKT_FLAG_KEY;
-	pkt.flags |= AV_PKT_FLAG_KEY;
-        pkt.stream_index = video_st->index;
-        pkt.data= (uint8_t *)picturePtr;
-        pkt.size= sizeof(AVPicture);
-        
-        //ret = av_write_frame(oc, &pkt);
-        ret = av_interleaved_write_frame(oc, &pkt);
-
-    } else { // Exporting movies
-        out_size = avcodec_encode_video(c, videOutbuf, videOutbufSize, picturePtr);
-
-        if (out_size > 0) {
-            AVPacket pkt;
-            av_init_packet(&pkt);
-
-            if (c->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) 
-                pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, video_st->time_base);
-
-            if (c->coded_frame->key_frame)
-		pkt.flags |= AV_PKT_FLAG_KEY;
-                // pkt.flags |= PKT_FLAG_KEY;
-            pkt.stream_index = video_st->index;
-            pkt.data = videOutbuf;
-            pkt.size = out_size;
-
-            /* write the compressed frame in the media file */
-            ret = av_interleaved_write_frame(oc, &pkt);
-            //ret = av_write_frame(oc, &pkt);
-        } else {
-            ret = 0;
-        }
-   }
-
-   if (ret != 0) {
-       errorMsg = "ffmpeg error: Could not write video frame. This is not a problem directly related to Tupi. \
-                   Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-
-       #ifdef K_DEBUG
-              tError() << "TFFMpegMovieGenerator::writeVideoFrame() - " << errorMsg;
-       #endif
-       return false;
-   }
-
-   frameCount++;
-
-   return true;
-}
-
-void TFFMpegMovieGenerator::Private::closeVideo(AVStream *st)
-{
-    AVCodecContext *c;
-    c = st->codec;
-    avcodec_close(c);
-    av_free(picture->data[0]);
-    av_free(picture);
-
-    if (tmpPicture) {
-        av_free(tmpPicture->data[0]);
-        av_free(tmpPicture);
-    }
-    av_free(videOutbuf);
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, int width, int height, int fps, double duration)
- : TMovieGenerator(width, height), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, const QSize &size, int fps, double duration) : TMovieGenerator(size.width(), size.height()), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::~TFFMpegMovieGenerator()
-{
-    if (QFile::exists(k->movieFile)) 
-        QFile::remove(k->movieFile);
-
-    delete k;
-}
-
-bool TFFMpegMovieGenerator::begin()
-{
-    av_register_all();
-
-    #ifdef K_LUCID
-        k->fmt = guess_format(0, k->movieFile.toLocal8Bit().data(), 0);
-    #else
-        k->fmt = av_guess_format(0, k->movieFile.toLocal8Bit().data(), 0);
-    #endif
-
-    if (!k->fmt) {
-        #ifdef K_LUCID
-            k->fmt = guess_format("mpeg", NULL, NULL);
-        #else
-            k->fmt = av_guess_format("mpeg", NULL, NULL);
-        #endif
-    }
-
-    if (! k->fmt) {
-        k->errorMsg = "ffmpeg error: Cannot find a valid format for " + k->movieFile.toLocal8Bit() + ". This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    k->oc = avformat_alloc_context();
-
-    if (!k->oc) {
-        k->errorMsg = "ffmpeg error: Error while doing export. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-	
-    k->oc->oformat = k->fmt;
-    snprintf(k->oc->filename, sizeof(k->oc->filename), "%s", k->movieFile.toLocal8Bit().data());
-    k->video_st = addVideoStream(k->oc, k->fmt->video_codec, width(), height(), k->fps, k->errorMsg);
-	
-    if (!k->video_st) {
-        k->errorMsg = "ffmpeg error: Can't add video stream. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    /*
-    // if (av_set_parameters(k->oc, 0) < 0) {
-    if (avformat_write_header(k->oc, NULL) < 0) {
-        k->errorMsg = "ffmpeg error: Invalid output format parameters. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-    */
-
-    // dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1);
-    av_dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1);
-
-    if (!k->openVideo(k->oc, k->video_st)) {
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - [ Fatal Error ] - Can't open video";
-        #endif
-        return false;
-    }
-
-    if (!(k->fmt->flags & AVFMT_NOFILE)) {
-        if (avio_open(&k->oc->pb, k->movieFile.toLocal8Bit().data(), AVIO_FLAG_WRITE) < 0) {
-            k->errorMsg = "ffmpeg error: Could not open " + k->movieFile.toLocal8Bit() + ". This is not a problem directly related to Tupi. \
-                           Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-            #ifdef K_DEBUG
-                   tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-            #endif
-            return false;
-        }
-    }
-
-    // av_write_header(k->oc);
-    avformat_write_header(k->oc, NULL);
-
-    k->video_pts = 0.0;
-    k->frameCount = 0;
-
-    return true;
-}
-
-bool TFFMpegMovieGenerator::movieHeaderOk() 
-{ 
-    return k->exception;
-}
-
-const char* TFFMpegMovieGenerator::getErrorMsg() 
-{
-    return k->errorMsg;
-}
-
-void TFFMpegMovieGenerator::handle(const QImage& image)
-{
-    if (k->video_st) 
-        k->video_pts = (double)k->video_st->pts.val * k->video_st->time_base.num / k->video_st->time_base.den;
-    else 
-        k->video_pts = 0.0;
-
-    if (!k->video_st || k->video_pts >= k->streamDuration)
-        return;
-
-    k->writeVideoFrame(image);
-}
-
-void TFFMpegMovieGenerator::end()
-{
-    k->closeVideo(k->video_st);
-    av_write_trailer(k->oc);
-
-    int streams_total = k->oc->nb_streams;
-    for (int i = 0; i < streams_total; i++) {
-         av_freep(&k->oc->streams[i]->codec);  
-         av_freep(&k->oc->streams[i]);
-    }
-
-    if (!(k->fmt->flags & AVFMT_NOFILE)) {
-        // url_fclose(k->oc->pb);
-        avio_close(k->oc->pb);
-    }
-
-    av_free(k->oc);
-}
-
-
-void TFFMpegMovieGenerator::__saveMovie(const QString &fileName)
-{
-    if (QFile::exists(fileName)) 
-        QFile::remove(fileName);
-
-    QFile::copy(k->movieFile, fileName);
-}
diff -Nru tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp
--- tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,567 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#define INT64_C
-#define __STDC_CONSTANT_MACROS
-#include <stdint.h>
-
-#include "tffmpegmoviegenerator.h"
-#include "tdebug.h"
-#include "talgorithm.h"
-
-#include <QDir>
-
-#ifdef __cplusplus
-extern "C" {
-#include "libavformat/avformat.h"
-#include "libavcodec/avcodec.h"
-#include "libavutil/mathematics.h"
-}
-#endif
-
-struct TFFMpegMovieGenerator::Private
-{
-    AVFrame *picture;
-    AVFrame *tmpPicture;
-
-    QString movieFile;
-    int fps;
-    double video_pts;
-    uint8_t *videOutbuf;
-    int frameCount;
-    int videOutbufSize;
-    double streamDuration;
-    bool exception;
-    const char *errorMsg;
-
-    AVStream *video_st;
-    AVFormatContext *oc;
-    AVOutputFormat *fmt;
-
-    void chooseFileExtension(int format);
-    bool openVideo(AVFormatContext *oc, AVStream *st);
-    void RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height);
-    bool writeVideoFrame(const QImage &image);
-    void closeVideo(AVStream *st);
-};
-
-static AVStream *addVideoStream(AVFormatContext *oc, int codec_id, int width, int height, int fps, const char *errorMsg)
-{
-    AVCodecContext *c;
-    AVStream *st;
-
-    int w = width;
-    int h = height;
-
-    // st = av_new_stream(oc, 0);
-    st = avformat_new_stream(oc, 0);
-    if (!st) {
-        errorMsg = "ffmpeg error: Could not alloc stream. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::addVideoStream() - " << errorMsg;
-        #endif
-        return 0;
-    }
-
-    c = st->codec;
-    c->codec_id = CodecID(codec_id);
-    c->codec_type = AVMEDIA_TYPE_VIDEO;   
-
-    /* put sample parameters */
-    // c->bit_rate = 800000;
-    c->bit_rate = 6000000;
-
-    /* resolution must be a multiple of two */
-    c->width = w;  
-    c->height = h; 
-
-    c->time_base.den = fps;
-    c->time_base.num = 1;
-    // c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-    c->gop_size = 2;
-    c->pix_fmt = PIX_FMT_YUV420P;
-
-    // c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-    if (c->codec_id == CODEC_ID_MPEG2VIDEO) {
-	/* just for testing, we also add B frames */
-	c->max_b_frames = 2;
-    }
-
-    if (c->codec_id == CODEC_ID_MPEG1VIDEO) {
-        /* needed to avoid using macroblocks in which some coeffs overflow
-           this doesnt happen with normal video, it just happens here as the
-           motion of the chroma plane doesnt match the luma plane */
-           c->mb_decision=2;
-    }
-
-    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-	
-    return st;
-}
-
-static AVFrame *allocPicture(enum PixelFormat pix_fmt, int width, int height)
-{
-    AVFrame *picture;
-    uint8_t *picture_buf;
-    int size;
- 
-    picture = avcodec_alloc_frame();
-
-    if (!picture) 
-        return 0;
-	
-    size = avpicture_get_size(pix_fmt, width, height);
-    picture_buf = (uint8_t *)malloc(size);
-
-    if (!picture_buf) {
-	av_free(picture);
-	return 0;
-    }
-
-    avpicture_fill((AVPicture *)picture, picture_buf, pix_fmt, width, height);
-
-    return picture;
-}
-
-void TFFMpegMovieGenerator::Private::chooseFileExtension(int format)
-{
-    switch (format) {
-            case WEBM:
-                 movieFile += ".webm";
-                 break;
-            case OGV:
-                 movieFile += ".ogv";
-                 break;
-            case SWF:
-                 movieFile += ".swf";
-                 break;
-            case MPEG:
-                 movieFile += ".mpg";
-                 break;
-            case ASF:
-                 movieFile += ".asf";
-                 break;
-            case AVI:
-                 movieFile += ".avi";
-                 break;
-            case MOV:
-                 movieFile += ".mov";
-                 break;
-            case GIF:
-                 movieFile += ".gif";
-                 break;
-            default:
-                 movieFile += ".mpg";
-                 break;
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::openVideo(AVFormatContext *oc, AVStream *st)
-{
-    AVCodec *codec;
-    AVCodecContext *c;
-
-    c = st->codec;
-
-    /* find the video encoder */
-    codec = avcodec_find_encoder(c->codec_id);
-
-    if (!codec) {
-        errorMsg = "ffmpeg error: Video codec not found. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. It's very possible your system is missing codecs. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-
-        return false;
-    }
-
-    /* open the codec */
-    // if (avcodec_open(c, codec) < 0) {
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        errorMsg = "ffmpeg error: Could not open video codec. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-        return false;
-    }
-
-    videOutbuf = 0;
-    if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) {
-        videOutbufSize = 200000;
-        videOutbuf = (uint8_t *) av_malloc(videOutbufSize);
-    }
-
-    /* allocate the encoded raw m_picture */
-    picture = allocPicture(c->pix_fmt, c->width, c->height);
-
-    if (!picture) {
-        errorMsg = "ffmpeg error: Could not allocate m_picture. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif 
-        return false;
-    }
-
-    tmpPicture = 0;
-
-    if (c->pix_fmt != PIX_FMT_YUV420P) {
-        tmpPicture = allocPicture(PIX_FMT_YUV420P, c->width, c->height);
-        if (!tmpPicture) {
-            errorMsg = "ffmpeg error: Could not allocate temporary picture. This is not a problem directly related to Tupi. \
-                        Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-            #ifdef K_DEBUG
-                   tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-            #endif
-            return false;
-        }
-    }
-	
-    return true;
-}
-
-#define RGBtoYUV(r, g, b, y, u, v) \
-  y = (uint8_t)(((int)30*r + (int)59*g + (int)11*b)/100); \
-  u = (uint8_t)(((int)-17*r - (int)33*g + (int)50*b + 12800)/100); \
-  v = (uint8_t)(((int)50*r - (int)42*g - (int)8*b + 12800)/100);
-
-void TFFMpegMovieGenerator::Private::RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height)
-{
-    const unsigned iPlaneSize = width * height;
-    const unsigned iHalfWidth = width >> 1;
-
-    // get pointers to the data
-    uint8_t *yplane  = bufferYUV;
-    uint8_t *uplane  = bufferYUV + iPlaneSize;
-    uint8_t *vplane  = bufferYUV + iPlaneSize + (iPlaneSize >> 2);
-    const uint8_t *bufferRGBIndex = bufferRGB;
-
-    int iRGBIdx[3];
-    iRGBIdx[0] = 0;
-    iRGBIdx[1] = 1;
-    iRGBIdx[2] = 2;
-    if (bSwapRGB)  {
-        iRGBIdx[0] = 2;
-        iRGBIdx[2] = 0;
-    }
- 
-    for (int y = 0; y < (int) height; y++) {
-         uint8_t *yline  = yplane + (y * width);
-         uint8_t *uline  = uplane + ((y >> 1) * iHalfWidth);
-         uint8_t *vline  = vplane + ((y >> 1) * iHalfWidth);
-
-         for (int x=0; x<width; x+=2) {
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              uline++;
-              vline++;
-         }
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::writeVideoFrame(const QImage &image)
-{
-    #ifdef K_DEBUG
-           tWarning() << "TFFMpegMovieGenerator::writeVideoFrame() - Generating frame #" << frameCount;
-    #endif
-
-    AVCodecContext *c = video_st->codec;
-    AVFrame *picturePtr = 0;
-    double nbFrames = ((int)(streamDuration * fps));
-
-    if (frameCount < nbFrames) {
-        int w = c->width;
-        int h = c->height;
-
-        int size = avpicture_get_size(PIX_FMT_YUV420P, w, h);
-        uint8_t *pic_dat = (uint8_t *) av_malloc(size);
-        RGBtoYUV420P(image.bits(), pic_dat, image.depth()/8, true, w, h);
-
-        picturePtr = avcodec_alloc_frame();
-        picturePtr->quality = 1;
-
-        avpicture_fill((AVPicture *)picturePtr, pic_dat,
-                   PIX_FMT_YUV420P, w, h);
-    }
-
-    int out_size = -1, ret = -1;
-
-    if (oc->oformat->flags & AVFMT_RAWPICTURE) { // Exporting images array
-        AVPacket pkt;
-        av_init_packet(&pkt);
-
-        // pkt.flags |= PKT_FLAG_KEY;
-	pkt.flags |= AV_PKT_FLAG_KEY;
-        pkt.stream_index = video_st->index;
-        pkt.data= (uint8_t *)picturePtr;
-        pkt.size= sizeof(AVPicture);
-        
-        //ret = av_write_frame(oc, &pkt);
-        ret = av_interleaved_write_frame(oc, &pkt);
-
-    } else { // Exporting movies
-        out_size = avcodec_encode_video(c, videOutbuf, videOutbufSize, picturePtr);
-
-        if (out_size > 0) {
-            AVPacket pkt;
-            av_init_packet(&pkt);
-
-            if (c->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) 
-                pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, video_st->time_base);
-
-            if (c->coded_frame->key_frame)
-		pkt.flags |= AV_PKT_FLAG_KEY;
-                // pkt.flags |= PKT_FLAG_KEY;
-            pkt.stream_index = video_st->index;
-            pkt.data = videOutbuf;
-            pkt.size = out_size;
-
-            /* write the compressed frame in the media file */
-            ret = av_interleaved_write_frame(oc, &pkt);
-            //ret = av_write_frame(oc, &pkt);
-        } else {
-            ret = 0;
-        }
-   }
-
-   if (ret != 0) {
-       errorMsg = "ffmpeg error: Could not write video frame. This is not a problem directly related to Tupi. \
-                   Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-
-       #ifdef K_DEBUG
-              tError() << "TFFMpegMovieGenerator::writeVideoFrame() - " << errorMsg;
-       #endif
-       return false;
-   }
-
-   frameCount++;
-
-   return true;
-}
-
-void TFFMpegMovieGenerator::Private::closeVideo(AVStream *st)
-{
-    AVCodecContext *c;
-    c = st->codec;
-    avcodec_close(c);
-    av_free(picture->data[0]);
-    av_free(picture);
-
-    if (tmpPicture) {
-        av_free(tmpPicture->data[0]);
-        av_free(tmpPicture);
-    }
-    av_free(videOutbuf);
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, int width, int height, int fps, double duration)
- : TMovieGenerator(width, height), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, const QSize &size, int fps, double duration) : TMovieGenerator(size.width(), size.height()), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::~TFFMpegMovieGenerator()
-{
-    if (QFile::exists(k->movieFile)) 
-        QFile::remove(k->movieFile);
-
-    delete k;
-}
-
-bool TFFMpegMovieGenerator::begin()
-{
-    av_register_all();
-
-    #ifdef K_LUCID
-        k->fmt = guess_format(0, k->movieFile.toLocal8Bit().data(), 0);
-    #else
-        k->fmt = av_guess_format(0, k->movieFile.toLocal8Bit().data(), 0);
-    #endif
-
-    if (!k->fmt) {
-        #ifdef K_LUCID
-            k->fmt = guess_format("mpeg", NULL, NULL);
-        #else
-            k->fmt = av_guess_format("mpeg", NULL, NULL);
-        #endif
-    }
-
-    if (! k->fmt) {
-        k->errorMsg = "ffmpeg error: Cannot find a valid format for " + k->movieFile.toLocal8Bit() + ". This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    k->oc = avformat_alloc_context();
-
-    if (!k->oc) {
-        k->errorMsg = "ffmpeg error: Error while doing export. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-	
-    k->oc->oformat = k->fmt;
-    snprintf(k->oc->filename, sizeof(k->oc->filename), "%s", k->movieFile.toLocal8Bit().data());
-    k->video_st = addVideoStream(k->oc, k->fmt->video_codec, width(), height(), k->fps, k->errorMsg);
-	
-    if (!k->video_st) {
-        k->errorMsg = "ffmpeg error: Can't add video stream. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    /*
-    // if (av_set_parameters(k->oc, 0) < 0) {
-    if (avformat_write_header(k->oc, NULL) < 0) {
-        k->errorMsg = "ffmpeg error: Invalid output format parameters. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-    */
-
-    // dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1);
-    av_dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1);
-
-    if (!k->openVideo(k->oc, k->video_st)) {
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - [ Fatal Error ] - Can't open video";
-        #endif
-        return false;
-    }
-
-    if (!(k->fmt->flags & AVFMT_NOFILE)) {
-        // if (url_fopen(&k->oc->pb, k->movieFile.toLocal8Bit().data(), URL_WRONLY) < 0) {
-        if (avio_open(&k->oc->pb, k->movieFile.toLocal8Bit().data(), URL_WRONLY) < 0) {
-            k->errorMsg = "ffmpeg error: Could not open " + k->movieFile.toLocal8Bit() + ". This is not a problem directly related to Tupi. \
-                           Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-            #ifdef K_DEBUG
-                   tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-            #endif
-            return false;
-        }
-    }
-
-    // av_write_header(k->oc);
-    avformat_write_header(k->oc, NULL);
-
-    k->video_pts = 0.0;
-    k->frameCount = 0;
-
-    return true;
-}
-
-bool TFFMpegMovieGenerator::movieHeaderOk() 
-{ 
-    return k->exception;
-}
-
-const char* TFFMpegMovieGenerator::getErrorMsg() 
-{
-    return k->errorMsg;
-}
-
-void TFFMpegMovieGenerator::handle(const QImage& image)
-{
-    if (k->video_st) 
-        k->video_pts = (double)k->video_st->pts.val * k->video_st->time_base.num / k->video_st->time_base.den;
-    else 
-        k->video_pts = 0.0;
-
-    if (!k->video_st || k->video_pts >= k->streamDuration)
-        return;
-
-    k->writeVideoFrame(image);
-}
-
-void TFFMpegMovieGenerator::end()
-{
-    k->closeVideo(k->video_st);
-    av_write_trailer(k->oc);
-
-    int streams_total = k->oc->nb_streams;
-    for (int i = 0; i < streams_total; i++) {
-         av_freep(&k->oc->streams[i]->codec);  
-         av_freep(&k->oc->streams[i]);
-    }
-
-    if (!(k->fmt->flags & AVFMT_NOFILE)) {
-        // url_fclose(k->oc->pb);
-        avio_close(k->oc->pb);
-    }
-
-    av_free(k->oc);
-}
-
-
-void TFFMpegMovieGenerator::__saveMovie(const QString &fileName)
-{
-    if (QFile::exists(fileName)) 
-        QFile::remove(fileName);
-
-    QFile::copy(k->movieFile, fileName);
-}
diff -Nru tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.debian.cpp tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.debian.cpp
--- tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.debian.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.debian.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,479 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#define INT64_C
-#define __STDC_CONSTANT_MACROS
-#include <stdint.h>
-
-#include "tffmpegmoviegenerator.h"
-#include "tdebug.h"
-#include "talgorithm.h"
-
-#include <QDir>
-
-#ifdef __cplusplus
-extern "C" {
-#include "libavutil/mathematics.h"
-#include "libavformat/avformat.h"
-}
-#endif
-
-struct TFFMpegMovieGenerator::Private
-{
-    AVFrame *frame;
-
-    QString movieFile;
-    int fps;
-    double video_pts;
-    int frameCount;
-    double streamDuration;
-    bool exception;
-    const char *errorMsg;
-
-    AVStream *video_st;
-    AVFormatContext *oc;
-    AVOutputFormat *fmt;
-
-    void chooseFileExtension(int format);
-    bool openVideo(AVCodec *codec, AVStream *st);
-    void RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height);
-    bool writeVideoFrame(const QString &movieFile, const QImage &image);
-    void closeVideo(AVStream *st);
-};
-
-static AVStream *addVideoStream(AVFormatContext *oc, AVCodec **codec, enum AVCodecID codec_id, const QString &movieFile, int width, int height, int fps, const char *errorMsg)
-{
-    AVCodecContext *c;
-    AVStream *st;
-
-    /* find the encoder */
-    *codec = avcodec_find_encoder(codec_id);
-    if (!(*codec)) {
-        errorMsg = "ffmpeg error: Could not find encoder. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::addVideoStream() - " << errorMsg;
-        #endif
-        return 0;
-    }
-
-    st = avformat_new_stream(oc, *codec);
-    if (!st) {
-        errorMsg = "ffmpeg error: Could not alloc stream. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::addVideoStream() - " << errorMsg;
-        #endif
-        return 0;
-    }
-    st->id = oc->nb_streams-1;
-    c = st->codec;
-
-    // c->codec_type = AVMEDIA_TYPE_VIDEO;
-    c->codec_id = codec_id;
-
-    /* put sample parameters */
-    c->bit_rate = 6000000;
-
-    /* resolution must be a multiple of two */
-    c->width = width;  
-    c->height = height; 
-
-    c->time_base.den = fps;
-    c->time_base.num = 1;
-    c->gop_size = 12;
-
-    if (movieFile.endsWith("gif", Qt::CaseInsensitive)) {
-        c->pix_fmt = AV_PIX_FMT_RGB24;
-    } else {
-        c->pix_fmt = AV_PIX_FMT_YUV420P;
-    }
-
-    // if (c->codec_id == CODEC_ID_MPEG2VIDEO) {
-    if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
-
-	/* just for testing, we also add B frames */
-	c->max_b_frames = 2;
-    }
-
-    // if (c->codec_id == CODEC_ID_MPEG1VIDEO) {
-    if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
-        /* needed to avoid using macroblocks in which some coeffs overflow
-           this doesnt happen with normal video, it just happens here as the
-           motion of the chroma plane doesnt match the luma plane */
-           c->mb_decision=2;
-    }
-
-    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-	
-    return st;
-}
-
-void TFFMpegMovieGenerator::Private::chooseFileExtension(int format)
-{
-    switch (format) {
-            case WEBM:
-                 movieFile += ".webm";
-                 break;
-            case OGV:
-                 movieFile += ".ogv";
-                 break;
-            case SWF:
-                 movieFile += ".swf";
-                 break;
-            case MPEG:
-                 movieFile += ".mpg";
-                 break;
-            case ASF:
-                 movieFile += ".asf";
-                 break;
-            case AVI:
-                 movieFile += ".avi";
-                 break;
-            case MOV:
-                 movieFile += ".mov";
-                 break;
-            case GIF:
-                 movieFile += ".gif";
-                 break;
-            default:
-                 movieFile += ".mpg";
-                 break;
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::openVideo(AVCodec *codec, AVStream *st)
-{
-    int ret;
-    AVCodecContext *c = st->codec;
-
-    /* open the codec */
-    ret = avcodec_open2(c, codec, NULL);
-    if (ret < 0) {
-        errorMsg = "The video codec required is not installed in your system. \
-                    Please, check your ffmpeg installation and codec support. \
-                    More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-
-        return false;
-    }
-
-    /* allocate and init a re-usable frame */
-    frame = avcodec_alloc_frame();
-    if (!frame) {
-        errorMsg = "There is no available memory to export your project as a video";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-
-        return false;
-    }
-	
-    return true;
-}
-
-#define RGBtoYUV(r, g, b, y, u, v) \
-  y = (uint8_t)(((int)30*r + (int)59*g + (int)11*b)/100); \
-  u = (uint8_t)(((int)-17*r - (int)33*g + (int)50*b + 12800)/100); \
-  v = (uint8_t)(((int)50*r - (int)42*g - (int)8*b + 12800)/100);
-
-void TFFMpegMovieGenerator::Private::RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height)
-{
-    const unsigned iPlaneSize = width * height;
-    const unsigned iHalfWidth = width >> 1;
-
-    // get pointers to the data
-    uint8_t *yplane  = bufferYUV;
-    uint8_t *uplane  = bufferYUV + iPlaneSize;
-    uint8_t *vplane  = bufferYUV + iPlaneSize + (iPlaneSize >> 2);
-    const uint8_t *bufferRGBIndex = bufferRGB;
-
-    int iRGBIdx[3];
-    iRGBIdx[0] = 0;
-    iRGBIdx[1] = 1;
-    iRGBIdx[2] = 2;
-    if (bSwapRGB)  {
-        iRGBIdx[0] = 2;
-        iRGBIdx[2] = 0;
-    }
- 
-    for (int y = 0; y < (int) height; y++) {
-         uint8_t *yline  = yplane + (y * width);
-         uint8_t *uline  = uplane + ((y >> 1) * iHalfWidth);
-         uint8_t *vline  = vplane + ((y >> 1) * iHalfWidth);
-
-         for (int x=0; x<width; x+=2) {
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              uline++;
-              vline++;
-         }
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::writeVideoFrame(const QString &movieFile, const QImage &image)
-{
-    #ifdef K_DEBUG
-           tWarning() << "TFFMpegMovieGenerator::writeVideoFrame() - Generating frame #" << frameCount;
-    #endif
-
-    int ret;
-    AVCodecContext *c = video_st->codec;
-
-    /* encode the image */
-    AVPacket pkt;
-    int got_output;
-
-    av_init_packet(&pkt);
-    pkt.data = NULL;    // packet data will be allocated by the encoder
-    pkt.size = 0;
-
-    int w = c->width;
-    int h = c->height;
-
-    if (movieFile.endsWith("gif", Qt::CaseInsensitive)) {
-        // c->pix_fmt = AV_PIX_FMT_RGB24;
-        // avpicture_fill((AVPicture *)frame, image.bits(), AV_PIX_FMT_RGB24, w, h);
-    } else {
-        int size = avpicture_get_size(PIX_FMT_YUV420P, w, h);
-        uint8_t *pic_dat = (uint8_t *) av_malloc(size);
-        RGBtoYUV420P(image.bits(), pic_dat, image.depth()/8, true, w, h);
-        avpicture_fill((AVPicture *)frame, pic_dat, PIX_FMT_YUV420P, w, h);
-    }
-
-    ret = avcodec_encode_video2(c, &pkt, frame, &got_output);
-    if (ret < 0) {
-        errorMsg = "[1] Error while encoding the video of your project";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::writeVideoFrame() - " << errorMsg;
-        #endif
-
-        return false;
-    }
-
-    /* If size is zero, it means the image was buffered. */
-    if (got_output) {
-        if (c->coded_frame->key_frame)
-            pkt.flags |= AV_PKT_FLAG_KEY;
-
-        pkt.stream_index = video_st->index;
-
-        /* Write the compressed frame to the media file. */
-        ret = av_interleaved_write_frame(oc, &pkt);
-    } else {
-        ret = 0;
-    }
-
-    if (ret != 0) {
-        errorMsg = "[2] Error while encoding the video of your project";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::writeVideoFrame() - " << errorMsg;
-        #endif
-
-        return false;
-    }
-
-    frameCount++;
-
-    return true;
-}
-
-void TFFMpegMovieGenerator::Private::closeVideo(AVStream *st)
-{
-    avcodec_close(st->codec);
-    av_free(frame);
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, int width, int height, int fps, double duration)
- : TMovieGenerator(width, height), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, const QSize &size, int fps, double duration) : TMovieGenerator(size.width(), size.height()), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::~TFFMpegMovieGenerator()
-{
-    if (QFile::exists(k->movieFile)) 
-        QFile::remove(k->movieFile);
-
-    delete k;
-}
-
-bool TFFMpegMovieGenerator::begin()
-{
-    int ret;
-    AVCodec *video_codec = 0;
-
-    av_register_all();
-
-    k->fmt = av_guess_format(NULL, k->movieFile.toLocal8Bit().data(), NULL);
-    if (!k->fmt) {
-        k->fmt = av_guess_format("mpeg", NULL, NULL);
-    }
-
-    if (!k->fmt) {
-        k->errorMsg = "ffmpeg error: Error while doing export. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        return false;
-    }
-
-    k->oc = avformat_alloc_context();
-    if (!k->oc) {
-        fprintf(stderr, "Memory error\n");
-        return false;
-    }
-    k->oc->oformat = k->fmt;
-
-    if (!k->oc) {
-        k->errorMsg = "ffmpeg error: Error while doing export. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    k->video_st = NULL;
-    // if (k->fmt->video_codec != CODEC_ID_NONE) 
-    if (k->fmt->video_codec != AV_CODEC_ID_NONE) 
-        k->video_st = addVideoStream(k->oc, &video_codec, k->fmt->video_codec, k->movieFile, width(), height(), k->fps, k->errorMsg);
-
-    av_dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1); 
-	
-    if (k->video_st) {
-        k->openVideo(video_codec, k->video_st);
-    } else {
-        k->errorMsg = "ffmpeg error: Can't add video stream. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    if (!(k->fmt->flags & AVFMT_NOFILE)) {
-        ret = avio_open(&k->oc->pb, k->movieFile.toLocal8Bit().data(), AVIO_FLAG_WRITE);
-        if (ret < 0) {
-            k->errorMsg = "ffmpeg error: could not open video file";
-            #ifdef K_DEBUG
-                   tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-            #endif
-            return false;
-        }
-    }
-
-    avformat_write_header(k->oc, NULL);
-
-    if (k->frame)
-        k->frame->pts = 0;
-
-    k->frameCount = 0;
-
-    return true;
-}
-
-bool TFFMpegMovieGenerator::movieHeaderOk() 
-{ 
-    return k->exception;
-}
-
-const char* TFFMpegMovieGenerator::getErrorMsg() 
-{
-    return k->errorMsg;
-}
-
-void TFFMpegMovieGenerator::handle(const QImage& image)
-{
-    if (k->video_st) 
-        k->video_pts = (double)k->video_st->pts.val * k->video_st->time_base.num / k->video_st->time_base.den;
-    else 
-        k->video_pts = 0.0;
-
-    if (!k->video_st || k->video_pts >= k->streamDuration) {
-        #ifdef K_DEBUG
-               tWarning() << "TFFMpegMovieGenerator::handle() - The total of frames has been processed (" << k->streamDuration << " seg)";
-        #endif
-
-        return;
-    }
-
-    #ifdef K_DEBUG
-           tWarning() << "Duration: " << k->streamDuration;
-           tWarning() << "Video PTS: " << k->video_pts;
-    #endif
-
-    k->writeVideoFrame(k->movieFile, image);
-    k->frame->pts += av_rescale_q(1, k->video_st->codec->time_base, k->video_st->time_base);
-}
-
-void TFFMpegMovieGenerator::end()
-{
-    av_write_trailer(k->oc);
-
-    if (k->video_st)
-        k->closeVideo(k->video_st);
-
-    if (!(k->fmt->flags & AVFMT_NOFILE))
-        avio_close(k->oc->pb);
-
-    avformat_free_context(k->oc);
-}
-
-void TFFMpegMovieGenerator::__saveMovie(const QString &fileName)
-{
-    if (QFile::exists(fileName)) 
-        QFile::remove(fileName);
-
-    QFile::copy(k->movieFile, fileName);
-}
diff -Nru tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.h tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.h
--- tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TFFMPEGMOVIEGENERATOR_H
-#define TFFMPEGMOVIEGENERATOR_H
-
-#include "tmoviegenerator.h"
-
-/**
-    @author David Cuadrado
-*/
-
-class TFFMpegMovieGenerator : public TMovieGenerator
-{
-    public:
-        TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, int width, int height, int fps = 24, double duration = 0);
-        TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, const QSize &size, int fps = 24, double duration = 0);
-        ~TFFMpegMovieGenerator();
-        virtual bool movieHeaderOk();
-        virtual const char* getErrorMsg();
-
-    protected:
-        void __saveMovie(const QString &fileName);
-        virtual void handle(const QImage &image);
-        virtual bool begin();
-        virtual void end();
-
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.new.cpp tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.new.cpp
--- tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.new.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.new.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,567 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#define INT64_C
-#define __STDC_CONSTANT_MACROS
-#include <stdint.h>
-
-#include "tffmpegmoviegenerator.h"
-#include "tdebug.h"
-#include "talgorithm.h"
-
-#include <QDir>
-
-#ifdef __cplusplus
-extern "C" {
-#include "libavformat/avformat.h"
-#include "libavcodec/avcodec.h"
-#include "libavutil/mathematics.h"
-}
-#endif
-
-struct TFFMpegMovieGenerator::Private
-{
-    AVFrame *picture;
-    AVFrame *tmpPicture;
-
-    QString movieFile;
-    int fps;
-    double video_pts;
-    uint8_t *videOutbuf;
-    int frameCount;
-    int videOutbufSize;
-    double streamDuration;
-    bool exception;
-    const char *errorMsg;
-
-    AVStream *video_st;
-    AVFormatContext *oc;
-    AVOutputFormat *fmt;
-
-    void chooseFileExtension(int format);
-    bool openVideo(AVFormatContext *oc, AVStream *st);
-    void RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height);
-    bool writeVideoFrame(const QImage &image);
-    void closeVideo(AVStream *st);
-};
-
-static AVStream *addVideoStream(AVFormatContext *oc, int codec_id, int width, int height, int fps, const char *errorMsg)
-{
-    AVCodecContext *c;
-    AVStream *st;
-
-    int w = width;
-    int h = height;
-
-    // st = av_new_stream(oc, 0);
-    st = avformat_new_stream(oc, 0);
-    if (!st) {
-        errorMsg = "ffmpeg error: Could not alloc stream. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::addVideoStream() - " << errorMsg;
-        #endif
-        return 0;
-    }
-
-    c = st->codec;
-    c->codec_id = CodecID(codec_id);
-    c->codec_type = AVMEDIA_TYPE_VIDEO;   
-
-    /* put sample parameters */
-    // c->bit_rate = 800000;
-    c->bit_rate = 6000000;
-
-    /* resolution must be a multiple of two */
-    c->width = w;  
-    c->height = h; 
-
-    c->time_base.den = fps;
-    c->time_base.num = 1;
-    // c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-    c->gop_size = 2;
-    c->pix_fmt = PIX_FMT_YUV420P;
-
-    // c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-    if (c->codec_id == CODEC_ID_MPEG2VIDEO) {
-	/* just for testing, we also add B frames */
-	c->max_b_frames = 2;
-    }
-
-    if (c->codec_id == CODEC_ID_MPEG1VIDEO) {
-        /* needed to avoid using macroblocks in which some coeffs overflow
-           this doesnt happen with normal video, it just happens here as the
-           motion of the chroma plane doesnt match the luma plane */
-           c->mb_decision=2;
-    }
-
-    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-	
-    return st;
-}
-
-static AVFrame *allocPicture(enum PixelFormat pix_fmt, int width, int height)
-{
-    AVFrame *picture;
-    uint8_t *picture_buf;
-    int size;
- 
-    picture = avcodec_alloc_frame();
-
-    if (!picture) 
-        return 0;
-	
-    size = avpicture_get_size(pix_fmt, width, height);
-    picture_buf = (uint8_t *)malloc(size);
-
-    if (!picture_buf) {
-	av_free(picture);
-	return 0;
-    }
-
-    avpicture_fill((AVPicture *)picture, picture_buf, pix_fmt, width, height);
-
-    return picture;
-}
-
-void TFFMpegMovieGenerator::Private::chooseFileExtension(int format)
-{
-    switch (format) {
-            case WEBM:
-                 movieFile += ".webm";
-                 break;
-            case OGV:
-                 movieFile += ".ogv";
-                 break;
-            case SWF:
-                 movieFile += ".swf";
-                 break;
-            case MPEG:
-                 movieFile += ".mpg";
-                 break;
-            case ASF:
-                 movieFile += ".asf";
-                 break;
-            case AVI:
-                 movieFile += ".avi";
-                 break;
-            case MOV:
-                 movieFile += ".mov";
-                 break;
-            case GIF:
-                 movieFile += ".gif";
-                 break;
-            default:
-                 movieFile += ".mpg";
-                 break;
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::openVideo(AVFormatContext *oc, AVStream *st)
-{
-    AVCodec *codec;
-    AVCodecContext *c;
-
-    c = st->codec;
-
-    /* find the video encoder */
-    codec = avcodec_find_encoder(c->codec_id);
-
-    if (!codec) {
-        errorMsg = "ffmpeg error: Video codec not found. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. It's very possible your system is missing codecs. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-
-        return false;
-    }
-
-    /* open the codec */
-    // if (avcodec_open(c, codec) < 0) {
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        errorMsg = "ffmpeg error: Could not open video codec. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-        return false;
-    }
-
-    videOutbuf = 0;
-    if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) {
-        videOutbufSize = 200000;
-        videOutbuf = (uint8_t *) av_malloc(videOutbufSize);
-    }
-
-    /* allocate the encoded raw m_picture */
-    picture = allocPicture(c->pix_fmt, c->width, c->height);
-
-    if (!picture) {
-        errorMsg = "ffmpeg error: Could not allocate m_picture. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif 
-        return false;
-    }
-
-    tmpPicture = 0;
-
-    if (c->pix_fmt != PIX_FMT_YUV420P) {
-        tmpPicture = allocPicture(PIX_FMT_YUV420P, c->width, c->height);
-        if (!tmpPicture) {
-            errorMsg = "ffmpeg error: Could not allocate temporary picture. This is not a problem directly related to Tupi. \
-                        Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-            #ifdef K_DEBUG
-                   tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-            #endif
-            return false;
-        }
-    }
-	
-    return true;
-}
-
-#define RGBtoYUV(r, g, b, y, u, v) \
-  y = (uint8_t)(((int)30*r + (int)59*g + (int)11*b)/100); \
-  u = (uint8_t)(((int)-17*r - (int)33*g + (int)50*b + 12800)/100); \
-  v = (uint8_t)(((int)50*r - (int)42*g - (int)8*b + 12800)/100);
-
-void TFFMpegMovieGenerator::Private::RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height)
-{
-    const unsigned iPlaneSize = width * height;
-    const unsigned iHalfWidth = width >> 1;
-
-    // get pointers to the data
-    uint8_t *yplane  = bufferYUV;
-    uint8_t *uplane  = bufferYUV + iPlaneSize;
-    uint8_t *vplane  = bufferYUV + iPlaneSize + (iPlaneSize >> 2);
-    const uint8_t *bufferRGBIndex = bufferRGB;
-
-    int iRGBIdx[3];
-    iRGBIdx[0] = 0;
-    iRGBIdx[1] = 1;
-    iRGBIdx[2] = 2;
-    if (bSwapRGB)  {
-        iRGBIdx[0] = 2;
-        iRGBIdx[2] = 0;
-    }
- 
-    for (int y = 0; y < (int) height; y++) {
-         uint8_t *yline  = yplane + (y * width);
-         uint8_t *uline  = uplane + ((y >> 1) * iHalfWidth);
-         uint8_t *vline  = vplane + ((y >> 1) * iHalfWidth);
-
-         for (int x=0; x<width; x+=2) {
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              uline++;
-              vline++;
-         }
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::writeVideoFrame(const QImage &image)
-{
-    #ifdef K_DEBUG
-           tWarning() << "TFFMpegMovieGenerator::writeVideoFrame() - Generating frame #" << frameCount;
-    #endif
-
-    AVCodecContext *c = video_st->codec;
-    AVFrame *picturePtr = 0;
-    double nbFrames = ((int)(streamDuration * fps));
-
-    if (frameCount < nbFrames) {
-        int w = c->width;
-        int h = c->height;
-
-        int size = avpicture_get_size(PIX_FMT_YUV420P, w, h);
-        uint8_t *pic_dat = (uint8_t *) av_malloc(size);
-        RGBtoYUV420P(image.bits(), pic_dat, image.depth()/8, true, w, h);
-
-        picturePtr = avcodec_alloc_frame();
-        picturePtr->quality = 1;
-
-        avpicture_fill((AVPicture *)picturePtr, pic_dat,
-                   PIX_FMT_YUV420P, w, h);
-    }
-
-    int out_size = -1, ret = -1;
-
-    if (oc->oformat->flags & AVFMT_RAWPICTURE) { // Exporting images array
-        AVPacket pkt;
-        av_init_packet(&pkt);
-
-        // pkt.flags |= PKT_FLAG_KEY;
-	pkt.flags |= AV_PKT_FLAG_KEY;
-        pkt.stream_index = video_st->index;
-        pkt.data= (uint8_t *)picturePtr;
-        pkt.size= sizeof(AVPicture);
-        
-        //ret = av_write_frame(oc, &pkt);
-        ret = av_interleaved_write_frame(oc, &pkt);
-
-    } else { // Exporting movies
-        out_size = avcodec_encode_video(c, videOutbuf, videOutbufSize, picturePtr);
-
-        if (out_size > 0) {
-            AVPacket pkt;
-            av_init_packet(&pkt);
-
-            if (c->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) 
-                pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, video_st->time_base);
-
-            if (c->coded_frame->key_frame)
-		pkt.flags |= AV_PKT_FLAG_KEY;
-                // pkt.flags |= PKT_FLAG_KEY;
-            pkt.stream_index = video_st->index;
-            pkt.data = videOutbuf;
-            pkt.size = out_size;
-
-            /* write the compressed frame in the media file */
-            ret = av_interleaved_write_frame(oc, &pkt);
-            //ret = av_write_frame(oc, &pkt);
-        } else {
-            ret = 0;
-        }
-   }
-
-   if (ret != 0) {
-       errorMsg = "ffmpeg error: Could not write video frame. This is not a problem directly related to Tupi. \
-                   Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-
-       #ifdef K_DEBUG
-              tError() << "TFFMpegMovieGenerator::writeVideoFrame() - " << errorMsg;
-       #endif
-       return false;
-   }
-
-   frameCount++;
-
-   return true;
-}
-
-void TFFMpegMovieGenerator::Private::closeVideo(AVStream *st)
-{
-    AVCodecContext *c;
-    c = st->codec;
-    avcodec_close(c);
-    av_free(picture->data[0]);
-    av_free(picture);
-
-    if (tmpPicture) {
-        av_free(tmpPicture->data[0]);
-        av_free(tmpPicture);
-    }
-    av_free(videOutbuf);
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, int width, int height, int fps, double duration)
- : TMovieGenerator(width, height), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, const QSize &size, int fps, double duration) : TMovieGenerator(size.width(), size.height()), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::~TFFMpegMovieGenerator()
-{
-    if (QFile::exists(k->movieFile)) 
-        QFile::remove(k->movieFile);
-
-    delete k;
-}
-
-bool TFFMpegMovieGenerator::begin()
-{
-    av_register_all();
-
-    #ifdef K_LUCID
-        k->fmt = guess_format(0, k->movieFile.toLocal8Bit().data(), 0);
-    #else
-        k->fmt = av_guess_format(0, k->movieFile.toLocal8Bit().data(), 0);
-    #endif
-
-    if (!k->fmt) {
-        #ifdef K_LUCID
-            k->fmt = guess_format("mpeg", NULL, NULL);
-        #else
-            k->fmt = av_guess_format("mpeg", NULL, NULL);
-        #endif
-    }
-
-    if (! k->fmt) {
-        k->errorMsg = "ffmpeg error: Cannot find a valid format for " + k->movieFile.toLocal8Bit() + ". This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    k->oc = avformat_alloc_context();
-
-    if (!k->oc) {
-        k->errorMsg = "ffmpeg error: Error while doing export. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-	
-    k->oc->oformat = k->fmt;
-    snprintf(k->oc->filename, sizeof(k->oc->filename), "%s", k->movieFile.toLocal8Bit().data());
-    k->video_st = addVideoStream(k->oc, k->fmt->video_codec, width(), height(), k->fps, k->errorMsg);
-	
-    if (!k->video_st) {
-        k->errorMsg = "ffmpeg error: Can't add video stream. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    /*
-    // if (av_set_parameters(k->oc, 0) < 0) {
-    if (avformat_write_header(k->oc, NULL) < 0) {
-        k->errorMsg = "ffmpeg error: Invalid output format parameters. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-    */
-
-    // dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1);
-    av_dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1);
-
-    if (!k->openVideo(k->oc, k->video_st)) {
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - [ Fatal Error ] - Can't open video";
-        #endif
-        return false;
-    }
-
-    if (!(k->fmt->flags & AVFMT_NOFILE)) {
-        // if (url_fopen(&k->oc->pb, k->movieFile.toLocal8Bit().data(), URL_WRONLY) < 0) {
-        if (avio_open(&k->oc->pb, k->movieFile.toLocal8Bit().data(), URL_WRONLY) < 0) {
-            k->errorMsg = "ffmpeg error: Could not open " + k->movieFile.toLocal8Bit() + ". This is not a problem directly related to Tupi. \
-                           Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-            #ifdef K_DEBUG
-                   tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-            #endif
-            return false;
-        }
-    }
-
-    // av_write_header(k->oc);
-    avformat_write_header(k->oc, NULL);
-
-    k->video_pts = 0.0;
-    k->frameCount = 0;
-
-    return true;
-}
-
-bool TFFMpegMovieGenerator::movieHeaderOk() 
-{ 
-    return k->exception;
-}
-
-const char* TFFMpegMovieGenerator::getErrorMsg() 
-{
-    return k->errorMsg;
-}
-
-void TFFMpegMovieGenerator::handle(const QImage& image)
-{
-    if (k->video_st) 
-        k->video_pts = (double)k->video_st->pts.val * k->video_st->time_base.num / k->video_st->time_base.den;
-    else 
-        k->video_pts = 0.0;
-
-    if (!k->video_st || k->video_pts >= k->streamDuration)
-        return;
-
-    k->writeVideoFrame(image);
-}
-
-void TFFMpegMovieGenerator::end()
-{
-    k->closeVideo(k->video_st);
-    av_write_trailer(k->oc);
-
-    int streams_total = k->oc->nb_streams;
-    for (int i = 0; i < streams_total; i++) {
-         av_freep(&k->oc->streams[i]->codec);  
-         av_freep(&k->oc->streams[i]);
-    }
-
-    if (!(k->fmt->flags & AVFMT_NOFILE)) {
-        // url_fclose(k->oc->pb);
-        avio_close(k->oc->pb);
-    }
-
-    av_free(k->oc);
-}
-
-
-void TFFMpegMovieGenerator::__saveMovie(const QString &fileName)
-{
-    if (QFile::exists(fileName)) 
-        QFile::remove(fileName);
-
-    QFile::copy(k->movieFile, fileName);
-}
diff -Nru tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp
--- tupi-0.2+git04/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,567 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#define INT64_C
-#define __STDC_CONSTANT_MACROS
-#include <stdint.h>
-
-#include "tffmpegmoviegenerator.h"
-#include "tdebug.h"
-#include "talgorithm.h"
-
-#include <QDir>
-
-#ifdef __cplusplus
-extern "C" {
-#include "libavformat/avformat.h"
-#include "libavcodec/avcodec.h"
-#include "libavutil/mathematics.h"
-}
-#endif
-
-struct TFFMpegMovieGenerator::Private
-{
-    AVFrame *picture;
-    AVFrame *tmpPicture;
-
-    QString movieFile;
-    int fps;
-    double video_pts;
-    uint8_t *videOutbuf;
-    int frameCount;
-    int videOutbufSize;
-    double streamDuration;
-    bool exception;
-    const char *errorMsg;
-
-    AVStream *video_st;
-    AVFormatContext *oc;
-    AVOutputFormat *fmt;
-
-    void chooseFileExtension(int format);
-    bool openVideo(AVFormatContext *oc, AVStream *st);
-    void RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height);
-    bool writeVideoFrame(const QImage &image);
-    void closeVideo(AVStream *st);
-};
-
-static AVStream *addVideoStream(AVFormatContext *oc, int codec_id, int width, int height, int fps, const char *errorMsg)
-{
-    AVCodecContext *c;
-    AVStream *st;
-
-    int w = width;
-    int h = height;
-
-    // st = av_new_stream(oc, 0);
-    st = avformat_new_stream(oc, 0);
-    if (!st) {
-        errorMsg = "ffmpeg error: Could not alloc stream. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::addVideoStream() - " << errorMsg;
-        #endif
-        return 0;
-    }
-
-    c = st->codec;
-    c->codec_id = CodecID(codec_id);
-    c->codec_type = AVMEDIA_TYPE_VIDEO;   
-
-    /* put sample parameters */
-    // c->bit_rate = 800000;
-    c->bit_rate = 6000000;
-
-    /* resolution must be a multiple of two */
-    c->width = w;  
-    c->height = h; 
-
-    c->time_base.den = fps;
-    c->time_base.num = 1;
-    // c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-    c->gop_size = 2;
-    c->pix_fmt = PIX_FMT_YUV420P;
-
-    // c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-    if (c->codec_id == CODEC_ID_MPEG2VIDEO) {
-	/* just for testing, we also add B frames */
-	c->max_b_frames = 2;
-    }
-
-    if (c->codec_id == CODEC_ID_MPEG1VIDEO) {
-        /* needed to avoid using macroblocks in which some coeffs overflow
-           this doesnt happen with normal video, it just happens here as the
-           motion of the chroma plane doesnt match the luma plane */
-           c->mb_decision=2;
-    }
-
-    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-	
-    return st;
-}
-
-static AVFrame *allocPicture(enum PixelFormat pix_fmt, int width, int height)
-{
-    AVFrame *picture;
-    uint8_t *picture_buf;
-    int size;
- 
-    picture = avcodec_alloc_frame();
-
-    if (!picture) 
-        return 0;
-	
-    size = avpicture_get_size(pix_fmt, width, height);
-    picture_buf = (uint8_t *)malloc(size);
-
-    if (!picture_buf) {
-	av_free(picture);
-	return 0;
-    }
-
-    avpicture_fill((AVPicture *)picture, picture_buf, pix_fmt, width, height);
-
-    return picture;
-}
-
-void TFFMpegMovieGenerator::Private::chooseFileExtension(int format)
-{
-    switch (format) {
-            case WEBM:
-                 movieFile += ".webm";
-                 break;
-            case OGV:
-                 movieFile += ".ogv";
-                 break;
-            case SWF:
-                 movieFile += ".swf";
-                 break;
-            case MPEG:
-                 movieFile += ".mpg";
-                 break;
-            case ASF:
-                 movieFile += ".asf";
-                 break;
-            case AVI:
-                 movieFile += ".avi";
-                 break;
-            case MOV:
-                 movieFile += ".mov";
-                 break;
-            case GIF:
-                 movieFile += ".gif";
-                 break;
-            default:
-                 movieFile += ".mpg";
-                 break;
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::openVideo(AVFormatContext *oc, AVStream *st)
-{
-    AVCodec *codec;
-    AVCodecContext *c;
-
-    c = st->codec;
-
-    /* find the video encoder */
-    codec = avcodec_find_encoder(c->codec_id);
-
-    if (!codec) {
-        errorMsg = "ffmpeg error: Video codec not found. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. It's very possible your system is missing codecs. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-
-        return false;
-    }
-
-    /* open the codec */
-    // if (avcodec_open(c, codec) < 0) {
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        errorMsg = "ffmpeg error: Could not open video codec. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif
-        return false;
-    }
-
-    videOutbuf = 0;
-    if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) {
-        videOutbufSize = 200000;
-        videOutbuf = (uint8_t *) av_malloc(videOutbufSize);
-    }
-
-    /* allocate the encoded raw m_picture */
-    picture = allocPicture(c->pix_fmt, c->width, c->height);
-
-    if (!picture) {
-        errorMsg = "ffmpeg error: Could not allocate m_picture. This is not a problem directly related to Tupi. \
-                    Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-        #endif 
-        return false;
-    }
-
-    tmpPicture = 0;
-
-    if (c->pix_fmt != PIX_FMT_YUV420P) {
-        tmpPicture = allocPicture(PIX_FMT_YUV420P, c->width, c->height);
-        if (!tmpPicture) {
-            errorMsg = "ffmpeg error: Could not allocate temporary picture. This is not a problem directly related to Tupi. \
-                        Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-            #ifdef K_DEBUG
-                   tError() << "TFFMpegMovieGenerator::openVideo() - " << errorMsg;
-            #endif
-            return false;
-        }
-    }
-	
-    return true;
-}
-
-#define RGBtoYUV(r, g, b, y, u, v) \
-  y = (uint8_t)(((int)30*r + (int)59*g + (int)11*b)/100); \
-  u = (uint8_t)(((int)-17*r - (int)33*g + (int)50*b + 12800)/100); \
-  v = (uint8_t)(((int)50*r - (int)42*g - (int)8*b + 12800)/100);
-
-void TFFMpegMovieGenerator::Private::RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height)
-{
-    const unsigned iPlaneSize = width * height;
-    const unsigned iHalfWidth = width >> 1;
-
-    // get pointers to the data
-    uint8_t *yplane  = bufferYUV;
-    uint8_t *uplane  = bufferYUV + iPlaneSize;
-    uint8_t *vplane  = bufferYUV + iPlaneSize + (iPlaneSize >> 2);
-    const uint8_t *bufferRGBIndex = bufferRGB;
-
-    int iRGBIdx[3];
-    iRGBIdx[0] = 0;
-    iRGBIdx[1] = 1;
-    iRGBIdx[2] = 2;
-    if (bSwapRGB)  {
-        iRGBIdx[0] = 2;
-        iRGBIdx[2] = 0;
-    }
- 
-    for (int y = 0; y < (int) height; y++) {
-         uint8_t *yline  = yplane + (y * width);
-         uint8_t *uline  = uplane + ((y >> 1) * iHalfWidth);
-         uint8_t *vline  = vplane + ((y >> 1) * iHalfWidth);
-
-         for (int x=0; x<width; x+=2) {
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
-              bufferRGBIndex += iRGBIncrement;
-              yline++;
-              uline++;
-              vline++;
-         }
-    }
-}
-
-bool TFFMpegMovieGenerator::Private::writeVideoFrame(const QImage &image)
-{
-    #ifdef K_DEBUG
-           tWarning() << "TFFMpegMovieGenerator::writeVideoFrame() - Generating frame #" << frameCount;
-    #endif
-
-    AVCodecContext *c = video_st->codec;
-    AVFrame *picturePtr = 0;
-    double nbFrames = ((int)(streamDuration * fps));
-
-    if (frameCount < nbFrames) {
-        int w = c->width;
-        int h = c->height;
-
-        int size = avpicture_get_size(PIX_FMT_YUV420P, w, h);
-        uint8_t *pic_dat = (uint8_t *) av_malloc(size);
-        RGBtoYUV420P(image.bits(), pic_dat, image.depth()/8, true, w, h);
-
-        picturePtr = avcodec_alloc_frame();
-        picturePtr->quality = 1;
-
-        avpicture_fill((AVPicture *)picturePtr, pic_dat,
-                   PIX_FMT_YUV420P, w, h);
-    }
-
-    int out_size = -1, ret = -1;
-
-    if (oc->oformat->flags & AVFMT_RAWPICTURE) { // Exporting images array
-        AVPacket pkt;
-        av_init_packet(&pkt);
-
-        // pkt.flags |= PKT_FLAG_KEY;
-	pkt.flags |= AV_PKT_FLAG_KEY;
-        pkt.stream_index = video_st->index;
-        pkt.data= (uint8_t *)picturePtr;
-        pkt.size= sizeof(AVPicture);
-        
-        //ret = av_write_frame(oc, &pkt);
-        ret = av_interleaved_write_frame(oc, &pkt);
-
-    } else { // Exporting movies
-        out_size = avcodec_encode_video(c, videOutbuf, videOutbufSize, picturePtr);
-
-        if (out_size > 0) {
-            AVPacket pkt;
-            av_init_packet(&pkt);
-
-            if (c->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) 
-                pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, video_st->time_base);
-
-            if (c->coded_frame->key_frame)
-		pkt.flags |= AV_PKT_FLAG_KEY;
-                // pkt.flags |= PKT_FLAG_KEY;
-            pkt.stream_index = video_st->index;
-            pkt.data = videOutbuf;
-            pkt.size = out_size;
-
-            /* write the compressed frame in the media file */
-            ret = av_interleaved_write_frame(oc, &pkt);
-            //ret = av_write_frame(oc, &pkt);
-        } else {
-            ret = 0;
-        }
-   }
-
-   if (ret != 0) {
-       errorMsg = "ffmpeg error: Could not write video frame. This is not a problem directly related to Tupi. \
-                   Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-
-       #ifdef K_DEBUG
-              tError() << "TFFMpegMovieGenerator::writeVideoFrame() - " << errorMsg;
-       #endif
-       return false;
-   }
-
-   frameCount++;
-
-   return true;
-}
-
-void TFFMpegMovieGenerator::Private::closeVideo(AVStream *st)
-{
-    AVCodecContext *c;
-    c = st->codec;
-    avcodec_close(c);
-    av_free(picture->data[0]);
-    av_free(picture);
-
-    if (tmpPicture) {
-        av_free(tmpPicture->data[0]);
-        av_free(tmpPicture);
-    }
-    av_free(videOutbuf);
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, int width, int height, int fps, double duration)
- : TMovieGenerator(width, height), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::TFFMpegMovieGenerator(TMovieGeneratorInterface::Format format, const QSize &size, int fps, double duration) : TMovieGenerator(size.width(), size.height()), k(new Private)
-{
-    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
-    k->chooseFileExtension(format);
-    k->fps = fps;
-    k->streamDuration = duration;
-    k->exception = begin();
-}
-
-TFFMpegMovieGenerator::~TFFMpegMovieGenerator()
-{
-    if (QFile::exists(k->movieFile)) 
-        QFile::remove(k->movieFile);
-
-    delete k;
-}
-
-bool TFFMpegMovieGenerator::begin()
-{
-    av_register_all();
-
-    #ifdef K_LUCID
-        k->fmt = guess_format(0, k->movieFile.toLocal8Bit().data(), 0);
-    #else
-        k->fmt = av_guess_format(0, k->movieFile.toLocal8Bit().data(), 0);
-    #endif
-
-    if (!k->fmt) {
-        #ifdef K_LUCID
-            k->fmt = guess_format("mpeg", NULL, NULL);
-        #else
-            k->fmt = av_guess_format("mpeg", NULL, NULL);
-        #endif
-    }
-
-    if (! k->fmt) {
-        k->errorMsg = "ffmpeg error: Cannot find a valid format for " + k->movieFile.toLocal8Bit() + ". This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    k->oc = avformat_alloc_context();
-
-    if (!k->oc) {
-        k->errorMsg = "ffmpeg error: Error while doing export. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-	
-    k->oc->oformat = k->fmt;
-    snprintf(k->oc->filename, sizeof(k->oc->filename), "%s", k->movieFile.toLocal8Bit().data());
-    k->video_st = addVideoStream(k->oc, k->fmt->video_codec, width(), height(), k->fps, k->errorMsg);
-	
-    if (!k->video_st) {
-        k->errorMsg = "ffmpeg error: Can't add video stream. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-
-    /*
-    // if (av_set_parameters(k->oc, 0) < 0) {
-    if (avformat_write_header(k->oc, NULL) < 0) {
-        k->errorMsg = "ffmpeg error: Invalid output format parameters. This is not a problem directly related to Tupi. \
-                       Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-        #endif
-        return false;
-    }
-    */
-
-    // dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1);
-    av_dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1);
-
-    if (!k->openVideo(k->oc, k->video_st)) {
-        #ifdef K_DEBUG
-               tError() << "TFFMpegMovieGenerator::begin() - [ Fatal Error ] - Can't open video";
-        #endif
-        return false;
-    }
-
-    if (!(k->fmt->flags & AVFMT_NOFILE)) {
-        // if (url_fopen(&k->oc->pb, k->movieFile.toLocal8Bit().data(), URL_WRONLY) < 0) {
-        if (avio_open(&k->oc->pb, k->movieFile.toLocal8Bit().data(), URL_WRONLY) < 0) {
-            k->errorMsg = "ffmpeg error: Could not open " + k->movieFile.toLocal8Bit() + ". This is not a problem directly related to Tupi. \
-                           Please, check your ffmpeg installation and codec support. More info: http://ffmpeg.org/";
-            #ifdef K_DEBUG
-                   tError() << "TFFMpegMovieGenerator::begin() - " << k->errorMsg;
-            #endif
-            return false;
-        }
-    }
-
-    // av_write_header(k->oc);
-    avformat_write_header(k->oc, NULL);
-
-    k->video_pts = 0.0;
-    k->frameCount = 0;
-
-    return true;
-}
-
-bool TFFMpegMovieGenerator::movieHeaderOk() 
-{ 
-    return k->exception;
-}
-
-const char* TFFMpegMovieGenerator::getErrorMsg() 
-{
-    return k->errorMsg;
-}
-
-void TFFMpegMovieGenerator::handle(const QImage& image)
-{
-    if (k->video_st) 
-        k->video_pts = (double)k->video_st->pts.val * k->video_st->time_base.num / k->video_st->time_base.den;
-    else 
-        k->video_pts = 0.0;
-
-    if (!k->video_st || k->video_pts >= k->streamDuration)
-        return;
-
-    k->writeVideoFrame(image);
-}
-
-void TFFMpegMovieGenerator::end()
-{
-    k->closeVideo(k->video_st);
-    av_write_trailer(k->oc);
-
-    int streams_total = k->oc->nb_streams;
-    for (int i = 0; i < streams_total; i++) {
-         av_freep(&k->oc->streams[i]->codec);  
-         av_freep(&k->oc->streams[i]);
-    }
-
-    if (!(k->fmt->flags & AVFMT_NOFILE)) {
-        // url_fclose(k->oc->pb);
-        avio_close(k->oc->pb);
-    }
-
-    av_free(k->oc);
-}
-
-
-void TFFMpegMovieGenerator::__saveMovie(const QString &fileName)
-{
-    if (QFile::exists(fileName)) 
-        QFile::remove(fileName);
-
-    QFile::copy(k->movieFile, fileName);
-}
diff -Nru tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.cpp tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.cpp
--- tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,170 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "genericexportplugin.h"
-#include "tuplayer.h"
-#include "tupanimationrenderer.h"
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QImage>
-#include <QPainter>
-
-GenericExportPlugin::GenericExportPlugin()
-{
-}
-
-GenericExportPlugin::~GenericExportPlugin()
-{
-}
-
-QString GenericExportPlugin::key() const
-{
-    return tr("Image Array");
-}
-
-TupExportInterface::Formats GenericExportPlugin::availableFormats()
-{
-    return TupExportInterface::PNG | TupExportInterface::JPEG | TupExportInterface::XPM;
-}
-
-bool GenericExportPlugin::exportToFormat(const QColor bgColor, const QString &filePath, const QList<TupScene *> &scenes, 
-                                         TupExportInterface::Format format, const QSize &size, int fps)
-{
-    Q_UNUSED(fps);
-
-    QFileInfo fileInfo(filePath);
-
-    QDir dir = fileInfo.dir();
-    if (!dir.exists())
-        dir.mkdir(dir.path());
-
-    m_baseName = fileInfo.baseName();
-    const char *extension = "";
-    QImage::Format imageFormat;
-    switch (format) {
-            case TupExportInterface::JPEG:
-                 extension = "JPEG";
-                 imageFormat = QImage::Format_RGB32;
-                 break;
-            case TupExportInterface::PNG:
-                 extension = "PNG";
-                 imageFormat = QImage::Format_ARGB32;
-                 break;
-            case TupExportInterface::XPM:
-                 extension = "XPM";
-                 imageFormat = QImage::Format_RGB32;
-                 break;
-            default:
-                 imageFormat = QImage::Format_RGB32;
-                 break;
-    }
-
-    // QColor color = bgColor;
-    // color.setAlpha(255);
-    TupAnimationRenderer renderer(bgColor);
-
-    foreach (TupScene *scene, scenes) {
-             renderer.setScene(scene, size);
-
-             int photogram = 0;
-             while (renderer.nextPhotogram()) {
-                    QImage image(size, imageFormat);
-                    {
-                     QPainter painter(&image);
-                     painter.setRenderHint(QPainter::Antialiasing, true);
-                     renderer.render(&painter);
-                    }
-
-                    QString index = "";
-                    if (photogram < 10) {
-                        index = "000";
-                    } else if (photogram < 100) {
-                               index = "00";
-                    } else {
-                        index = "0";
-                    }
-
-                    index += QString("%1").arg(photogram);
-
-                    image.save(fileInfo.absolutePath() + QDir::separator() + QString(m_baseName + "%1.%2").arg(index).arg(QString(extension).toLower()), extension, 100);
-
-                    photogram++;
-             }
-    }
-
-    return true;
-}
-
-bool GenericExportPlugin::exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size)
-{
-    QString path = filePath;
-    const char *extension;
-    QImage::Format imageFormat;
-    QColor bgColor = color;
-    bgColor.setAlpha(255);
-
-    if (filePath.endsWith(".PNG", Qt::CaseInsensitive)) {
-        extension = "PNG";
-        imageFormat = QImage::Format_ARGB32;
-    } else if (filePath.endsWith(".JPG", Qt::CaseInsensitive) || filePath.endsWith("JPEG", Qt::CaseInsensitive)) {
-               extension = "JPG";
-               imageFormat = QImage::Format_RGB32;
-    } else {
-        extension = "PNG"; 
-        path += ".png";
-        imageFormat = QImage::Format_ARGB32;
-    }
-
-    TupAnimationRenderer renderer(bgColor);
-    renderer.setScene(scene, size);
-
-    renderer.renderPhotogram(frameIndex);
-    QImage image(size, imageFormat);
-    {
-        QPainter painter(&image);
-        painter.setRenderHint(QPainter::Antialiasing, true);
-        renderer.render(&painter);
-    }
-
-    return image.save(path, extension, 100);
-}
-
-const char* GenericExportPlugin::getExceptionMsg() {
-    return errorMsg;
-}
-
-Q_EXPORT_PLUGIN(GenericExportPlugin);
-
diff -Nru tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.h tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.h
--- tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef GENERICEXPORTPLUGIN_H
-#define GENERICEXPORTPLUGIN_H
-
-#include "tupexportpluginobject.h"
-#include <QColor>
-
-/**
-    @author David Cuadrado
-*/
-class GenericExportPlugin : public TupExportPluginObject
-{
-    Q_OBJECT
-
-    public:
-        GenericExportPlugin();
-        virtual ~GenericExportPlugin();
-        virtual QString key() const;
-        TupExportInterface::Formats availableFormats();
-
-        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps);
-        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size);
-        virtual const char* getExceptionMsg();
-        const char *errorMsg;
-
-    private:
-        QString m_baseName;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.json tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.json
--- tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "GenericExportPlugin" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.pri tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.pri
--- tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.pri	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-INCLUDEPATH += $$PLUGIN_DIR
-LIBS += -L$$PLUGIN_DIR -ltupigenericexportplugin
diff -Nru tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.pro tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.pro
--- tupi-0.2+git04/src/plugins/export/genericexportplugin/genericexportplugin.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/genericexportplugin/genericexportplugin.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/export/genericexportplugin
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/ 
-
-HEADERS += genericexportplugin.h
-SOURCES += genericexportplugin.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib 
-TARGET = tupigenericexportplugin
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-
-include(../export_config.pri)
-include(../../../../tupiglobal.pri)
-
diff -Nru tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.cpp tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.cpp
--- tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,165 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "imageplugin.h"
+
+ImagePlugin::ImagePlugin()
+{
+}
+
+ImagePlugin::~ImagePlugin()
+{
+}
+
+QString ImagePlugin::key() const
+{
+    return tr("Image Array");
+}
+
+TupExportInterface::Formats ImagePlugin::availableFormats()
+{
+    return TupExportInterface::PNG | TupExportInterface::JPEG | TupExportInterface::XPM;
+}
+
+bool ImagePlugin::exportToFormat(const QColor bgColor, const QString &filePath, const QList<TupScene *> &scenes, 
+                                         TupExportInterface::Format format, const QSize &size, int fps, TupLibrary *library)
+{
+    Q_UNUSED(fps);
+
+    QFileInfo fileInfo(filePath);
+
+    QDir dir = fileInfo.dir();
+    if (!dir.exists())
+        dir.mkdir(dir.path());
+
+    m_baseName = fileInfo.baseName();
+    const char *extension = "";
+    QImage::Format imageFormat;
+    switch (format) {
+            case TupExportInterface::JPEG:
+                 extension = "JPEG";
+                 imageFormat = QImage::Format_RGB32;
+                 break;
+            case TupExportInterface::PNG:
+                 extension = "PNG";
+                 imageFormat = QImage::Format_ARGB32;
+                 break;
+            case TupExportInterface::XPM:
+                 extension = "XPM";
+                 imageFormat = QImage::Format_RGB32;
+                 break;
+            default:
+                 imageFormat = QImage::Format_RGB32;
+                 break;
+    }
+
+    TupAnimationRenderer renderer(bgColor, library);
+
+    foreach (TupScene *scene, scenes) {
+             renderer.setScene(scene, size);
+
+             int photogram = 0;
+             while (renderer.nextPhotogram()) {
+                    QImage image(size, imageFormat);
+                    if (bgColor.alpha() == 0)
+                        image.fill(Qt::transparent);
+                    else
+                        image.fill(bgColor);
+
+                    {
+                     QPainter painter(&image);
+                     painter.setRenderHint(QPainter::Antialiasing, true);
+                     renderer.render(&painter);
+                    }
+
+                    QString index = "";
+                    if (photogram < 10) {
+                        index = "000";
+                    } else if (photogram < 100) {
+                               index = "00";
+                    } else {
+                        index = "0";
+                    }
+
+                    index += QString("%1").arg(photogram);
+                    image.save(fileInfo.absolutePath() + QDir::separator() + QString(m_baseName + "%1.%2").arg(index).arg(QString(extension).toLower()), extension, 100);
+
+                    photogram++;
+             }
+    }
+
+    return true;
+}
+
+bool ImagePlugin::exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size, TupLibrary *library)
+{
+    QString path = filePath;
+    const char *extension;
+    QImage::Format imageFormat;
+    QColor bgColor = color;
+    bgColor.setAlpha(255);
+
+    if (filePath.endsWith(".PNG", Qt::CaseInsensitive)) {
+        extension = "PNG";
+        imageFormat = QImage::Format_ARGB32;
+    } else if (filePath.endsWith(".JPG", Qt::CaseInsensitive) || filePath.endsWith("JPEG", Qt::CaseInsensitive)) {
+               extension = "JPG";
+               imageFormat = QImage::Format_RGB32;
+    } else {
+        extension = "PNG"; 
+        path += ".png";
+        imageFormat = QImage::Format_ARGB32;
+    }
+
+    TupAnimationRenderer renderer(bgColor, library);
+    renderer.setScene(scene, size);
+
+    renderer.renderPhotogram(frameIndex);
+    QImage image(size, imageFormat);
+    {
+        QPainter painter(&image);
+        painter.setRenderHint(QPainter::Antialiasing, true);
+        renderer.render(&painter);
+    }
+
+    return image.save(path, extension, 100);
+}
+
+const char* ImagePlugin::getExceptionMsg() {
+    return errorMsg;
+}
+
+// Q_EXPORT_PLUGIN(ImagePlugin);
+
diff -Nru tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.h tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.h
--- tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,71 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef	IMAGEPLUGIN_H
+#define IMAGEPLUGIN_H
+
+#include "tglobal.h"
+#include "tupexportpluginobject.h"
+#include "tuplayer.h"
+#include "tupanimationrenderer.h"
+
+#include <QColor>
+#include <QImage>
+#include <QPainter>
+
+/**
+    @author David Cuadrado
+*/
+class TUPI_PLUGIN ImagePlugin : public TupExportPluginObject
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "imageplugin.json")
+
+    public:
+        ImagePlugin();
+        virtual ~ImagePlugin();
+        virtual QString key() const;
+        TupExportInterface::Formats availableFormats();
+
+        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps, TupLibrary *library);
+        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size, TupLibrary *library);
+        virtual const char* getExceptionMsg();
+        const char *errorMsg;
+
+    private:
+        QString m_baseName;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.json tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.json
--- tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "ImagePlugin" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.pri tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.pri
--- tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.pri	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.pri	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,2 @@
+INCLUDEPATH += $$PLUGIN_DIR
+LIBS += -L$$PLUGIN_DIR -ltupiimageplugin
diff -Nru tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.pro tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.pro
--- tupi-0.2+git04/src/plugins/export/imageplugin/imageplugin.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/imageplugin/imageplugin.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,32 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/ 
+
+HEADERS += imageplugin.h
+SOURCES += imageplugin.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib 
+TARGET = tupiimageplugin
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+
+include($$LIBBASE_DIR/libbase.pri)
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
diff -Nru tupi-0.2+git04/src/plugins/export/libavplugin/libavplugin.cpp tupi-0.2+git05/src/plugins/export/libavplugin/libavplugin.cpp
--- tupi-0.2+git04/src/plugins/export/libavplugin/libavplugin.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/libavplugin/libavplugin.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,182 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "libavplugin.h"
+
+LibavPlugin::LibavPlugin()
+{
+}
+
+LibavPlugin::~LibavPlugin()
+{
+}
+
+QString LibavPlugin::key() const
+{
+    return tr("Video Formats");
+}
+
+TupExportInterface::Formats LibavPlugin::availableFormats()
+{
+    return TupExportInterface::WEBM | TupExportInterface::OGV | TupExportInterface::MPEG | TupExportInterface::SWF 
+           | TupExportInterface::AVI | TupExportInterface::ASF | TupExportInterface::MOV | TupExportInterface::GIF;
+}
+
+TMovieGeneratorInterface::Format LibavPlugin::videoFormat(TupExportInterface::Format format)
+{
+    switch (format) {
+            case TupExportInterface::WEBM:
+                 {
+                   return TLibavMovieGenerator::WEBM;
+                 }
+                 break;
+            case TupExportInterface::OGV:
+                 {
+                   return TLibavMovieGenerator::OGV;
+                 }
+                 break;
+            case TupExportInterface::SWF:
+                 {
+                   return TLibavMovieGenerator::SWF;
+                 }
+                 break;
+            case TupExportInterface::MPEG:
+                 {
+                   return TLibavMovieGenerator::MPEG;
+                 }
+                 break;
+            case TupExportInterface::AVI:
+                 {
+                   return TLibavMovieGenerator::AVI;
+                 }
+                 break;
+            case TupExportInterface::MOV:
+                 {
+                   return TLibavMovieGenerator::MOV;
+                 }
+                 break;
+            case TupExportInterface::ASF:
+                 {
+                   return TLibavMovieGenerator::ASF;
+                 }
+                 break;
+            case TupExportInterface::GIF:
+                 {
+                   return TLibavMovieGenerator::GIF;
+                 }
+                 break;
+            case TupExportInterface::PNG:
+            case TupExportInterface::JPEG:
+            case TupExportInterface::XPM:
+            case TupExportInterface::SMIL:
+            case TupExportInterface::NONE:
+                 {
+                   return TLibavMovieGenerator::NONE;
+                 }
+            default:
+                 {
+                   return TLibavMovieGenerator::NONE;
+                 }
+                 break;
+    }
+
+    return TLibavMovieGenerator::NONE;
+}
+
+bool LibavPlugin::exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format fmt, const QSize &size, int fps, TupLibrary *library)
+{
+    qreal duration = 0;
+    foreach (TupScene *scene, scenes)
+             duration += (qreal) scene->framesTotal() / (qreal) fps;
+
+    TLibavMovieGenerator *generator = 0;
+    TMovieGeneratorInterface::Format format = videoFormat(fmt);
+
+    if (format == TLibavMovieGenerator::NONE)
+        return false;
+
+    generator = new TLibavMovieGenerator(format, size, fps, duration);
+
+    TupAnimationRenderer renderer(color, library);
+    {
+         if (!generator->movieHeaderOk()) {
+             errorMsg = generator->getErrorMsg();
+             #ifdef K_DEBUG
+                 QString msg = "LibavPlugin::exportToFormat() - [ Fatal Error ] - Can't create video -> " + filePath;
+                 #ifdef Q_OS_WIN32
+                     qDebug() << msg;
+                 #else
+                     tError() << msg;
+                 #endif
+             #endif
+             delete generator;
+             return false;
+         }
+
+         QPainter painter(generator);
+         painter.setRenderHint(QPainter::Antialiasing, true);
+
+         foreach (TupScene *scene, scenes) {
+                  renderer.setScene(scene, size);
+
+                  while (renderer.nextPhotogram()) {
+                         renderer.render(&painter);
+                         generator->nextFrame();
+                         generator->reset();
+                  }
+         }
+    }
+
+    generator->saveMovie(filePath);
+    delete generator;
+
+    return true;
+}
+
+bool LibavPlugin::exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size, TupLibrary *library)
+{
+    Q_UNUSED(frameIndex);
+    Q_UNUSED(color);
+    Q_UNUSED(filePath);
+    Q_UNUSED(scene);
+    Q_UNUSED(size);
+    Q_UNUSED(library);
+
+    return false;
+}
+
+const char* LibavPlugin::getExceptionMsg() {
+    return errorMsg;
+}
diff -Nru tupi-0.2+git04/src/plugins/export/libavplugin/libavplugin.h tupi-0.2+git05/src/plugins/export/libavplugin/libavplugin.h
--- tupi-0.2+git04/src/plugins/export/libavplugin/libavplugin.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/libavplugin/libavplugin.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,75 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef LIBAVPLUGIN_H
+#define LIBAVPLUGIN_H
+
+#include "tglobal.h"
+#include "tupexportpluginobject.h"
+#include "tupexportinterface.h"
+#include "tmoviegeneratorinterface.h"
+#include "tlibavmoviegenerator.h"
+#include "tuplayer.h"
+#include "tupanimationrenderer.h"
+
+#include <QImage>
+#include <QPainter>
+
+/**
+ * @author David Cuadrado
+*/
+
+class TUPI_PLUGIN LibavPlugin : public TupExportPluginObject
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "libavplugin.json")
+
+    public:
+        LibavPlugin();
+        virtual ~LibavPlugin();
+        virtual QString key() const;
+        TupExportInterface::Formats availableFormats();
+
+        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps, TupLibrary *library);
+        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size, TupLibrary *library);
+
+        virtual const char* getExceptionMsg();
+        const char *errorMsg;
+
+    private:
+        TMovieGeneratorInterface::Format videoFormat(TupExportInterface::Format format);
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/export/libavplugin/libavplugin.json tupi-0.2+git05/src/plugins/export/libavplugin/libavplugin.json
--- tupi-0.2+git04/src/plugins/export/libavplugin/libavplugin.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/libavplugin/libavplugin.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "LibavPlugin" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/export/libavplugin/libavplugin.pro tupi-0.2+git05/src/plugins/export/libavplugin/libavplugin.pro
--- tupi-0.2+git04/src/plugins/export/libavplugin/libavplugin.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/libavplugin/libavplugin.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,42 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri) {
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+    include(../../../../libav.win.pri)	
+}
+
+mac {
+    LIBS += -lavutil
+}
+
+INSTALLS += target
+target.path = /plugins/
+
+HEADERS += tlibavmoviegenerator.h \
+           libavplugin.h
+
+SOURCES += tlibavmoviegenerator.cpp \
+           libavplugin.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib 
+TARGET = tupilibavplugin
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+# include(../export_config.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+
+include($$LIBBASE_DIR/libbase.pri)
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+
diff -Nru tupi-0.2+git04/src/plugins/export/libavplugin/tlibavmoviegenerator.cpp tupi-0.2+git05/src/plugins/export/libavplugin/tlibavmoviegenerator.cpp
--- tupi-0.2+git04/src/plugins/export/libavplugin/tlibavmoviegenerator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/libavplugin/tlibavmoviegenerator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,551 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#define INT64_C
+#define __STDC_CONSTANT_MACROS
+#include <stdint.h>
+
+#include "tlibavmoviegenerator.h"
+#include "talgorithm.h"
+
+#include <QDir>
+
+#ifdef __cplusplus
+extern "C" {
+#include "libavutil/mathematics.h"
+#include "libavformat/avformat.h"
+}
+#endif
+
+struct TLibavMovieGenerator::Private
+{
+    AVFrame *frame;
+
+    QString movieFile;
+    int fps;
+    double video_pts;
+    int frameCount;
+    double streamDuration;
+    bool exception;
+    const char *errorMsg;
+
+    AVStream *video_st;
+    AVFormatContext *oc;
+    AVOutputFormat *fmt;
+
+    void chooseFileExtension(int format);
+    bool openVideo(AVCodec *codec, AVStream *st);
+    void RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height);
+    bool writeVideoFrame(const QString &movieFile, const QImage &image);
+    void closeVideo(AVStream *st);
+};
+
+static AVStream *addVideoStream(AVFormatContext *oc, AVCodec **codec, enum AVCodecID codec_id, const QString &movieFile, int width, int height, int fps)
+{
+    AVCodecContext *c;
+    AVStream *st;
+    QString errorMsg = "";
+
+    /* find the encoder */
+    *codec = avcodec_find_encoder(codec_id);
+    if (!(*codec)) {
+        errorMsg = "libav error: Could not find encoder. This is not a problem directly related to Tupi. \
+                    Please, check your libav installation and codec support. More info: http://libav.org/";
+        #ifdef K_DEBUG
+            QString msg = QString("TLibavMovieGenerator::addVideoStream() - ") + errorMsg;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return 0;
+    }
+
+    st = avformat_new_stream(oc, *codec);
+    if (!st) {
+        errorMsg = "libav error: Could not alloc stream. This is not a problem directly related to Tupi. \
+                    Please, check your libav installation and codec support. More info: http://libav.org/";
+        #ifdef K_DEBUG
+            QString msg = QString("") + "TLibavMovieGenerator::addVideoStream() - " + errorMsg;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return 0;
+    }
+    st->id = oc->nb_streams-1;
+    c = st->codec;
+
+    // c->codec_type = AVMEDIA_TYPE_VIDEO;
+    c->codec_id = codec_id;
+
+    /* put sample parameters */
+    c->bit_rate = 6000000;
+
+    /* resolution must be a multiple of two */
+    c->width = width;  
+    c->height = height; 
+
+    c->time_base.den = fps;
+    c->time_base.num = 1;
+    c->gop_size = 12;
+
+    if (movieFile.endsWith("gif", Qt::CaseInsensitive)) {
+        #ifdef CANAIMA 
+            c->pix_fmt = PIX_FMT_RGB24;
+        #else
+            c->pix_fmt = AV_PIX_FMT_RGB24;
+        #endif
+    } else {
+        #ifdef CANAIMA
+            c->pix_fmt = PIX_FMT_YUV420P;
+        #else
+            c->pix_fmt = AV_PIX_FMT_YUV420P;
+        #endif
+    }
+
+    // if (c->codec_id == CODEC_ID_MPEG2VIDEO) {
+    if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+
+	/* just for testing, we also add B frames */
+	c->max_b_frames = 2;
+    }
+
+    // if (c->codec_id == CODEC_ID_MPEG1VIDEO) {
+    if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
+        /* needed to avoid using macroblocks in which some coeffs overflow
+           this doesnt happen with normal video, it just happens here as the
+           motion of the chroma plane doesnt match the luma plane */
+           c->mb_decision=2;
+    }
+
+    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+	
+    return st;
+}
+
+void TLibavMovieGenerator::Private::chooseFileExtension(int format)
+{
+    switch (format) {
+            case WEBM:
+                 movieFile += ".webm";
+                 break;
+#ifdef Q_OS_UNIX
+            case OGV:
+                 movieFile += ".ogv";
+                 break;
+#endif
+            case SWF:
+                 movieFile += ".swf";
+                 break;
+            case MPEG:
+                 movieFile += ".mpg";
+                 break;
+            case ASF:
+                 movieFile += ".asf";
+                 break;
+            case AVI:
+                 movieFile += ".avi";
+                 break;
+            case MOV:
+                 movieFile += ".mov";
+                 break;
+            case GIF:
+                 movieFile += ".gif";
+                 break;
+            default:
+                 movieFile += ".mpg";
+                 break;
+    }
+}
+
+bool TLibavMovieGenerator::Private::openVideo(AVCodec *codec, AVStream *st)
+{
+    int ret;
+    AVCodecContext *c = st->codec;
+
+    /* open the codec */
+    ret = avcodec_open2(c, codec, NULL);
+    if (ret < 0) {
+        errorMsg = "The video codec required is not installed in your system. \
+                    Please, check your libav installation and codec support. \
+                    More info: http://libav.org/";
+        #ifdef K_DEBUG
+            QString msg = QString("") + "TLibavMovieGenerator::openVideo() - " + errorMsg;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return false;
+    }
+
+    /* allocate and init a re-usable frame */
+#ifdef Q_OS_WIN32
+    frame = av_frame_alloc();
+#else
+    frame = avcodec_alloc_frame();
+#endif
+
+    if (!frame) {
+        errorMsg = "There is no available memory to export your project as a video";
+        #ifdef K_DEBUG
+            QString msg = QString("") + "TLibavMovieGenerator::openVideo() - " + errorMsg;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return false;
+    }
+	
+    return true;
+}
+
+#define RGBtoYUV(r, g, b, y, u, v) \
+  y = (uint8_t)(((int)30*r + (int)59*g + (int)11*b)/100); \
+  u = (uint8_t)(((int)-17*r - (int)33*g + (int)50*b + 12800)/100); \
+  v = (uint8_t)(((int)50*r - (int)42*g - (int)8*b + 12800)/100);
+
+void TLibavMovieGenerator::Private::RGBtoYUV420P(const uint8_t *bufferRGB, uint8_t *bufferYUV, uint iRGBIncrement, bool bSwapRGB, int width, int height)
+{
+    const unsigned iPlaneSize = width * height;
+    const unsigned iHalfWidth = width >> 1;
+
+    // get pointers to the data
+    uint8_t *yplane  = bufferYUV;
+    uint8_t *uplane  = bufferYUV + iPlaneSize;
+    uint8_t *vplane  = bufferYUV + iPlaneSize + (iPlaneSize >> 2);
+    const uint8_t *bufferRGBIndex = bufferRGB;
+
+    int iRGBIdx[3];
+    iRGBIdx[0] = 0;
+    iRGBIdx[1] = 1;
+    iRGBIdx[2] = 2;
+    if (bSwapRGB)  {
+        iRGBIdx[0] = 2;
+        iRGBIdx[2] = 0;
+    }
+ 
+    for (int y = 0; y < (int) height; y++) {
+         uint8_t *yline  = yplane + (y * width);
+         uint8_t *uline  = uplane + ((y >> 1) * iHalfWidth);
+         uint8_t *vline  = vplane + ((y >> 1) * iHalfWidth);
+
+         for (int x=0; x<width; x+=2) {
+              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
+              bufferRGBIndex += iRGBIncrement;
+              yline++;
+              RGBtoYUV(bufferRGBIndex[iRGBIdx[0]], bufferRGBIndex[iRGBIdx[1]], bufferRGBIndex[iRGBIdx[2]], *yline, *uline, *vline);
+              bufferRGBIndex += iRGBIncrement;
+              yline++;
+              uline++;
+              vline++;
+         }
+    }
+}
+
+bool TLibavMovieGenerator::Private::writeVideoFrame(const QString &movieFile, const QImage &image)
+{
+    #ifdef K_DEBUG
+        QString msg = "TLibavMovieGenerator::writeVideoFrame() - Generating frame #" + QString::number(frameCount);
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif
+
+    int ret;
+    AVCodecContext *c = video_st->codec;
+
+    /* encode the image */
+    AVPacket pkt;
+    int got_output;
+
+    av_init_packet(&pkt);
+    pkt.data = NULL;    // packet data will be allocated by the encoder
+    pkt.size = 0;
+
+    int w = c->width;
+    int h = c->height;
+
+    if (movieFile.endsWith("gif", Qt::CaseInsensitive)) {
+        // c->pix_fmt = AV_PIX_FMT_RGB24;
+        // avpicture_fill((AVPicture *)frame, image.bits(), AV_PIX_FMT_RGB24, w, h);
+    } else {
+        int size = avpicture_get_size(PIX_FMT_YUV420P, w, h);
+        uint8_t *pic_dat = (uint8_t *) av_malloc(size);
+        RGBtoYUV420P(image.bits(), pic_dat, image.depth()/8, true, w, h);
+        avpicture_fill((AVPicture *)frame, pic_dat, PIX_FMT_YUV420P, w, h);
+    }
+
+    ret = avcodec_encode_video2(c, &pkt, frame, &got_output);
+    if (ret < 0) {
+        errorMsg = "[1] Error while encoding the video of your project";
+        #ifdef K_DEBUG
+            QString msg = QString("") + "TLibavMovieGenerator::writeVideoFrame() - " + errorMsg;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return false;
+    }
+
+    /* If size is zero, it means the image was buffered. */
+    if (got_output) {
+        if (c->coded_frame->key_frame)
+            pkt.flags |= AV_PKT_FLAG_KEY;
+
+        pkt.stream_index = video_st->index;
+
+        /* Write the compressed frame to the media file. */
+        ret = av_interleaved_write_frame(oc, &pkt);
+    } else {
+        ret = 0;
+    }
+
+    if (ret != 0) {
+        errorMsg = "[2] Error while encoding the video of your project";
+        #ifdef K_DEBUG
+            QString msg = QString("") + "TLibavMovieGenerator::writeVideoFrame() - " + errorMsg;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return false;
+    }
+
+    frameCount++;
+
+    return true;
+}
+
+void TLibavMovieGenerator::Private::closeVideo(AVStream *st)
+{
+    avcodec_close(st->codec);
+    av_free(frame);
+}
+
+TLibavMovieGenerator::TLibavMovieGenerator(TMovieGeneratorInterface::Format format, int width, int height, int fps, double duration)
+ : TMovieGenerator(width, height), k(new Private)
+{
+    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
+    k->chooseFileExtension(format);
+    k->fps = fps;
+    k->streamDuration = duration;
+    k->exception = begin();
+}
+
+TLibavMovieGenerator::TLibavMovieGenerator(TMovieGeneratorInterface::Format format, const QSize &size, int fps, double duration) : TMovieGenerator(size.width(), size.height()), k(new Private)
+{
+    k->movieFile = QDir::tempPath() + QDir::separator() + "tupi_video_" + TAlgorithm::randomString(12);
+    k->chooseFileExtension(format);
+    k->fps = fps;
+    k->streamDuration = duration;
+    k->exception = begin();
+}
+
+TLibavMovieGenerator::~TLibavMovieGenerator()
+{
+    if (QFile::exists(k->movieFile)) 
+        QFile::remove(k->movieFile);
+
+    delete k;
+}
+
+bool TLibavMovieGenerator::begin()
+{
+    int ret;
+    AVCodec *video_codec = 0;
+
+    av_register_all();
+
+    k->fmt = av_guess_format(NULL, k->movieFile.toLocal8Bit().data(), NULL);
+    if (!k->fmt) {
+        k->fmt = av_guess_format("mpeg", NULL, NULL);
+    }
+
+    if (!k->fmt) {
+        k->errorMsg = "libav error: Error while doing export. This is not a problem directly related to Tupi. \
+                       Please, check your libav installation and codec support. More info: http://libav.org/";
+        return false;
+    }
+
+    k->oc = avformat_alloc_context();
+    if (!k->oc) {
+        fprintf(stderr, "Memory error\n");
+        return false;
+    }
+    k->oc->oformat = k->fmt;
+
+    if (!k->oc) {
+        k->errorMsg = "libav error: Error while doing export. This is not a problem directly related to Tupi. \
+                       Please, check your libav installation and codec support. More info: http://libav.org/";
+        #ifdef K_DEBUG
+            QString msg = QString("") + "TLibavMovieGenerator::begin() - " + k->errorMsg;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return false;
+    }
+
+    k->video_st = NULL;
+    // if (k->fmt->video_codec != CODEC_ID_NONE) 
+    if (k->fmt->video_codec != AV_CODEC_ID_NONE)
+        k->video_st = addVideoStream(k->oc, &video_codec, k->fmt->video_codec, k->movieFile, width(), height(), k->fps);	
+
+    av_dump_format(k->oc, 0, k->movieFile.toLocal8Bit().data(), 1); 
+	
+    if (k->video_st) {
+        k->openVideo(video_codec, k->video_st);
+    } else {
+        k->errorMsg = "libav error: Can't add video stream. This is not a problem directly related to Tupi. \
+                       Please, check your libav installation and codec support. More info: http://libav.org/";
+        #ifdef K_DEBUG
+            QString msg = QString("") + "TLibavMovieGenerator::begin() - " + k->errorMsg;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else 
+                tError() << msg;
+            #endif
+        #endif
+        return false;
+    }
+
+    if (!(k->fmt->flags & AVFMT_NOFILE)) {
+        ret = avio_open(&k->oc->pb, k->movieFile.toLocal8Bit().data(), AVIO_FLAG_WRITE);
+        if (ret < 0) {
+            k->errorMsg = "libav error: could not open video file";
+            #ifdef K_DEBUG
+                QString msg = QString("") + "TLibavMovieGenerator::begin() - " + k->errorMsg;
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+            return false;
+        }
+    }
+
+    avformat_write_header(k->oc, NULL);
+
+    if (k->frame)
+        k->frame->pts = 0;
+
+    k->frameCount = 0;
+
+    return true;
+}
+
+bool TLibavMovieGenerator::movieHeaderOk() 
+{ 
+    return k->exception;
+}
+
+const char* TLibavMovieGenerator::getErrorMsg() 
+{
+    return k->errorMsg;
+}
+
+void TLibavMovieGenerator::handle(const QImage& image)
+{
+    if (k->video_st) 
+        k->video_pts = (double)k->video_st->pts.val * k->video_st->time_base.num / k->video_st->time_base.den;
+    else 
+        k->video_pts = 0.0;
+
+    if (!k->video_st || k->video_pts >= k->streamDuration) {
+        #ifdef K_DEBUG
+            QString msg = "TLibavMovieGenerator::handle() - The total of frames has been processed (" + QString::number(k->streamDuration) + " seg)";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
+        #endif
+        return;
+    }
+
+    #ifdef K_DEBUG
+        QString msg1 = "TLibavMovieGenerator::handle() - Duration: " + QString::number(k->streamDuration); 
+        QString msg2 = "TLibavMovieGenerator::handle() - Video PTS: " + QString::number(k->video_pts);
+        #ifdef Q_OS_WIN32
+            qWarning() << msg1;
+            qWarning() << msg2;
+        #else
+            tWarning() << msg1;
+            tWarning() << msg2;
+        #endif
+    #endif
+
+    k->writeVideoFrame(k->movieFile, image);
+    k->frame->pts += av_rescale_q(1, k->video_st->codec->time_base, k->video_st->time_base);
+}
+
+void TLibavMovieGenerator::end()
+{
+    av_write_trailer(k->oc);
+
+    if (k->video_st)
+        k->closeVideo(k->video_st);
+
+    if (!(k->fmt->flags & AVFMT_NOFILE))
+        avio_close(k->oc->pb);
+
+    avformat_free_context(k->oc);
+}
+
+void TLibavMovieGenerator::__saveMovie(const QString &fileName)
+{
+    if (QFile::exists(fileName)) 
+        QFile::remove(fileName);
+
+    QFile::copy(k->movieFile, fileName);
+}
diff -Nru tupi-0.2+git04/src/plugins/export/libavplugin/tlibavmoviegenerator.h tupi-0.2+git05/src/plugins/export/libavplugin/tlibavmoviegenerator.h
--- tupi-0.2+git04/src/plugins/export/libavplugin/tlibavmoviegenerator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/libavplugin/tlibavmoviegenerator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,66 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TLIBAVMOVIEGENERATOR_H
+#define TLIBAVMOVIEGENERATOR_H
+
+#include "tglobal.h"
+#include "tmoviegenerator.h"
+
+/**
+    @author David Cuadrado
+*/
+
+class TUPI_PLUGIN TLibavMovieGenerator : public TMovieGenerator
+{
+    public:
+        TLibavMovieGenerator(TMovieGeneratorInterface::Format format, int width, int height, int fps = 24, double duration = 0);
+        TLibavMovieGenerator(TMovieGeneratorInterface::Format format, const QSize &size, int fps = 24, double duration = 0);
+        ~TLibavMovieGenerator();
+        virtual bool movieHeaderOk();
+        virtual const char* getErrorMsg();
+
+    protected:
+        void __saveMovie(const QString &fileName);
+        virtual void handle(const QImage &image);
+        virtual bool begin();
+        virtual void end();
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/export/smileplugin/smileplugin.cpp tupi-0.2+git05/src/plugins/export/smileplugin/smileplugin.cpp
--- tupi-0.2+git04/src/plugins/export/smileplugin/smileplugin.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/smileplugin/smileplugin.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,148 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "smileplugin.h"
+
+SmilePlugin::SmilePlugin()
+{
+}
+
+SmilePlugin::~SmilePlugin()
+{
+}
+
+QString SmilePlugin::key() const
+{
+    return "SMIL 2.0";
+}
+
+TupExportInterface::Formats SmilePlugin::availableFormats()
+{
+    return TupExportInterface::SMIL;
+}
+
+bool SmilePlugin::exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps)
+{
+    QFileInfo fileInfo(filePath);
+
+    QDir dir = fileInfo.dir();
+    if (!dir.exists())
+        dir.mkdir(dir.path());
+
+    m_baseName = fileInfo.baseName();
+    dir.mkdir("data");
+    initSmil();
+
+    m_smil.documentElement().appendChild(m_body);
+
+    QFile save(filePath);
+    if (save.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        QTextStream out(&save);
+        out << m_smil.toString();
+    }
+
+    return true;
+}
+
+bool SmilePlugin::exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size)
+{
+    return false;
+}
+
+void SmilePlugin::initSmil()
+{
+    m_smil = QDomDocument("smil PUBLIC \"-//W3C//DTD SMIL 2.0//EN\" \"http://www.w3.org/2001/SMIL20/SMIL20.dtd\"");
+
+    QDomElement root = m_smil.createElement("smil");
+    root.setAttribute("xmlns", "http://www.w3.org/2001/SMIL20/Language");
+
+    QDomElement head = m_smil.createElement("head");
+
+    QDomElement generator = m_smil.createElement("meta");
+    generator.setAttribute("name", "generator");
+    generator.setAttribute("content", "Tupi" );
+
+    head.appendChild(generator);
+
+    QDomElement layout = m_smil.createElement("layout");
+
+    QDomElement rootLayout = m_smil.createElement("root-layout");
+    rootLayout.setAttribute("id", "MainLayout");
+    rootLayout.setAttribute("backgroundColor", "black");
+    rootLayout.setAttribute("width", m_size.width());
+    rootLayout.setAttribute("height", m_size.height());
+
+    layout.appendChild(rootLayout);
+	
+    QDomElement region = m_smil.createElement("region");
+    region.setAttribute("id", "Animation");
+    region.setAttribute("left", 0);
+    region.setAttribute("top", 0);
+    region.setAttribute("width", m_size.width());
+    region.setAttribute("height", m_size.height());
+    region.setAttribute("z-index", 1);
+    region.setAttribute("fit", "meet");
+
+    layout.appendChild(region);
+    head.appendChild(layout);
+    root.appendChild(head);
+
+    m_body = m_smil.createElement("body");
+    m_smil.appendChild(root);
+}
+
+void SmilePlugin::createPar(const QString &filePath, double duration)
+{
+    QFileInfo finfo(filePath);
+    QString relative = "data/"+finfo.baseName()+"."+finfo.completeSuffix();
+    QDomElement par = m_smil.createElement("par");
+
+    QDomElement img = m_smil.createElement("img");
+    img.setAttribute("id", finfo.baseName());
+    img.setAttribute("region", "Animation");
+    img.setAttribute("dur", QString("%1s").arg(duration));
+    img.setAttribute("fill", "transition");
+    img.setAttribute("src", relative);
+
+    par.appendChild(img);
+
+    m_body.appendChild(par);
+}
+
+const char* SmilePlugin::getExceptionMsg() {
+    return errorMsg;
+}
+
+// Q_EXPORT_PLUGIN( SmilePlugin );
diff -Nru tupi-0.2+git04/src/plugins/export/smileplugin/smileplugin.h tupi-0.2+git05/src/plugins/export/smileplugin/smileplugin.h
--- tupi-0.2+git04/src/plugins/export/smileplugin/smileplugin.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/smileplugin/smileplugin.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,81 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SMILEPLUGIN_H
+#define SMILEPLUGIN_H
+
+#include "tglobal.h"
+
+#include "tupexportpluginobject.h"
+#include "tuplayer.h"
+
+#include <QDomDocument>
+#include <QDomElement>
+#include <QColor>
+
+/**
+ * @author David Cuadrado
+*/
+
+class TUPI_EXPORT SmilePlugin : public TupExportPluginObject
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "smileplugin.json")
+
+    public:
+        SmilePlugin();
+        virtual ~SmilePlugin();
+        virtual QString key() const;
+        TupExportInterface::Formats availableFormats();
+
+        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps);
+        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size);
+        virtual const char* getExceptionMsg();
+        const char *errorMsg;
+
+    private:
+        QStringList createImages(const QList<TupScene *> &scenes, const QDir &dir,float sx = 1, float sy = 1, const char *format = "PNG");
+        void initSmil();
+        void createPar(const QString &filePath, double duration);
+
+    private:
+        QString m_baseName;
+        QDomDocument m_smil;
+        QDomElement m_body;
+        int m_fps;
+        QSize m_size;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/export/smileplugin/smileplugin.json tupi-0.2+git05/src/plugins/export/smileplugin/smileplugin.json
--- tupi-0.2+git04/src/plugins/export/smileplugin/smileplugin.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/smileplugin/smileplugin.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "SmilePlugin" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/export/smileplugin/smileplugin.pro tupi-0.2+git05/src/plugins/export/smileplugin/smileplugin.pro
--- tupi-0.2+git04/src/plugins/export/smileplugin/smileplugin.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/smileplugin/smileplugin.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,36 @@
+INSTALLS += target 
+target.path = /plugins/ 
+
+macx {
+    CONFIG += plugin
+
+    INSTALLS += otool
+    otool.path = /lib/
+    otool.extra  += ../../../../tools/update_dylib_path.rb $(INSTALL_ROOT)/lib/$(TARGET) '^/lib' '$(INSTALL_ROOT)/lib'
+}
+
+HEADERS += smileplugin.h
+SOURCES += smileplugin.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib 
+TARGET = tupismileplugin
+
+INCLUDEPATH += ../../../libbase
+INCLUDEPATH += ../../../store
+INCLUDEPATH += ../../../libtupi
+LIBS += -L../../../libbase
+LIBS += -L../../../store
+LIBS += -L../../../libtupi
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+include(../export_config.pri)
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
diff -Nru tupi-0.2+git04/src/plugins/export/smilexportplugin/smilexportplugin.cpp tupi-0.2+git05/src/plugins/export/smilexportplugin/smilexportplugin.cpp
--- tupi-0.2+git04/src/plugins/export/smilexportplugin/smilexportplugin.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/smilexportplugin/smilexportplugin.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QImage>
-#include <QPainter>
-
-#include "smilexportplugin.h"
-#include "tuplayer.h"
-
-SmilExportPlugin::SmilExportPlugin()
-{
-}
-
-SmilExportPlugin::~SmilExportPlugin()
-{
-}
-
-QString SmilExportPlugin::key() const
-{
-    return "SMIL 2.0";
-}
-
-TupExportInterface::Formats SmilExportPlugin::availableFormats()
-{
-    return TupExportInterface::SMIL;
-}
-
-bool SmilExportPlugin::exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps)
-{
-    QFileInfo fileInfo(filePath);
-
-    QDir dir = fileInfo.dir();
-    if (!dir.exists())
-        dir.mkdir(dir.path());
-
-    m_baseName = fileInfo.baseName();
-    dir.mkdir("data");
-    initSmil();
-
-    m_smil.documentElement().appendChild(m_body);
-
-    QFile save(filePath);
-    if (save.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        QTextStream out(&save);
-        out << m_smil.toString();
-    }
-
-    return true;
-}
-
-bool SmilExportPlugin::exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size)
-{
-    return false;
-}
-
-void SmilExportPlugin::initSmil()
-{
-    m_smil = QDomDocument("smil PUBLIC \"-//W3C//DTD SMIL 2.0//EN\" \"http://www.w3.org/2001/SMIL20/SMIL20.dtd\"");
-
-    QDomElement root = m_smil.createElement("smil");
-    root.setAttribute("xmlns", "http://www.w3.org/2001/SMIL20/Language");
-
-    QDomElement head = m_smil.createElement("head");
-
-    QDomElement generator = m_smil.createElement("meta");
-    generator.setAttribute("name", "generator");
-    generator.setAttribute("content", "Tupi" );
-
-    head.appendChild(generator);
-
-    QDomElement layout = m_smil.createElement("layout");
-
-    QDomElement rootLayout = m_smil.createElement("root-layout");
-    rootLayout.setAttribute("id", "MainLayout");
-    rootLayout.setAttribute("backgroundColor", "black");
-    rootLayout.setAttribute("width", m_size.width());
-    rootLayout.setAttribute("height", m_size.height());
-
-    layout.appendChild(rootLayout);
-	
-    QDomElement region = m_smil.createElement("region");
-    region.setAttribute("id", "Animation");
-    region.setAttribute("left", 0);
-    region.setAttribute("top", 0);
-    region.setAttribute("width", m_size.width());
-    region.setAttribute("height", m_size.height());
-    region.setAttribute("z-index", 1);
-    region.setAttribute("fit", "meet");
-
-    layout.appendChild(region);
-    head.appendChild(layout);
-    root.appendChild(head);
-
-    m_body = m_smil.createElement("body");
-    m_smil.appendChild(root);
-}
-
-void SmilExportPlugin::createPar(const QString &filePath, double duration)
-{
-    QFileInfo finfo(filePath);
-    QString relative = "data/"+finfo.baseName()+"."+finfo.completeSuffix();
-    QDomElement par = m_smil.createElement("par");
-
-    QDomElement img = m_smil.createElement("img");
-    img.setAttribute("id", finfo.baseName());
-    img.setAttribute("region", "Animation");
-    img.setAttribute("dur", QString("%1s").arg(duration));
-    img.setAttribute("fill", "transition");
-    img.setAttribute("src", relative);
-
-    par.appendChild(img);
-
-    m_body.appendChild(par);
-}
-
-const char* SmilExportPlugin::getExceptionMsg() {
-    return errorMsg;
-}
-
-Q_EXPORT_PLUGIN( SmilExportPlugin );
-
diff -Nru tupi-0.2+git04/src/plugins/export/smilexportplugin/smilexportplugin.h tupi-0.2+git05/src/plugins/export/smilexportplugin/smilexportplugin.h
--- tupi-0.2+git04/src/plugins/export/smilexportplugin/smilexportplugin.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/smilexportplugin/smilexportplugin.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SMILEXPORTPLUGIN_H
-#define SMILEXPORTPLUGIN_H
-
-#include "tupexportpluginobject.h"
-
-#include <QDomDocument>
-#include <QDomElement>
-#include <QColor>
-
-/**
- * @author David Cuadrado
-*/
-
-class SmilExportPlugin : public TupExportPluginObject
-{
-    Q_OBJECT
-
-    public:
-        SmilExportPlugin();
-        virtual ~SmilExportPlugin();
-        virtual QString key() const;
-        TupExportInterface::Formats availableFormats();
-
-        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps);
-        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size);
-        virtual const char* getExceptionMsg();
-        const char *errorMsg;
-
-    private:
-        QStringList createImages(const QList<TupScene *> &scenes, const QDir &dir,float sx = 1, float sy = 1, const char *format = "PNG");
-        void initSmil();
-        void createPar(const QString &filePath, double duration);
-
-    private:
-        QString m_baseName;
-
-        QDomDocument m_smil;
-        QDomElement m_body;
-
-        int m_fps;
-        QSize m_size;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/export/smilexportplugin/smilexportplugin.pro tupi-0.2+git05/src/plugins/export/smilexportplugin/smilexportplugin.pro
--- tupi-0.2+git04/src/plugins/export/smilexportplugin/smilexportplugin.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/smilexportplugin/smilexportplugin.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/export/smilexportplugin
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/ 
-
-macx {
-    CONFIG += plugin
-
-    INSTALLS += otool
-    otool.path = /lib/
-    otool.extra  += ../../../../tools/update_dylib_path.rb $(INSTALL_ROOT)/lib/$(TARGET) '^/lib' '$(INSTALL_ROOT)/lib'
-}
-
-HEADERS += smilexportplugin.h
-SOURCES += smilexportplugin.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib 
-TARGET = tupismilexportplugin
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-
-include(../export_config.pri)
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/export/theoraplugin/theoramoviegenerator.cpp tupi-0.2+git05/src/plugins/export/theoraplugin/theoramoviegenerator.cpp
--- tupi-0.2+git04/src/plugins/export/theoraplugin/theoramoviegenerator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/theoraplugin/theoramoviegenerator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,21 +34,6 @@
  ***************************************************************************/
 
 #include "theoramoviegenerator.h"
-#include "tdebug.h"
-#include "talgorithm.h"
-
-#ifdef __cplusplus
-extern "C" {
-#include <stdint.h>
-#include <ogg/ogg.h>
-#include <theora/codec.h>
-#include <theora/theoraenc.h>
-}
-#endif
-
-#include <QDir>
-#include <QFile>
-#include <QByteArray>
 
 struct TheoraMovieGenerator::Private
 {
@@ -100,13 +85,28 @@
 
     k->ogg_fp = fopen(file, "wb");
     if (!k->ogg_fp) {
-        tError() << "TheoraMovieGenerator::begin() - Error: couldn't open video file";
+        #ifdef K_DEBUG
+            QString msg = "TheoraMovieGenerator::begin() - Error: couldn't open video file";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+
         return false;
     }
 
     srand(time(NULL));
     if (ogg_stream_init(&k->ogg_os, rand())) {
-        tError() << "TheoraMovieGenerator::begin() - Error: couldn't create ogg stream state";
+        #ifdef K_DEBUG
+            QString msg = "TheoraMovieGenerator::begin() - Error: couldn't create ogg stream state";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
         return false;
     }
 
@@ -136,13 +136,28 @@
     int ret = th_encode_ctl(k->td, TH_ENCCTL_SET_KEYFRAME_FREQUENCY_FORCE, &keyframe_frequency, sizeof(keyframe_frequency - 1));
 
     if (ret < 0) {
-        tError() << "TheoraMovieGenerator::begin() - Error: could not set keyframe interval to " << (int)keyframe_frequency;
+        #ifdef K_DEBUG
+            QString msg = "TheoraMovieGenerator::begin() - Error: could not set keyframe interval to " + QString::number((int)keyframe_frequency);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
     }
 
     int arg = TH_RATECTL_CAP_UNDERFLOW;
     ret = th_encode_ctl(k->td, TH_ENCCTL_SET_RATE_FLAGS, &arg, sizeof(arg));
-    if (ret < 0)
-        tError() << "TheoraMovieGenerator::begin() - Error: could not set encoder flags for soft encoding";
+    if (ret < 0) {
+        #ifdef K_DEBUG
+            QString msg = "TheoraMovieGenerator::begin() - Error: could not set encoder flags for soft encoding";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+    }
 
     if (buf_delay < 0) {
         if (((int) keyframe_frequency*7>>1) > 5*k->fps/1)
@@ -151,21 +166,43 @@
             arg = 5*k->fps;
 
         ret = th_encode_ctl(k->td, TH_ENCCTL_SET_RATE_BUFFER, &arg, sizeof(arg));
-        if (ret < 0)
-            tError() << "TheoraMovieGenerator::begin() - Error: Could not set rate control buffer for soft encoding";
+        if (ret < 0) {
+            #ifdef K_DEBUG
+                QString msg = "TheoraMovieGenerator::begin() - Error: Could not set rate control buffer for soft encoding";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+        }
     }
 
     if (buf_delay >= 0) {
         ret = th_encode_ctl(k->td, TH_ENCCTL_SET_RATE_BUFFER, &buf_delay, sizeof(buf_delay));
         if (ret < 0) {
-            tError() << "TheoraMovieGenerator::begin() - Error: could not set desired buffer delay";
+            #ifdef K_DEBUG
+                QString msg = "TheoraMovieGenerator::begin() - Error: could not set desired buffer delay";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
         }
     }
 
     th_comment_init(&k->tc);
 
     if (th_encode_flushheader(k->td, &k->tc, &k->op) <= 0){
-        tError() << "TheoraMovieGenerator::begin() - Error: internal Theora library error";
+        #ifdef K_DEBUG
+            QString msg = "TheoraMovieGenerator::begin() - Error: internal Theora library error";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
         return false;
     }
 
@@ -173,7 +210,14 @@
 
     ogg_stream_packetin(&k->ogg_os, &k->op);
     if (ogg_stream_pageout(&k->ogg_os, &k->og) != 1) {
-        tError() << "TheoraMovieGenerator::begin() - Error: internal Ogg library error";
+        #ifdef K_DEBUG
+            QString msg = "TheoraMovieGenerator::begin() - Error: internal Ogg library error";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
         return false;
     }
     fwrite(k->og.header, 1, k->og.header_len, k->ogg_fp);
@@ -182,7 +226,14 @@
     for(;;) {
         ret = th_encode_flushheader(k->td, &k->tc, &k->op);
         if (ret < 0) {
-            tError() << "TheoraMovieGenerator::begin() - Error: internal Theora library error";
+            #ifdef K_DEBUG
+                QString msg = "TheoraMovieGenerator::begin() - Error: internal Theora library error";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
             return false;
         } else if (!ret)
                    break;
@@ -193,7 +244,14 @@
     for(;;) {
         int result = ogg_stream_flush(&k->ogg_os, &k->og);
         if (result < 0) {
-            tError() << "TheoraMovieGenerator::begin() - Error: internal Ogg library error";
+            #ifdef K_DEBUG
+                QString msg = "TheoraMovieGenerator::begin() - Error: internal Ogg library error";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
             return false;
         }
         if (result == 0)
@@ -280,12 +338,26 @@
     }
 
     if (th_encode_ycbcr_in(k->td, ycbcr)) {
-        tError() << "TheoraMovieGenerator::theoraWriteFrame() - Error: could not encode frame";
+        #ifdef K_DEBUG
+            QString msg = "TheoraMovieGenerator::theoraWriteFrame() - Error: could not encode frame";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
         return;
     }
 
     if (!th_encode_packetout(k->td, last, &op)) {
-        tError() << "TheoraMovieGenerator::theoraWriteFrame() - Error: could not read packets";
+        #ifdef K_DEBUG
+            QString msg = "TheoraMovieGenerator::theoraWriteFrame() - Error: could not read packets";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
         return;
     }
 
@@ -337,7 +409,12 @@
     }
 
     #ifdef K_DEBUG
-           tWarning() << "TheoraMovieGenerator::handle() -  Writing theora frame #" + QString::number(k->framesCounter);
+        QString msg = "TheoraMovieGenerator::handle() -  Writing theora frame #" + QString::number(k->framesCounter);
+        #ifdef Q_OS_WIN32
+            tWarning() << msg;
+        #else
+            qWarning() << msg;
+        #endif
     #endif
 
     int last = 0;
diff -Nru tupi-0.2+git04/src/plugins/export/theoraplugin/theoramoviegenerator.h tupi-0.2+git05/src/plugins/export/theoraplugin/theoramoviegenerator.h
--- tupi-0.2+git04/src/plugins/export/theoraplugin/theoramoviegenerator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/theoraplugin/theoramoviegenerator.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,13 +36,28 @@
 #ifndef THEORAMOVIEGENERATOR_H
 #define THEORAMOVIEGENERATOR_H
 
+#include "tglobal.h"
 #include "tmoviegenerator.h"
+#include "talgorithm.h"
+
+#ifdef __cplusplus
+extern "C" {
+#include <stdint.h>
+#include <ogg/ogg.h>
+#include <theora/codec.h>
+#include <theora/theoraenc.h>
+}
+#endif
+
+#include <QDir>
+#include <QFile>
+#include <QByteArray>
 
 /**
     @author Gustav Gonzalez 
 */
 
-class TheoraMovieGenerator : public TMovieGenerator
+class TUPI_EXPORT TheoraMovieGenerator : public TMovieGenerator
 {
     public:
         TheoraMovieGenerator(const QSize &size, int fps = 24, double duration = 0, int frames = 0);
diff -Nru tupi-0.2+git04/src/plugins/export/theoraplugin/theoraplugin.cpp tupi-0.2+git05/src/plugins/export/theoraplugin/theoraplugin.cpp
--- tupi-0.2+git04/src/plugins/export/theoraplugin/theoraplugin.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/theoraplugin/theoraplugin.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -36,8 +36,6 @@
 #include "theoraplugin.h"
 
 // Tupi Framework
-#include "tdebug.h"
-#include "tglobal.h"
 #include "theoramoviegenerator.h"
 
 #include "tuplayer.h"
@@ -64,7 +62,8 @@
     return TupExportInterface::OGV;
 }
 
-bool TheoraPlugin::exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format fmt, const QSize &size, int fps)
+bool TheoraPlugin::exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, 
+                                  TupExportInterface::Format fmt, const QSize &size, int fps, TupLibrary *library)
 {
     Q_UNUSED(fmt);
 
@@ -78,13 +77,19 @@
     TheoraMovieGenerator *generator = 0;
     generator = new TheoraMovieGenerator(size, fps, duration, frames);
 
-    TupAnimationRenderer renderer(color);
+    TupAnimationRenderer renderer(color, library);
     {
          if (!generator->movieHeaderOk()) {
              errorMsg = generator->getErrorMsg();
              #ifdef K_DEBUG
-                    tError() << "FFMpegPlugin::exportToFormat() - [ Fatal Error ] - Can't create video -> " << filePath;
+                    QString msg = "FFMpegPlugin::exportToFormat() - [ Fatal Error ] - Can't create video -> " + filePath;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
              #endif
+
              delete generator;
              return false;
          }
@@ -109,13 +114,14 @@
     return true;
 }
 
-bool TheoraPlugin::exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size)
+bool TheoraPlugin::exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size, TupLibrary *library)
 {
     Q_UNUSED(frameIndex);
     Q_UNUSED(color);
     Q_UNUSED(filePath);
     Q_UNUSED(scene);
     Q_UNUSED(size);
+    Q_UNUSED(library);
 
     return false;
 }
@@ -123,7 +129,3 @@
 const char* TheoraPlugin::getExceptionMsg() {
     return errorMsg;
 }
-
-#ifdef HAVE_THEORA
-       Q_EXPORT_PLUGIN( TheoraPlugin );
-#endif
diff -Nru tupi-0.2+git04/src/plugins/export/theoraplugin/theoraplugin.h tupi-0.2+git05/src/plugins/export/theoraplugin/theoraplugin.h
--- tupi-0.2+git04/src/plugins/export/theoraplugin/theoraplugin.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/theoraplugin/theoraplugin.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,6 +36,7 @@
 #ifndef THEORAPLUGIN_H
 #define THEORAPLUGIN_H
 
+#include "tglobal.h"
 #include "tupexportpluginobject.h"
 #include "tupexportinterface.h"
 #include "tmoviegeneratorinterface.h"
@@ -47,6 +48,7 @@
 class TheoraPlugin : public TupExportPluginObject
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "theoraplugin.json")
 
     public:
         TheoraPlugin();
@@ -54,8 +56,8 @@
         virtual QString key() const;
         TupExportInterface::Formats availableFormats();
 
-        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps);
-        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size);
+        virtual bool exportToFormat(const QColor color, const QString &filePath, const QList<TupScene *> &scenes, TupExportInterface::Format format, const QSize &size, int fps, TupLibrary *library);
+        virtual bool exportFrame(int frameIndex, const QColor color, const QString &filePath, TupScene *scene, const QSize &size, TupLibrary *library);
 
         virtual const char* getExceptionMsg();
         const char *errorMsg;
diff -Nru tupi-0.2+git04/src/plugins/export/theoraplugin/theoraplugin.pro tupi-0.2+git05/src/plugins/export/theoraplugin/theoraplugin.pro
--- tupi-0.2+git04/src/plugins/export/theoraplugin/theoraplugin.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/export/theoraplugin/theoraplugin.pro	2014-12-15 14:21:33.000000000 +0000
@@ -13,10 +13,23 @@
 
 LIBS += -ltheora -ltheoraenc -ltheoradec -logg
 
+INCLUDEPATH += ../../../libbase
+INCLUDEPATH += ../../../store
+INCLUDEPATH += ../../../libtupi
+LIBS += -L../../../libbase -ltupibase
+LIBS += -L../../../store -ltupistore 
+LIBS += -L../../../libtupi -ltupi
+
 FRAMEWORK_DIR = "../../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(../export_config.pri)
+# include(../export_config.pri)
+
+unix {
+    !include(../../../../tupiglobal.pri) {
+        error("Please run configure first")
+    }
+}
 
-!include(../../../../tupiglobal.pri){
-    error("Please run configure first")
+win32 {
+    include(../../../../win.pri)
 }
diff -Nru tupi-0.2+git04/src/plugins/filters/filters.pro tupi-0.2+git05/src/plugins/filters/filters.pro
--- tupi-0.2+git04/src/plugins/filters/filters.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/filters/filters.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,7 +1,2 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/filters
-# Target is a subdirs project 
-
 CONFIG += ordered warn_on 
 TEMPLATE = subdirs 
diff -Nru tupi-0.2+git04/src/plugins/import/import.pro tupi-0.2+git05/src/plugins/import/import.pro
--- tupi-0.2+git04/src/plugins/import/import.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/import/import.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,7 +1,2 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/import
-# Target is a subdirs project 
-
 CONFIG += ordered warn_on 
 TEMPLATE = subdirs 
diff -Nru tupi-0.2+git04/src/plugins/plugins.pro tupi-0.2+git05/src/plugins/plugins.pro
--- tupi-0.2+git04/src/plugins/plugins.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/plugins.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,8 +1,3 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins
-# Target is a subdirs project 
-
 SUBDIRS += tools \
            export \
            filters \
diff -Nru tupi-0.2+git04/src/plugins/tools/color/coloringtool.json tupi-0.2+git05/src/plugins/tools/color/coloringtool.json
--- tupi-0.2+git04/src/plugins/tools/color/coloringtool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/color/coloringtool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "ColoringTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/color/color.pro tupi-0.2+git05/src/plugins/tools/color/color.pro
--- tupi-0.2+git04/src/plugins/tools/color/color.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/color/color.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,39 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += tweener.h \
+           configurator.h \
+           settings.h
+
+SOURCES += tweener.cpp \
+           configurator.cpp \
+           settings.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupicoloringtool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/color/configurator.cpp tupi-0.2+git05/src/plugins/tools/color/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/color/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/color/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,311 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+
+struct Configurator::Private
+{
+    QBoxLayout *layout;
+    QBoxLayout *settingsLayout;
+    Settings *settingsPanel;
+    TweenManager *tweenManager;
+    ButtonsPanel *controlPanel;
+
+    TupItemTweener *currentTween;
+
+    int framesTotal;
+    int currentFrame;
+
+    TupToolPlugin::Mode mode;
+    Configurator::GuiState state;
+};
+
+Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
+{
+    k->framesTotal = 1;
+    k->currentFrame = 0;
+
+    k->mode = TupToolPlugin::View;
+    k->state = Configurator::Manager;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    QLabel *title = new QLabel(tr("Coloring Tween"));
+    title->setAlignment(Qt::AlignHCenter);
+    title->setFont(QFont("Arial", 8, QFont::Bold));
+
+    k->layout->addWidget(title);
+
+    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    k->settingsLayout->setMargin(0);
+    k->settingsLayout->setSpacing(0);
+
+    setTweenManagerPanel();
+    setButtonsPanel();
+    setPropertiesPanel();
+
+    k->layout->addLayout(k->settingsLayout);
+    k->layout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    delete k;
+}
+
+void Configurator::loadTweenList(QList<QString> tweenList)
+{
+    k->tweenManager->loadTweenList(tweenList);
+    if (tweenList.count() > 0)
+        activeButtonsPanel(true);
+}
+
+void Configurator::setPropertiesPanel()
+{
+    k->settingsPanel = new Settings(this);
+
+    connect(k->settingsPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int)));
+    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
+    connect(k->settingsPanel, SIGNAL(clickedDefineProperties()), this, SIGNAL(clickedDefineProperties()));
+    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
+    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
+
+    k->settingsLayout->addWidget(k->settingsPanel);
+
+    activePropertiesPanel(false);
+}
+
+void Configurator::activePropertiesPanel(bool enable)
+{
+    if (enable)
+        k->settingsPanel->show();
+    else
+        k->settingsPanel->hide();
+}
+
+void Configurator::setCurrentTween(TupItemTweener *currentTween)
+{
+    k->currentTween = currentTween;
+}
+
+void Configurator::setTweenManagerPanel()
+{
+    k->tweenManager = new TweenManager(this);
+    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
+    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
+
+    k->settingsLayout->addWidget(k->tweenManager);
+    k->state = Configurator::Manager;
+}
+
+void Configurator::activeTweenManagerPanel(bool enable)
+{
+    if (enable)
+        k->tweenManager->show();
+    else
+        k->tweenManager->hide();
+
+    if (k->tweenManager->listSize() > 0)
+        activeButtonsPanel(enable);
+}
+
+void Configurator::setButtonsPanel()
+{
+    k->controlPanel = new ButtonsPanel(this);
+    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
+    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
+
+    k->settingsLayout->addWidget(k->controlPanel);
+
+    activeButtonsPanel(false);
+}
+
+void Configurator::activeButtonsPanel(bool enable)
+{
+    if (enable)
+        k->controlPanel->show();
+    else
+        k->controlPanel->hide();
+}
+
+void Configurator::initStartCombo(int framesTotal, int currentFrame)
+{
+    k->framesTotal = framesTotal;
+    k->currentFrame = currentFrame;
+    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
+}
+
+void Configurator::setStartFrame(int currentIndex)
+{
+    k->currentFrame = currentIndex;
+    k->settingsPanel->setStartFrame(currentIndex);
+}
+
+int Configurator::startFrame()
+{
+    return k->settingsPanel->startFrame();
+}
+
+int Configurator::startComboSize()
+{
+    return k->settingsPanel->startComboSize();
+}
+
+QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame)
+{
+    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame);
+}
+
+int Configurator::totalSteps()
+{
+    return k->settingsPanel->totalSteps();
+}
+
+void Configurator::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->settingsPanel->activateMode(mode);
+}
+
+void Configurator::addTween(const QString &name)
+{
+    activeTweenManagerPanel(false);
+
+    k->mode = TupToolPlugin::Add;
+    k->state = Configurator::Properties;
+
+    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
+    activePropertiesPanel(true);
+
+    emit setMode(k->mode);
+}
+
+void Configurator::editTween()
+{
+    activeTweenManagerPanel(false);
+
+    k->mode = TupToolPlugin::Edit;
+    k->state = Configurator::Properties;
+
+    k->settingsPanel->notifySelection(true);
+    k->settingsPanel->setParameters(k->currentTween);
+    activePropertiesPanel(true);
+
+    emit setMode(k->mode);
+}
+
+void Configurator::removeTween()
+{
+    QString name = k->tweenManager->currentTweenName();
+    k->tweenManager->removeItemFromList();
+
+    removeTween(name);
+}
+
+void Configurator::removeTween(const QString &name)
+{
+    if (k->tweenManager->listSize() == 0)
+        activeButtonsPanel(false);
+
+    emit clickedRemoveTween(name);
+}
+
+QString Configurator::currentTweenName() const
+{
+    QString oldName = k->tweenManager->currentTweenName();
+    QString newName = k->settingsPanel->currentTweenName();
+
+    if (oldName.compare(newName) != 0)
+        k->tweenManager->updateTweenName(newName);
+
+    return newName;
+}
+
+void Configurator::notifySelection(bool flag)
+{
+    k->settingsPanel->notifySelection(flag);
+}
+
+void Configurator::setInitialColor(QColor color)
+{
+    k->settingsPanel->setInitialColor(color);
+}
+
+void Configurator::closeTweenProperties()
+{
+    if (k->mode == TupToolPlugin::Add)
+        k->tweenManager->removeItemFromList();
+
+    emit clickedResetInterface();
+
+    closeSettingsPanel();
+}
+
+void Configurator::closeSettingsPanel()
+{
+    if (k->state == Configurator::Properties) {
+        activeTweenManagerPanel(true);
+        activePropertiesPanel(false);
+        k->mode = TupToolPlugin::View;
+        k->state = Configurator::Manager;
+    }
+}
+
+TupToolPlugin::Mode Configurator::mode()
+{
+    return k->mode;
+}
+
+void Configurator::applyItem()
+{
+     k->mode = TupToolPlugin::Edit;
+     emit clickedApplyTween();
+}
+
+void Configurator::resetUI()
+{
+    k->tweenManager->resetUI();
+    closeSettingsPanel();
+    k->settingsPanel->notifySelection(false);
+}
+
+void Configurator::updateTweenData(const QString &name)
+{
+    emit getTweenData(name);
+}
+
diff -Nru tupi-0.2+git04/src/plugins/tools/color/configurator.h tupi-0.2+git05/src/plugins/tools/color/configurator.h
--- tupi-0.2+git04/src/plugins/tools/color/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/color/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,118 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "tglobal.h"
+#include "settings.h"
+#include "tweenmanager.h"
+#include "buttonspanel.h"
+#include "tupitemtweener.h"
+#include "tosd.h"
+
+#include <QFrame>
+#include <QLabel>
+#include <QBoxLayout>
+
+class QGraphicsPathItem;
+class QListWidgetItem;
+// class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Configurator : public QFrame
+{
+    Q_OBJECT
+
+    public:
+        enum GuiState { Manager = 1, Properties };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+
+        void loadTweenList(QList<QString> tweenList);
+
+        void initStartCombo(int framesTotal, int currentFrame);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+
+        int totalSteps();
+        void activateMode(TupToolPlugin::EditMode mode);
+        void setCurrentTween(TupItemTweener *currentTween);
+        QString currentTweenName() const;
+        void notifySelection(bool flag);
+        int startComboSize();
+        void setInitialColor(QColor color);
+
+        void closeSettingsPanel();
+        TupToolPlugin::Mode mode();
+        void resetUI();
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame);
+        
+    private slots:
+        void applyItem();
+        void addTween(const QString &name);
+        void editTween();
+        void removeTween();
+        void removeTween(const QString &name);
+        void closeTweenProperties();
+        void updateTweenData(const QString &name);
+        
+    signals:
+        void startingPointChanged(int index);
+        void clickedSelect();
+        void clickedDefineProperties();
+        void clickedRemoveTween(const QString &name);
+        void setMode(TupToolPlugin::Mode mode);
+        void clickedApplyTween();
+        void clickedResetInterface();
+        void getTweenData(const QString &name);
+        
+    private:
+        void setPropertiesPanel();
+        void activePropertiesPanel(bool enable);
+        void setTweenManagerPanel();
+        void activeTweenManagerPanel(bool enable);
+        void setButtonsPanel();
+        void activeButtonsPanel(bool enable);
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/color/settings.cpp tupi-0.2+git05/src/plugins/tools/color/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/color/settings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/color/settings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,595 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "settings.h"
+
+struct Settings::Private
+{
+    QWidget *innerPanel;
+    QBoxLayout *layout;
+    TupToolPlugin::Mode mode;
+
+    QLineEdit *input;
+
+    QSpinBox *comboInit;
+    QSpinBox *comboEnd;
+
+    TRadioButtonGroup *options;
+
+    QPushButton *initColorButton;
+    QColor initialColor;
+    QPushButton *endColorButton;
+    QColor endingColor;
+
+    QSpinBox *comboIterations;
+
+    QCheckBox *loopBox;
+    QCheckBox *reverseLoopBox;
+
+    QLabel *totalLabel;
+    int totalSteps;
+
+    bool selectionDone;
+    bool propertiesDone;
+
+    TImageButton *apply;
+    TImageButton *remove;
+};
+
+Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    k->selectionDone = false;
+    k->totalSteps = 0;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    setFont(QFont("Arial", 8, QFont::Normal, false));
+
+    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
+    k->input = new QLineEdit;
+
+    QHBoxLayout *nameLayout = new QHBoxLayout;
+    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    nameLayout->setMargin(0);
+    nameLayout->setSpacing(0);
+    nameLayout->addWidget(nameLabel);
+    nameLayout->addWidget(k->input);
+
+    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
+    k->options->addItem(tr("Select object"), 0);
+    k->options->addItem(tr("Set Properties"), 1);
+    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
+
+    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
+    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
+
+    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
+    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(10);
+    buttonsLayout->addWidget(k->apply);
+    buttonsLayout->addWidget(k->remove);
+
+    k->layout->addLayout(nameLayout);
+    k->layout->addWidget(k->options);
+
+    setInnerForm();
+
+    k->layout->addSpacing(10);
+    k->layout->addLayout(buttonsLayout);
+    k->layout->setSpacing(5);
+
+    activatePropertiesMode(TupToolPlugin::Selection);
+}
+
+Settings::~Settings()
+{
+    delete k;
+}
+
+void Settings::setInnerForm()
+{
+    k->innerPanel = new QWidget;
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
+    startingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboInit = new QSpinBox;
+    k->comboInit->setEnabled(false);
+    k->comboInit->setMaximum(999);
+    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(checkBottomLimit()));
+
+    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
+    endingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboEnd = new QSpinBox;
+    k->comboEnd->setEnabled(true);
+    k->comboEnd->setMaximum(999);
+    k->comboEnd->setValue(1);
+    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(startingLabel);
+    startLayout->addWidget(k->comboInit);
+
+    QHBoxLayout *endLayout = new QHBoxLayout;
+    endLayout->setAlignment(Qt::AlignHCenter);
+    endLayout->setMargin(0);
+    endLayout->setSpacing(0);
+    endLayout->addWidget(endingLabel);
+    endLayout->addWidget(k->comboEnd);
+
+    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
+    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    QHBoxLayout *totalLayout = new QHBoxLayout;
+    totalLayout->setAlignment(Qt::AlignHCenter);
+    totalLayout->setMargin(0);
+    totalLayout->setSpacing(0);
+    totalLayout->addWidget(k->totalLabel);
+
+    k->initialColor = QColor("#fff");
+    k->initColorButton = new QPushButton();
+    k->initColorButton->setText(tr("White"));
+    k->initColorButton->setPalette(QPalette(k->initialColor));
+    k->initColorButton->setAutoFillBackground(true);
+    connect(k->initColorButton, SIGNAL(clicked()), this, SLOT(setInitialColor()));
+
+    QLabel *coloringInitLabel = new QLabel(tr("Initial Color") + ": ");
+    coloringInitLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *coloringInitLayout = new QHBoxLayout;
+    coloringInitLayout->setAlignment(Qt::AlignHCenter);
+    coloringInitLayout->setMargin(0);
+    coloringInitLayout->setSpacing(0);
+    coloringInitLayout->addWidget(coloringInitLabel);
+    coloringInitLayout->addWidget(k->initColorButton);
+
+    k->endingColor = QColor("#fff");
+    k->endColorButton = new QPushButton();
+    k->endColorButton->setText(tr("White"));
+    k->endColorButton->setPalette(QPalette(k->endingColor));
+    k->endColorButton->setAutoFillBackground(true);
+    connect(k->endColorButton, SIGNAL(clicked()), this, SLOT(setEndingColor()));
+
+    QLabel *coloringEndLabel = new QLabel(tr("Ending Color") + ": ");
+    coloringEndLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *coloringEndLayout = new QHBoxLayout;
+    coloringEndLayout->setAlignment(Qt::AlignHCenter);
+    coloringEndLayout->setMargin(0);
+    coloringEndLayout->setSpacing(0);
+    coloringEndLayout->addWidget(coloringEndLabel);
+    coloringEndLayout->addWidget(k->endColorButton);
+
+    k->comboIterations = new QSpinBox;
+    k->comboIterations->setEnabled(true);
+    k->comboIterations->setMinimum(1);
+
+    QLabel *iterationsLabel = new QLabel(tr("Iterations") + ": ");
+    iterationsLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *iterationsLayout = new QHBoxLayout;
+    iterationsLayout->setAlignment(Qt::AlignHCenter);
+    iterationsLayout->setMargin(0);
+    iterationsLayout->setSpacing(0);
+    iterationsLayout->addWidget(iterationsLabel);
+    iterationsLayout->addWidget(k->comboIterations);
+
+    k->loopBox = new QCheckBox(tr("Loop"), k->innerPanel);
+    connect(k->loopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
+
+    QVBoxLayout *loopLayout = new QVBoxLayout;
+    loopLayout->setAlignment(Qt::AlignHCenter);
+    loopLayout->setMargin(0);
+    loopLayout->setSpacing(0);
+    loopLayout->addWidget(k->loopBox);
+
+    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->innerPanel);
+    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateLoopCheckbox(int)));
+
+    QVBoxLayout *reverseLayout = new QVBoxLayout;
+    reverseLayout->setAlignment(Qt::AlignHCenter);
+    reverseLayout->setMargin(0);
+    reverseLayout->setSpacing(0);
+    reverseLayout->addWidget(k->reverseLoopBox);
+
+    innerLayout->addLayout(startLayout);
+    innerLayout->addLayout(endLayout);
+    innerLayout->addLayout(totalLayout);
+
+    innerLayout->addSpacing(10);
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    innerLayout->addLayout(coloringInitLayout);
+    innerLayout->addLayout(coloringEndLayout);
+
+    innerLayout->addLayout(iterationsLayout);
+    innerLayout->addLayout(loopLayout);
+    innerLayout->addLayout(reverseLayout);
+
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    k->layout->addWidget(k->innerPanel);
+
+    activeInnerForm(false);
+}
+
+void Settings::activeInnerForm(bool enable)
+{
+    if (enable && !k->innerPanel->isVisible()) {
+        k->propertiesDone = true;
+        k->innerPanel->show();
+    } else {
+        k->propertiesDone = false;
+        k->innerPanel->hide();
+    }
+}
+
+void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
+{
+    k->mode = TupToolPlugin::Add;
+    k->input->setText(name);
+
+    activatePropertiesMode(TupToolPlugin::Selection);
+    k->apply->setToolTip(tr("Save Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
+    k->remove->setToolTip(tr("Cancel Tween"));
+
+    initStartCombo(framesTotal, initFrame);
+}
+
+void Settings::setParameters(TupItemTweener *currentTween)
+{
+    setEditMode();
+    activatePropertiesMode(TupToolPlugin::Properties);
+
+    k->input->setText(currentTween->name());
+
+    k->comboInit->setEnabled(true);
+    k->comboInit->setValue(currentTween->initFrame() + 1);
+
+    int lastFrame = currentTween->initFrame() + currentTween->frames();
+    k->comboEnd->setValue(lastFrame);
+
+    checkFramesRange();
+
+    updateColor(currentTween->tweenInitialColor(), k->initColorButton);
+    updateColor(currentTween->tweenEndingColor(), k->endColorButton);
+
+    int iterations = currentTween->tweenColorIterations();
+
+    k->comboIterations->setValue(iterations);
+
+    k->loopBox->setChecked(currentTween->tweenColorLoop());
+    k->reverseLoopBox->setChecked(currentTween->tweenColorReverseLoop());
+}
+
+void Settings::initStartCombo(int framesTotal, int currentIndex)
+{
+    k->comboInit->clear();
+    k->comboEnd->clear();
+
+    k->comboInit->setMinimum(1);
+    k->comboInit->setMaximum(framesTotal);
+    k->comboInit->setValue(currentIndex + 1);
+
+    k->comboEnd->setMinimum(1);
+    k->comboEnd->setValue(framesTotal);
+}
+
+void Settings::setStartFrame(int currentIndex)
+{
+    k->comboInit->setValue(currentIndex + 1);
+    int end = k->comboEnd->value();
+    if (end < currentIndex+1)
+        k->comboEnd->setValue(currentIndex + 1);
+}
+
+int Settings::startFrame()
+{
+    return k->comboInit->value() - 1;
+}
+
+int Settings::startComboSize()
+{
+    return k->comboInit->maximum();
+}
+
+int Settings::totalSteps()
+{
+    return k->comboEnd->value() - (k->comboInit->value() - 1);
+}
+
+void Settings::setEditMode()
+{
+    k->mode = TupToolPlugin::Edit;
+    k->apply->setToolTip(tr("Update Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
+    k->remove->setToolTip(tr("Close Tween properties"));
+}
+
+void Settings::applyTween()
+{
+    if (!k->selectionDone) {
+        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
+        return;
+    }
+
+    if (!k->propertiesDone) {
+        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
+        return;
+    }
+
+    // SQA: Verify Tween is really well applied before call setEditMode!
+    setEditMode();
+
+    if (!k->comboInit->isEnabled())
+        k->comboInit->setEnabled(true);
+
+    emit clickedApplyTween();
+}
+
+void Settings::notifySelection(bool flag)
+{
+    k->selectionDone = flag;
+}
+
+void Settings::setInitialColor()
+{
+     k->initialColor = QColorDialog::getColor(k->initialColor, this);
+     updateColor(k->initialColor, k->initColorButton);
+}
+
+void Settings::setInitialColor(QColor color) {
+    k->initialColor = color;
+    k->endingColor = QColor("#fff");
+    updateColor(k->initialColor, k->initColorButton);
+    updateColor(k->endingColor, k->endColorButton);
+}
+
+QString Settings::currentTweenName() const
+{
+    QString tweenName = k->input->text();
+    if (tweenName.length() > 0)
+        k->input->setFocus();
+
+    return tweenName;
+}
+
+void Settings::emitOptionChanged(int option)
+{
+    switch (option) {
+            case 0:
+             {
+                 activeInnerForm(false);
+                 emit clickedSelect();
+             }
+            break;
+            case 1:
+             {
+                 if (k->selectionDone) {
+                     activeInnerForm(true);
+                     emit clickedDefineProperties();
+                 } else {
+                     k->options->setCurrentIndex(0);
+                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
+                 }
+             }
+    }
+}
+
+QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame)
+{
+    QDomDocument doc;
+
+    QDomElement root = doc.createElement("tweening");
+    root.setAttribute("name", currentTweenName());
+    root.setAttribute("type", TupItemTweener::Coloring);
+    root.setAttribute("initFrame", currentFrame);
+    root.setAttribute("initLayer", currentLayer);
+    root.setAttribute("initScene", currentScene);
+  
+    checkFramesRange();
+    root.setAttribute("frames", k->totalSteps);
+    root.setAttribute("origin", "0,0");
+
+    int initialRed = k->initialColor.red();
+    int initialGreen = k->initialColor.green();
+    int initialBlue = k->initialColor.blue();
+
+    QString colorText = QString::number(initialRed) + "," + QString::number(initialGreen)
+                        + "," + QString::number(initialBlue);
+    root.setAttribute("initialColor", colorText);
+
+    int endingRed = k->endingColor.red();
+    int endingGreen = k->endingColor.green();
+    int endingBlue = k->endingColor.blue();
+
+    colorText = QString::number(endingRed) + "," + QString::number(endingGreen)
+                        + "," + QString::number(endingBlue);
+    root.setAttribute("endingColor", colorText);
+
+    int iterations = k->comboIterations->value();
+    if (iterations == 0) {
+        iterations = 1;
+        k->comboIterations->setValue(1);
+    }
+    root.setAttribute("colorIterations", iterations);
+
+    bool loop = k->loopBox->isChecked();
+    if (loop)
+        root.setAttribute("colorLoop", "1");
+    else
+        root.setAttribute("colorLoop", "0");
+
+    bool reverse = k->reverseLoopBox->isChecked();
+    if (reverse)
+        root.setAttribute("colorReverseLoop", "1");
+    else
+        root.setAttribute("colorReverseLoop", "0");
+
+    double redDelta = (double)(initialRed - endingRed)/(double)(iterations - 1);
+    double greenDelta = (double)(initialGreen - endingGreen)/(double)(iterations - 1);
+    double blueDelta = (double)(initialBlue - endingBlue)/(double)(iterations - 1); 
+
+    double redReference = 0;
+    double greenReference = 0;
+    double blueReference = 0;
+
+    int cycle = 1;
+    int reverseTop = (iterations*2)-2;
+
+    for (int i=0; i < k->totalSteps; i++) {
+         if (cycle <= iterations) {
+             if (cycle == 1) {
+                 redReference = initialRed;
+                 greenReference = initialGreen;
+                 blueReference = initialBlue;
+             } else if (cycle == iterations) {
+                        redReference = endingRed;
+                        greenReference = endingGreen;
+                        blueReference = endingBlue;
+             } else {
+                 redReference -= redDelta;
+                 greenReference -= greenDelta;
+                 blueReference -= blueDelta;
+             }
+             cycle++;
+         } else {
+             // if repeat option is enabled
+             if (loop) { 
+                 cycle = 2;
+                 redReference = initialRed;
+                 greenReference = initialGreen;
+                 blueReference = initialBlue;
+             } else if (reverse) { // if reverse option is enabled
+                        redReference += redDelta;
+                        greenReference += greenDelta;
+                        blueReference += blueDelta;
+
+                        if (cycle < reverseTop)
+                            cycle++;
+                        else 
+                            cycle = 1;
+
+             } else { // If cycle is done and no loop and no reverse 
+                 redReference = initialRed;
+                 greenReference = initialGreen;
+                 blueReference = initialBlue;
+             }
+         }
+
+         TupTweenerStep *step = new TupTweenerStep(i);
+         QColor color = QColor(redReference, greenReference, blueReference);
+         step->setColor(color);
+         root.appendChild(step->toXml(doc));
+    }
+
+    doc.appendChild(root);
+
+    return doc.toString();
+}
+
+void Settings::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->options->setCurrentIndex(mode);
+}
+
+void Settings::activatePropertiesMode(TupToolPlugin::EditMode mode)
+{
+    k->options->setCurrentIndex(mode);
+}
+
+void Settings::checkBottomLimit(int index)
+{
+    emit startingPointChanged(index);
+    checkFramesRange();
+}
+
+void Settings::checkTopLimit(int index)
+{
+    Q_UNUSED(index);
+    checkFramesRange();
+}
+
+void Settings::checkFramesRange()
+{
+    int begin = k->comboInit->value();
+    int end = k->comboEnd->value();
+
+    if (begin > end) {
+        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
+        end = k->comboEnd->value();
+    }
+
+    k->totalSteps = end - begin + 1;
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
+}
+
+void Settings::updateLoopCheckbox(int state)
+{
+    Q_UNUSED(state);
+    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
+        k->loopBox->setChecked(false);
+}
+
+void Settings::updateReverseCheckbox(int state)
+{
+    Q_UNUSED(state);
+    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
+        k->reverseLoopBox->setChecked(false);
+}
+
+void Settings::setEndingColor()
+{
+     k->endingColor = QColorDialog::getColor(k->endingColor, this);
+     updateColor(k->endingColor, k->endColorButton);
+}
+
+void Settings::updateColor(QColor color, QPushButton *colorButton)
+{
+     if (color.isValid()) {
+         colorButton->setText(color.name());
+         colorButton->setPalette(QPalette(color));
+         colorButton->setAutoFillBackground(true);
+     }
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/color/settings.h tupi-0.2+git05/src/plugins/tools/color/settings.h
--- tupi-0.2+git04/src/plugins/tools/color/settings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/color/settings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,116 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "tradiobuttongroup.h"
+#include "tupitemtweener.h"
+#include "tuptweenerstep.h"
+#include "timagebutton.h"
+#include "tseparator.h"
+#include "tosd.h"
+
+#include <QWidget>
+#include <QPushButton>
+#include <QLabel>
+#include <QLineEdit>
+#include <QBoxLayout>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QColorDialog>
+#include <QDir>
+
+// class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Settings : public QWidget 
+{
+    Q_OBJECT
+
+    public:
+        Settings(QWidget *parent = 0);
+        ~Settings();
+
+        void setParameters(const QString &name, int framesTotal, int startFrame);
+        void setParameters(TupItemTweener *currentTween);
+        void initStartCombo(int totalFrames, int currentIndex);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+
+        int totalSteps();
+
+        QString currentTweenName() const;
+        void activatePropertiesMode(TupToolPlugin::EditMode mode);
+        void notifySelection(bool flag);
+        int startComboSize();
+        void setInitialColor(QColor color);
+		void activateMode(TupToolPlugin::EditMode mode);
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame);
+
+    private slots:
+        void applyTween();
+        void emitOptionChanged(int option);
+        void checkBottomLimit(int index);
+        void checkTopLimit(int index);
+        void updateLoopCheckbox(int state);
+        void updateReverseCheckbox(int state);
+        void setInitialColor();
+        void setEndingColor();
+        
+    signals:
+        void clickedSelect();
+        void clickedDefineProperties();
+        void clickedApplyTween();
+        void clickedResetTween();
+        void startingPointChanged(int index);
+        
+    private:
+        void setInnerForm();
+        void activeInnerForm(bool enable);
+        void setEditMode();
+        void checkFramesRange();
+        void updateColor(QColor color, QPushButton *colorButton);
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/color/tweener.cpp tupi-0.2+git05/src/plugins/tools/color/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/color/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/color/tweener.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,585 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tweener.h"
+
+struct Tweener::Private
+{
+    QMap<QString, TAction *> actions;
+    Configurator *configurator;
+
+    TupGraphicsScene *scene;
+    QList<QGraphicsItem *> objects;
+
+    TupItemTweener *currentTween;
+    int initFrame;
+    int initLayer;
+    int initScene;
+
+    TupToolPlugin::Mode mode;
+    TupToolPlugin::EditMode editMode;
+};
+
+Tweener::Tweener() : TupToolPlugin(), k(new Private)
+{
+    setupActions();
+    k->configurator = 0;
+}
+
+Tweener::~Tweener()
+{
+    delete k;
+}
+
+/* This method initializes the plugin */
+
+void Tweener::init(TupGraphicsScene *scene)
+{
+    k->scene = scene;
+    k->objects.clear();
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+
+    k->configurator->resetUI();
+
+    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Coloring);
+    if (tweenList.size() > 0) {
+        k->configurator->loadTweenList(tweenList);
+        setCurrentTween(tweenList.at(0));
+    }
+
+    int total = framesTotal();
+    k->configurator->initStartCombo(total, k->initFrame);
+}
+
+void Tweener::updateStartPoint(int index)
+{
+     if (k->initFrame != index && index >= 0)
+         k->initFrame = index;
+}
+
+/* This method returns the plugin name */
+
+QStringList Tweener::keys() const
+{
+    return QStringList() << tr("Coloring Tween");
+}
+
+/* This method makes an action when the mouse is pressed on the workspace 
+ * depending on the active mode: Selecting an object or Creating a path  
+*/
+
+void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::press()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method is executed while the mouse is pressed and on movement */
+
+void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method finishes the action started on the press method depending
+ * on the active mode: Selecting an object or Creating a path
+*/
+
+void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::release()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (scene->currentFrameIndex() == k->initFrame) {
+        if (k->editMode == TupToolPlugin::Selection) {
+            if (scene->selectedItems().size() > 0) {
+                k->objects = scene->selectedItems();
+                foreach (QGraphicsItem *item, k->objects) {
+                         if (TupGraphicLibraryItem *libraryItem = qgraphicsitem_cast<TupGraphicLibraryItem *>(item)) {
+                              if (libraryItem->type() == TupLibraryObject::Image) {
+                                  clearSelection();
+                                  TOsd::self()->display(tr("Error"), tr("Coloring Tween can't be applied to raster images"), TOsd::Error);
+                                  return;
+                              }
+                         }
+
+                         if (qgraphicsitem_cast<TupSvgItem *>(item)) {
+                             clearSelection();         
+                             TOsd::self()->display(tr("Error"), tr("Coloring Tween can't be applied to SVG files"), TOsd::Error);
+                             return;
+                         }
+                }
+
+                QGraphicsItem *item = k->objects.at(0);
+                QColor color = QColor("#fff");
+                if (TupPathItem *path = qgraphicsitem_cast<TupPathItem *>(item)) {
+                    color = path->pen().color();
+                } else if (TupEllipseItem *ellipse = qgraphicsitem_cast<TupEllipseItem *>(item)) {
+                           color = ellipse->pen().color();
+                } else if (TupLineItem *line = qgraphicsitem_cast<TupLineItem *>(item)) {
+                           color = line->pen().color();
+                } else if (TupRectItem *rect = qgraphicsitem_cast<TupRectItem *>(item)) {
+                           color = rect->pen().color();
+                }
+
+                k->configurator->setInitialColor(color);
+                k->configurator->notifySelection(true);
+            }
+        }
+    }
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+QMap<QString, TAction *> Tweener::actions() const
+{
+    return k->actions;
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+int Tweener::toolType() const
+{
+    return TupToolInterface::Tweener;
+}
+
+/* This method returns the tool panel associated to this plugin */
+
+QWidget *Tweener::configurator()
+{
+    if (!k->configurator) {
+        k->mode = TupToolPlugin::View;
+
+        k->configurator = new Configurator;
+        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
+        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
+        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
+        connect(k->configurator, SIGNAL(clickedDefineProperties()), this, SLOT(setPropertiesMode()));
+        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
+        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode))); 
+        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
+        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    } 
+
+    return k->configurator;
+}
+
+/* This method is called when there's a change on/of scene */
+void Tweener::aboutToChangeScene(TupGraphicsScene *)
+{
+}
+
+/* This method is called when this plugin is off */
+
+void Tweener::aboutToChangeTool()
+{
+}
+
+/* This method defines the actions contained in this plugin */
+
+void Tweener::setupActions()
+{
+    TAction *action = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "coloring_tween.png"),
+                                      tr("Coloring Tween"), this);
+    action->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
+    action->setShortcut(QKeySequence(tr("Shift+C")));
+
+    k->actions.insert(tr("Coloring Tween"), action);
+}
+
+/* This method saves the settings of this plugin */
+
+void Tweener::saveConfig()
+{
+}
+
+/* This method updates the workspace when the plugin changes the scene */
+
+void Tweener::updateScene(TupGraphicsScene *scene)
+{
+    k->mode = k->configurator->mode();
+
+    if (k->mode == TupToolPlugin::Edit) {
+        int framesNumber = framesTotal();
+
+        if (k->configurator->startComboSize() < framesNumber)
+            k->configurator->initStartCombo(framesNumber, k->initFrame);
+
+    } else if (k->mode == TupToolPlugin::Add) {
+               int total = framesTotal();
+
+               if (k->editMode == TupToolPlugin::Properties) {
+                   if (total > k->configurator->startComboSize()) {
+                       k->configurator->activateMode(TupToolPlugin::Selection);
+                       clearSelection();
+                       setSelection();
+                   }
+               } else if (k->editMode == TupToolPlugin::Selection) {
+                          if (scene->currentFrameIndex() != k->initFrame)
+                              clearSelection();
+                          k->initFrame = scene->currentFrameIndex();
+                          setSelection();
+               }
+
+               if (k->configurator->startComboSize() < total) {
+                   k->configurator->initStartCombo(total, k->initFrame);
+               } else {
+                   if (scene->currentFrameIndex() != k->initFrame)
+                       k->configurator->setStartFrame(scene->currentFrameIndex());
+               }
+
+    } else {
+        if (scene->currentFrameIndex() != k->initFrame)
+            k->configurator->setStartFrame(scene->currentFrameIndex());
+    }
+}
+
+void Tweener::setCurrentTween(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    k->currentTween = scene->tween(name, TupItemTweener::Coloring);
+    if (k->currentTween)
+        k->configurator->setCurrentTween(k->currentTween);
+}
+
+int Tweener::framesTotal()
+{
+    int total = 1;
+    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
+    if (layer)
+        total = layer->framesTotal();
+
+    return total;
+}
+
+/* This method clears selection */
+
+void Tweener::clearSelection()
+{
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 if (item->isSelected())
+                     item->setSelected(false);
+        }
+        k->objects.clear();
+        k->configurator->notifySelection(false);
+    }
+}
+
+/* This method disables object selection */
+
+void Tweener::disableSelection()
+{
+    foreach (QGraphicsView *view, k->scene->views()) {
+             view->setDragMode (QGraphicsView::NoDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+void Tweener::setSelection()
+{
+    k->editMode = TupToolPlugin::Selection;
+
+    int bottomBoundary = 20000 + (k->initLayer*10000);
+    int topBoundary = bottomBoundary + 10000;
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             view->setDragMode(QGraphicsView::RubberBandDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
+                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+             }
+    }
+
+    // When Object selection is enabled, previous selection is set
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                 item->setSelected(true);
+        }
+        QGraphicsItem *item = k->objects.at(0);
+        QColor color = QColor();
+        if (TupPathItem *path = qgraphicsitem_cast<TupPathItem *>(item)) {
+            color = path->pen().color();
+        } else if (TupEllipseItem *ellipse = qgraphicsitem_cast<TupEllipseItem *>(item)) {
+                   color = ellipse->pen().color();
+        } else if (TupLineItem *line = qgraphicsitem_cast<TupLineItem *>(item)) {
+                   color = line->pen().color();
+        } else if (TupRectItem *rect = qgraphicsitem_cast<TupRectItem *>(item)) {
+                   color = rect->pen().color(); 
+        }
+        k->configurator->setInitialColor(color);
+        k->configurator->notifySelection(true);
+    }
+}
+
+void Tweener::setPropertiesMode()
+{
+    k->editMode = TupToolPlugin::Properties;
+    disableSelection();
+}
+
+/* This method resets this plugin */
+
+void Tweener::applyReset()
+{
+    disableSelection();
+    clearSelection();
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+}
+
+/* This method applies to the project, the Tween created from this plugin */
+
+void Tweener::applyTween()
+{
+    QString name = k->configurator->currentTweenName();
+
+    if (name.length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
+        return;
+    }
+
+    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Coloring)) {
+        k->initFrame = k->scene->currentFrameIndex();
+        k->initLayer = k->scene->currentLayerIndex();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 int objectIndex = -1;
+
+                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = k->scene->currentFrame()->indexOf(svg);
+                 } else {
+                     objectIndex = k->scene->currentFrame()->indexOf(item);
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex, QPointF(), k->scene->spaceMode(),
+                                             type, TupProjectRequest::SetTween,
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame));
+                 emit requested(&request);
+        }
+    } else {
+        removeTweenFromProject(name);
+        QList<QGraphicsItem *> newList;
+
+        k->initFrame = k->configurator->startFrame();
+        k->initLayer = k->currentTween->initLayer();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 TupProject *project = k->scene->scene()->project();
+                 TupScene *scene = project->scene(k->initScene);
+                 TupLayer *layer = scene->layer(k->initLayer);
+                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
+                 int objectIndex = -1;
+                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
+
+                 if (svg) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = frame->indexOf(svg);
+                 } else {
+                     objectIndex = frame->indexOf(item);
+                 }
+
+                 if (k->initFrame != k->currentTween->initFrame()) {
+                     QDomDocument dom;
+                     if (type == TupLibraryObject::Svg)
+                         dom.appendChild(svg->toXml(dom));
+                     else
+                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
+
+                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame,
+                                                                                      0, QPointF(), k->scene->spaceMode(),
+                                                                                      type, TupProjectRequest::Add,
+                                                                                      dom.toString());
+                     emit requested(&request);
+
+                     request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer,
+                                                                    k->currentTween->initFrame(),
+                                                                    objectIndex, QPointF(), 
+                                                                    k->scene->spaceMode(), type,
+                                                                    TupProjectRequest::Remove);
+                     emit requested(&request);
+
+                     frame = layer->frame(k->initFrame);
+                     if (type == TupLibraryObject::Item) {
+                         objectIndex = frame->graphicItemsCount() - 1;
+                         newList.append(frame->graphic(objectIndex)->item());
+                     } else {
+                         objectIndex = frame->svgItemsCount() - 1;
+                         newList.append(frame->svg(objectIndex));
+                     }
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex, QPointF(), k->scene->spaceMode(),
+                                             type, TupProjectRequest::SetTween,
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame));
+                 emit requested(&request);
+        }
+
+        if (newList.size() > 0)
+            k->objects = newList;
+    }
+
+    int total = k->initFrame + k->configurator->totalSteps();
+    int framesNumber = framesTotal();
+    int layersTotal = k->scene->scene()->layersTotal();
+    TupProjectRequest request;
+
+    if (total >= framesNumber) {
+        for (int i = framesNumber; i < total; i++) {
+             for (int j = 0; j < layersTotal; j++) {
+                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i,
+                                                                  TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
+                  emit requested(&request);
+             }
+        }
+    }
+
+    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
+                                                    TupProjectRequest::Select, "1");
+    emit requested(&request);
+
+    setCurrentTween(name);
+    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
+}
+
+void Tweener::removeTweenFromProject(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    scene->removeTween(name, TupItemTweener::Coloring);
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      QString tip = item->toolTip();
+                      if (tip.startsWith(tr("Coloring Tween") + ": " + name))
+                          item->setToolTip("");
+             }
+    }
+}
+
+void Tweener::removeTween(const QString &name)
+{
+    removeTweenFromProject(name);
+    applyReset();
+}
+
+void Tweener::updateMode(TupToolPlugin::Mode mode)
+{
+    k->mode = mode;
+
+    if (k->mode == TupToolPlugin::Edit) {
+        k->initScene = k->currentTween->initScene();
+        k->initLayer = k->currentTween->initLayer();
+        k->initFrame = k->currentTween->initFrame();
+
+        if (k->initFrame != k->scene->currentFrameIndex()) {
+            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
+                                                                              TupProjectRequest::Select, "1");
+            emit requested(&request);
+
+            if (k->objects.isEmpty())
+                k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Coloring);
+        }
+    }
+}
+
+void Tweener::sceneResponse(const TupSceneResponse *event)
+{
+    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
+        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
+        init(k->scene);
+    }
+
+    if (event->action() == TupProjectRequest::Select)
+        init(k->scene);
+}
+
+void Tweener::layerResponse(const TupLayerResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove)
+        init(k->scene);
+}
+
+void Tweener::frameResponse(const TupFrameResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
+        init(k->scene);
+
+    if (event->action() == TupProjectRequest::Select) {
+        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
+            init(k->scene);
+    }
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/color/tweener.h tupi-0.2+git05/src/plugins/tools/color/tweener.h
--- tupi-0.2+git04/src/plugins/tools/color/tweener.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/color/tweener.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,128 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef COLORINGTWEENER_H
+#define COLORINGTWEENER_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "settings.h"
+#include "tupprojectresponse.h"
+#include "configurator.h"
+#include "tupgraphiclibraryitem.h"
+#include "tglobal.h"
+#include "taction.h"
+#include "tosd.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicsscene.h"
+#include "tupgraphicobject.h"
+#include "tuppathitem.h"
+#include "tupellipseitem.h"
+#include "tuplineitem.h"
+#include "tuprectitem.h"
+#include "tuppixmapitem.h"
+#include "tupsvgitem.h"
+#include "tupitemtweener.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+
+#include <QPointF>
+#include <QKeySequence>
+#include <QMatrix>
+#include <QGraphicsView>
+#include <QDomDocument>
+#include <QDir>
+
+/**
+ * @author Gustav Gonzalez 
+ * 
+*/
+
+class TUPI_PLUGIN Tweener : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "coloringtool.json")
+
+    public:
+        Tweener();
+        virtual ~Tweener();
+        virtual void init(TupGraphicsScene *scene);
+
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+
+        virtual void updateScene(TupGraphicsScene *scene);
+        virtual void saveConfig();
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+        virtual void layerResponse(const TupLayerResponse *event);
+        virtual void frameResponse(const TupFrameResponse *event);
+
+    private:
+        void setupActions();
+        int framesTotal();
+        void clearSelection();
+        void disableSelection();
+        void removeTweenFromProject(const QString &name);
+
+    private:
+        struct Private;
+        Private *const k;
+
+    private slots:
+        void setCurrentTween(const QString &name);
+        void setSelection();
+        void setPropertiesMode(); 
+        void updateMode(TupToolPlugin::Mode mode);
+        void updateStartPoint(int index);
+        void applyReset();
+        void applyTween();
+        void removeTween(const QString &name);
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/coloringtool/coloringtool.json tupi-0.2+git05/src/plugins/tools/coloringtool/coloringtool.json
--- tupi-0.2+git04/src/plugins/tools/coloringtool/coloringtool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/coloringtool/coloringtool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "ColoringTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/coloringtool/coloringtool.pro tupi-0.2+git05/src/plugins/tools/coloringtool/coloringtool.pro
--- tupi-0.2+git04/src/plugins/tools/coloringtool/coloringtool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/coloringtool/coloringtool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/coloringtool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += tweener.h \
-           configurator.h \
-           settings.h
-
-SOURCES += tweener.cpp \
-           configurator.cpp \
-           settings.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupicoloringtool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/coloringtool/configurator.cpp tupi-0.2+git05/src/plugins/tools/coloringtool/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/coloringtool/configurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/coloringtool/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,315 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "configurator.h"
-#include "tweenmanager.h"
-#include "buttonspanel.h"
-
-#include "tupitemtweener.h"
-#include "tosd.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QBoxLayout>
-
-struct Configurator::Private
-{
-    QBoxLayout *layout;
-    QBoxLayout *settingsLayout;
-    Settings *settingsPanel;
-    TweenManager *tweenManager;
-    ButtonsPanel *controlPanel;
-
-    TupItemTweener *currentTween;
-
-    int framesTotal;
-    int currentFrame;
-
-    TupToolPlugin::Mode mode;
-    Configurator::GuiState state;
-};
-
-Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
-{
-    k->framesTotal = 1;
-    k->currentFrame = 0;
-
-    k->mode = TupToolPlugin::View;
-    k->state = Configurator::Manager;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-
-    QLabel *title = new QLabel(tr("Coloring Tween"));
-    title->setAlignment(Qt::AlignHCenter);
-    title->setFont(QFont("Arial", 8, QFont::Bold));
-
-    k->layout->addWidget(title);
-
-    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    k->settingsLayout->setMargin(0);
-    k->settingsLayout->setSpacing(0);
-
-    setTweenManagerPanel();
-    setButtonsPanel();
-    setPropertiesPanel();
-
-    k->layout->addLayout(k->settingsLayout);
-    k->layout->addStretch(2);
-}
-
-Configurator::~Configurator()
-{
-    delete k;
-}
-
-void Configurator::loadTweenList(QList<QString> tweenList)
-{
-    k->tweenManager->loadTweenList(tweenList);
-    if (tweenList.count() > 0)
-        activeButtonsPanel(true);
-}
-
-void Configurator::setPropertiesPanel()
-{
-    k->settingsPanel = new Settings(this);
-
-    connect(k->settingsPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int)));
-    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
-    connect(k->settingsPanel, SIGNAL(clickedDefineProperties()), this, SIGNAL(clickedDefineProperties()));
-    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
-    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
-
-    k->settingsLayout->addWidget(k->settingsPanel);
-
-    activePropertiesPanel(false);
-}
-
-void Configurator::activePropertiesPanel(bool enable)
-{
-    if (enable)
-        k->settingsPanel->show();
-    else
-        k->settingsPanel->hide();
-}
-
-void Configurator::setCurrentTween(TupItemTweener *currentTween)
-{
-    k->currentTween = currentTween;
-}
-
-void Configurator::setTweenManagerPanel()
-{
-    k->tweenManager = new TweenManager(this);
-    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
-    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
-
-    k->settingsLayout->addWidget(k->tweenManager);
-    k->state = Configurator::Manager;
-}
-
-void Configurator::activeTweenManagerPanel(bool enable)
-{
-    if (enable)
-        k->tweenManager->show();
-    else
-        k->tweenManager->hide();
-
-    if (k->tweenManager->listSize() > 0)
-        activeButtonsPanel(enable);
-}
-
-void Configurator::setButtonsPanel()
-{
-    k->controlPanel = new ButtonsPanel(this);
-    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
-    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
-
-    k->settingsLayout->addWidget(k->controlPanel);
-
-    activeButtonsPanel(false);
-}
-
-void Configurator::activeButtonsPanel(bool enable)
-{
-    if (enable)
-        k->controlPanel->show();
-    else
-        k->controlPanel->hide();
-}
-
-void Configurator::initStartCombo(int framesTotal, int currentFrame)
-{
-    k->framesTotal = framesTotal;
-    k->currentFrame = currentFrame;
-    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
-}
-
-void Configurator::setStartFrame(int currentIndex)
-{
-    k->currentFrame = currentIndex;
-    k->settingsPanel->setStartFrame(currentIndex);
-}
-
-int Configurator::startFrame()
-{
-    return k->settingsPanel->startFrame();
-}
-
-int Configurator::startComboSize()
-{
-    return k->settingsPanel->startComboSize();
-}
-
-QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame)
-{
-    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame);
-}
-
-int Configurator::totalSteps()
-{
-    return k->settingsPanel->totalSteps();
-}
-
-void Configurator::addTween(const QString &name)
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Add;
-    k->state = Configurator::Properties;
-
-    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
-    activePropertiesPanel(true);
-
-    emit setMode(k->mode);
-}
-
-void Configurator::editTween()
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Edit;
-    k->state = Configurator::Properties;
-
-    k->settingsPanel->notifySelection(true);
-    k->settingsPanel->setParameters(k->currentTween);
-    activePropertiesPanel(true);
-
-    emit setMode(k->mode);
-}
-
-void Configurator::removeTween()
-{
-    QString name = k->tweenManager->currentTweenName();
-    k->tweenManager->removeItemFromList();
-
-    removeTween(name);
-}
-
-void Configurator::removeTween(const QString &name)
-{
-    if (k->tweenManager->listSize() == 0)
-        activeButtonsPanel(false);
-
-    emit clickedRemoveTween(name);
-}
-
-QString Configurator::currentTweenName() const
-{
-    QString oldName = k->tweenManager->currentTweenName();
-    QString newName = k->settingsPanel->currentTweenName();
-
-    if (oldName.compare(newName) != 0)
-        k->tweenManager->updateTweenName(newName);
-
-    return newName;
-}
-
-void Configurator::notifySelection(bool flag)
-{
-    k->settingsPanel->notifySelection(flag);
-}
-
-void Configurator::setInitialColor(QColor color)
-{
-    k->settingsPanel->setInitialColor(color);
-}
-
-void Configurator::closeTweenProperties()
-{
-    if (k->mode == TupToolPlugin::Add)
-        k->tweenManager->removeItemFromList();
-
-    emit clickedResetInterface();
-
-    closeSettingsPanel();
-}
-
-void Configurator::closeSettingsPanel()
-{
-    if (k->state == Configurator::Properties) {
-        activeTweenManagerPanel(true);
-        activePropertiesPanel(false);
-        k->mode = TupToolPlugin::View;
-        k->state = Configurator::Manager;
-    }
-}
-
-TupToolPlugin::Mode Configurator::mode()
-{
-    return k->mode;
-}
-
-void Configurator::applyItem()
-{
-     k->mode = TupToolPlugin::Edit;
-     emit clickedApplyTween();
-}
-
-void Configurator::resetUI()
-{
-    k->tweenManager->resetUI();
-    closeSettingsPanel();
-    k->settingsPanel->notifySelection(false);
-}
-
-void Configurator::updateTweenData(const QString &name)
-{
-    emit getTweenData(name);
-}
-
diff -Nru tupi-0.2+git04/src/plugins/tools/coloringtool/configurator.h tupi-0.2+git05/src/plugins/tools/coloringtool/configurator.h
--- tupi-0.2+git04/src/plugins/tools/coloringtool/configurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/coloringtool/configurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONFIGURATOR_H
-#define CONFIGURATOR_H
-
-#include "settings.h"
-#include <QFrame>
-
-class QGraphicsPathItem;
-class QListWidgetItem;
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Configurator : public QFrame
-{
-    Q_OBJECT
-
-    public:
-        enum GuiState { Manager = 1, Properties };
-
-        Configurator(QWidget *parent = 0);
-        ~Configurator();
-
-        void loadTweenList(QList<QString> tweenList);
-
-        void initStartCombo(int framesTotal, int currentFrame);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-
-        int totalSteps();
-        void activateMode(TupToolPlugin::EditMode mode);
-        void setCurrentTween(TupItemTweener *currentTween);
-        QString currentTweenName() const;
-        void notifySelection(bool flag);
-        int startComboSize();
-        void setInitialColor(QColor color);
-
-        void closeSettingsPanel();
-        TupToolPlugin::Mode mode();
-        void resetUI();
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame);
-        
-    private slots:
-        void applyItem();
-        void addTween(const QString &name);
-        void editTween();
-        void removeTween();
-        void removeTween(const QString &name);
-        void closeTweenProperties();
-        void updateTweenData(const QString &name);
-        
-    signals:
-        void startingPointChanged(int index);
-        void clickedSelect();
-        void clickedDefineProperties();
-        void clickedRemoveTween(const QString &name);
-        void setMode(TupToolPlugin::Mode mode);
-        void clickedApplyTween();
-        void clickedResetInterface();
-        void getTweenData(const QString &name);
-        
-    private:
-        void setPropertiesPanel();
-        void activePropertiesPanel(bool enable);
-        void setTweenManagerPanel();
-        void activeTweenManagerPanel(bool enable);
-        void setButtonsPanel();
-        void activeButtonsPanel(bool enable);
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/coloringtool/settings.cpp tupi-0.2+git05/src/plugins/tools/coloringtool/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/coloringtool/settings.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/coloringtool/settings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,603 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "settings.h"
-#include "tdebug.h"
-#include "tradiobuttongroup.h"
-#include "tupitemtweener.h"
-#include "tuptweenerstep.h"
-#include "timagebutton.h"
-#include "tseparator.h"
-#include "tosd.h"
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QBoxLayout>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QColorDialog>
-#include <QDir>
-
-struct Settings::Private
-{
-    QWidget *innerPanel;
-    QBoxLayout *layout;
-    TupToolPlugin::Mode mode;
-
-    QLineEdit *input;
-
-    QSpinBox *comboInit;
-    QSpinBox *comboEnd;
-
-    TRadioButtonGroup *options;
-
-    QPushButton *initColorButton;
-    QColor initialColor;
-    QPushButton *endColorButton;
-    QColor endingColor;
-
-    QSpinBox *comboIterations;
-
-    QCheckBox *loopBox;
-    QCheckBox *reverseLoopBox;
-
-    QLabel *totalLabel;
-    int totalSteps;
-
-    bool selectionDone;
-    bool propertiesDone;
-
-    TImageButton *apply;
-    TImageButton *remove;
-};
-
-Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    k->selectionDone = false;
-    k->totalSteps = 0;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    setFont(QFont("Arial", 8, QFont::Normal, false));
-
-    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
-    k->input = new QLineEdit;
-
-    QHBoxLayout *nameLayout = new QHBoxLayout;
-    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    nameLayout->setMargin(0);
-    nameLayout->setSpacing(0);
-    nameLayout->addWidget(nameLabel);
-    nameLayout->addWidget(k->input);
-
-    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
-    k->options->addItem(tr("Select object"), 0);
-    k->options->addItem(tr("Set Properties"), 1);
-    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
-
-    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
-    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
-
-    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
-    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    buttonsLayout->setMargin(0);
-    buttonsLayout->setSpacing(10);
-    buttonsLayout->addWidget(k->apply);
-    buttonsLayout->addWidget(k->remove);
-
-    k->layout->addLayout(nameLayout);
-    k->layout->addWidget(k->options);
-
-    setInnerForm();
-
-    k->layout->addSpacing(10);
-    k->layout->addLayout(buttonsLayout);
-    k->layout->setSpacing(5);
-
-    activatePropertiesMode(TupToolPlugin::Selection);
-}
-
-Settings::~Settings()
-{
-    delete k;
-}
-
-void Settings::setInnerForm()
-{
-    k->innerPanel = new QWidget;
-
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
-    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
-    startingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboInit = new QSpinBox;
-    k->comboInit->setEnabled(false);
-    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(checkBottomLimit()));
-
-    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
-    endingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboEnd = new QSpinBox;
-    k->comboEnd->setEnabled(true);
-    k->comboEnd->setValue(1);
-    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
-
-    QHBoxLayout *startLayout = new QHBoxLayout;
-    startLayout->setAlignment(Qt::AlignHCenter);
-    startLayout->setMargin(0);
-    startLayout->setSpacing(0);
-    startLayout->addWidget(startingLabel);
-    startLayout->addWidget(k->comboInit);
-
-    QHBoxLayout *endLayout = new QHBoxLayout;
-    endLayout->setAlignment(Qt::AlignHCenter);
-    endLayout->setMargin(0);
-    endLayout->setSpacing(0);
-    endLayout->addWidget(endingLabel);
-    endLayout->addWidget(k->comboEnd);
-
-    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
-    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    QHBoxLayout *totalLayout = new QHBoxLayout;
-    totalLayout->setAlignment(Qt::AlignHCenter);
-    totalLayout->setMargin(0);
-    totalLayout->setSpacing(0);
-    totalLayout->addWidget(k->totalLabel);
-
-    k->initialColor = QColor("#fff");
-    k->initColorButton = new QPushButton();
-    k->initColorButton->setText(tr("White"));
-    k->initColorButton->setPalette(QPalette(k->initialColor));
-    k->initColorButton->setAutoFillBackground(true);
-    connect(k->initColorButton, SIGNAL(clicked()), this, SLOT(setInitialColor()));
-
-    QLabel *coloringInitLabel = new QLabel(tr("Initial Color") + ": ");
-    coloringInitLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *coloringInitLayout = new QHBoxLayout;
-    coloringInitLayout->setAlignment(Qt::AlignHCenter);
-    coloringInitLayout->setMargin(0);
-    coloringInitLayout->setSpacing(0);
-    coloringInitLayout->addWidget(coloringInitLabel);
-    coloringInitLayout->addWidget(k->initColorButton);
-
-    k->endingColor = QColor("#fff");
-    k->endColorButton = new QPushButton();
-    k->endColorButton->setText(tr("White"));
-    k->endColorButton->setPalette(QPalette(k->endingColor));
-    k->endColorButton->setAutoFillBackground(true);
-    connect(k->endColorButton, SIGNAL(clicked()), this, SLOT(setEndingColor()));
-
-    QLabel *coloringEndLabel = new QLabel(tr("Ending Color") + ": ");
-    coloringEndLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *coloringEndLayout = new QHBoxLayout;
-    coloringEndLayout->setAlignment(Qt::AlignHCenter);
-    coloringEndLayout->setMargin(0);
-    coloringEndLayout->setSpacing(0);
-    coloringEndLayout->addWidget(coloringEndLabel);
-    coloringEndLayout->addWidget(k->endColorButton);
-
-    k->comboIterations = new QSpinBox;
-    k->comboIterations->setEnabled(true);
-    k->comboIterations->setMinimum(1);
-
-    QLabel *iterationsLabel = new QLabel(tr("Iterations") + ": ");
-    iterationsLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *iterationsLayout = new QHBoxLayout;
-    iterationsLayout->setAlignment(Qt::AlignHCenter);
-    iterationsLayout->setMargin(0);
-    iterationsLayout->setSpacing(0);
-    iterationsLayout->addWidget(iterationsLabel);
-    iterationsLayout->addWidget(k->comboIterations);
-
-    k->loopBox = new QCheckBox(tr("Loop"), k->innerPanel);
-    connect(k->loopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
-
-    QVBoxLayout *loopLayout = new QVBoxLayout;
-    loopLayout->setAlignment(Qt::AlignHCenter);
-    loopLayout->setMargin(0);
-    loopLayout->setSpacing(0);
-    loopLayout->addWidget(k->loopBox);
-
-    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->innerPanel);
-    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateLoopCheckbox(int)));
-
-    QVBoxLayout *reverseLayout = new QVBoxLayout;
-    reverseLayout->setAlignment(Qt::AlignHCenter);
-    reverseLayout->setMargin(0);
-    reverseLayout->setSpacing(0);
-    reverseLayout->addWidget(k->reverseLoopBox);
-
-    innerLayout->addLayout(startLayout);
-    innerLayout->addLayout(endLayout);
-    innerLayout->addLayout(totalLayout);
-
-    innerLayout->addSpacing(10);
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    innerLayout->addLayout(coloringInitLayout);
-    innerLayout->addLayout(coloringEndLayout);
-
-    innerLayout->addLayout(iterationsLayout);
-    innerLayout->addLayout(loopLayout);
-    innerLayout->addLayout(reverseLayout);
-
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    k->layout->addWidget(k->innerPanel);
-
-    activeInnerForm(false);
-}
-
-void Settings::activeInnerForm(bool enable)
-{
-    if (enable && !k->innerPanel->isVisible()) {
-        k->propertiesDone = true;
-        k->innerPanel->show();
-    } else {
-        k->propertiesDone = false;
-        k->innerPanel->hide();
-    }
-}
-
-void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
-{
-    k->mode = TupToolPlugin::Add;
-    k->input->setText(name);
-
-    activatePropertiesMode(TupToolPlugin::Selection);
-    k->apply->setToolTip(tr("Save Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
-    k->remove->setToolTip(tr("Cancel Tween"));
-
-    initStartCombo(framesTotal, initFrame);
-}
-
-void Settings::setParameters(TupItemTweener *currentTween)
-{
-    setEditMode();
-    activatePropertiesMode(TupToolPlugin::Properties);
-
-    k->input->setText(currentTween->name());
-
-    k->comboInit->setEnabled(true);
-    k->comboInit->setValue(currentTween->initFrame() + 1);
-
-    int lastFrame = currentTween->initFrame() + currentTween->frames();
-    k->comboEnd->setValue(lastFrame);
-
-    checkFramesRange();
-
-    updateColor(currentTween->tweenInitialColor(), k->initColorButton);
-    updateColor(currentTween->tweenEndingColor(), k->endColorButton);
-
-    int iterations = currentTween->tweenColorIterations();
-
-    k->comboIterations->setValue(iterations);
-
-    k->loopBox->setChecked(currentTween->tweenColorLoop());
-    k->reverseLoopBox->setChecked(currentTween->tweenColorReverseLoop());
-}
-
-void Settings::initStartCombo(int framesTotal, int currentIndex)
-{
-    k->comboInit->clear();
-    k->comboEnd->clear();
-
-    k->comboInit->setMinimum(1);
-    k->comboInit->setMaximum(framesTotal);
-    k->comboInit->setValue(currentIndex + 1);
-
-    k->comboEnd->setMinimum(1);
-    k->comboEnd->setValue(framesTotal);
-}
-
-void Settings::setStartFrame(int currentIndex)
-{
-    k->comboInit->setValue(currentIndex + 1);
-    int end = k->comboEnd->value();
-    if (end < currentIndex+1)
-        k->comboEnd->setValue(currentIndex + 1);
-}
-
-int Settings::startFrame()
-{
-    return k->comboInit->value() - 1;
-}
-
-int Settings::startComboSize()
-{
-    return k->comboInit->maximum();
-}
-
-int Settings::totalSteps()
-{
-    return k->comboEnd->value() - (k->comboInit->value() - 1);
-}
-
-void Settings::setEditMode()
-{
-    k->mode = TupToolPlugin::Edit;
-    k->apply->setToolTip(tr("Update Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
-    k->remove->setToolTip(tr("Close Tween properties"));
-}
-
-void Settings::applyTween()
-{
-    if (!k->selectionDone) {
-        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
-        return;
-    }
-
-    if (!k->propertiesDone) {
-        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
-        return;
-    }
-
-    // SQA: Verify Tween is really well applied before call setEditMode!
-    setEditMode();
-
-    if (!k->comboInit->isEnabled())
-        k->comboInit->setEnabled(true);
-
-    emit clickedApplyTween();
-}
-
-void Settings::notifySelection(bool flag)
-{
-    k->selectionDone = flag;
-}
-
-void Settings::setInitialColor()
-{
-     k->initialColor = QColorDialog::getColor(k->initialColor, this);
-     updateColor(k->initialColor, k->initColorButton);
-}
-
-void Settings::setInitialColor(QColor color) {
-    k->initialColor = color;
-    k->endingColor = QColor("#fff");
-    updateColor(k->initialColor, k->initColorButton);
-    updateColor(k->endingColor, k->endColorButton);
-}
-
-QString Settings::currentTweenName() const
-{
-    QString tweenName = k->input->text();
-    if (tweenName.length() > 0)
-        k->input->setFocus();
-
-    return tweenName;
-}
-
-void Settings::emitOptionChanged(int option)
-{
-    switch (option) {
-            case 0:
-             {
-                 activeInnerForm(false);
-                 emit clickedSelect();
-             }
-            break;
-            case 1:
-             {
-                 if (k->selectionDone) {
-                     activeInnerForm(true);
-                     emit clickedDefineProperties();
-                 } else {
-                     k->options->setCurrentIndex(0);
-                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
-                 }
-             }
-    }
-}
-
-QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame)
-{
-    QDomDocument doc;
-
-    QDomElement root = doc.createElement("tweening");
-    root.setAttribute("name", currentTweenName());
-    root.setAttribute("type", TupItemTweener::Coloring);
-    root.setAttribute("initFrame", currentFrame);
-    root.setAttribute("initLayer", currentLayer);
-    root.setAttribute("initScene", currentScene);
-  
-    checkFramesRange();
-    root.setAttribute("frames", k->totalSteps);
-    root.setAttribute("origin", "0,0");
-
-    int initialRed = k->initialColor.red();
-    int initialGreen = k->initialColor.green();
-    int initialBlue = k->initialColor.blue();
-
-    QString colorText = QString::number(initialRed) + "," + QString::number(initialGreen)
-                        + "," + QString::number(initialBlue);
-    root.setAttribute("initialColor", colorText);
-
-    int endingRed = k->endingColor.red();
-    int endingGreen = k->endingColor.green();
-    int endingBlue = k->endingColor.blue();
-
-    colorText = QString::number(endingRed) + "," + QString::number(endingGreen)
-                        + "," + QString::number(endingBlue);
-    root.setAttribute("endingColor", colorText);
-
-    int iterations = k->comboIterations->value();
-    if (iterations == 0) {
-        iterations = 1;
-        k->comboIterations->setValue(1);
-    }
-    root.setAttribute("colorIterations", iterations);
-
-    bool loop = k->loopBox->isChecked();
-    if (loop)
-        root.setAttribute("colorLoop", "1");
-    else
-        root.setAttribute("colorLoop", "0");
-
-    bool reverse = k->reverseLoopBox->isChecked();
-    if (reverse)
-        root.setAttribute("colorReverseLoop", "1");
-    else
-        root.setAttribute("colorReverseLoop", "0");
-
-    double redDelta = (double)(initialRed - endingRed)/(double)(iterations - 1);
-    double greenDelta = (double)(initialGreen - endingGreen)/(double)(iterations - 1);
-    double blueDelta = (double)(initialBlue - endingBlue)/(double)(iterations - 1); 
-
-    double redReference = 0;
-    double greenReference = 0;
-    double blueReference = 0;
-
-    int cycle = 1;
-    int reverseTop = (iterations*2)-2;
-
-    for (int i=0; i < k->totalSteps; i++) {
-         if (cycle <= iterations) {
-             if (cycle == 1) {
-                 redReference = initialRed;
-                 greenReference = initialGreen;
-                 blueReference = initialBlue;
-             } else if (cycle == iterations) {
-                        redReference = endingRed;
-                        greenReference = endingGreen;
-                        blueReference = endingBlue;
-             } else {
-                 redReference -= redDelta;
-                 greenReference -= greenDelta;
-                 blueReference -= blueDelta;
-             }
-             cycle++;
-         } else {
-             // if repeat option is enabled
-             if (loop) { 
-                 cycle = 2;
-                 redReference = initialRed;
-                 greenReference = initialGreen;
-                 blueReference = initialBlue;
-             } else if (reverse) { // if reverse option is enabled
-                        redReference += redDelta;
-                        greenReference += greenDelta;
-                        blueReference += blueDelta;
-
-                        if (cycle < reverseTop)
-                            cycle++;
-                        else 
-                            cycle = 1;
-
-             } else { // If cycle is done and no loop and no reverse 
-                 redReference = initialRed;
-                 greenReference = initialGreen;
-                 blueReference = initialBlue;
-             }
-         }
-
-         TupTweenerStep *step = new TupTweenerStep(i);
-         QColor color = QColor(redReference, greenReference, blueReference);
-         step->setColor(color);
-         root.appendChild(step->toXml(doc));
-    }
-
-    doc.appendChild(root);
-
-    return doc.toString();
-}
-
-void Settings::activatePropertiesMode(TupToolPlugin::EditMode mode)
-{
-    k->options->setCurrentIndex(mode);
-}
-
-void Settings::checkBottomLimit(int index)
-{
-    emit startingPointChanged(index);
-    checkFramesRange();
-}
-
-void Settings::checkTopLimit(int index)
-{
-    Q_UNUSED(index);
-    checkFramesRange();
-}
-
-void Settings::checkFramesRange()
-{
-    int begin = k->comboInit->value();
-    int end = k->comboEnd->value();
-
-    if (begin > end) {
-        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
-        end = k->comboEnd->value();
-    }
-
-    k->totalSteps = end - begin + 1;
-    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
-}
-
-void Settings::updateLoopCheckbox(int state)
-{
-    Q_UNUSED(state);
-    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
-        k->loopBox->setChecked(false);
-}
-
-void Settings::updateReverseCheckbox(int state)
-{
-    Q_UNUSED(state);
-    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
-        k->reverseLoopBox->setChecked(false);
-}
-
-void Settings::setEndingColor()
-{
-     k->endingColor = QColorDialog::getColor(k->endingColor, this);
-     updateColor(k->endingColor, k->endColorButton);
-}
-
-void Settings::updateColor(QColor color, QPushButton *colorButton)
-{
-     if (color.isValid()) {
-         colorButton->setText(color.name());
-         colorButton->setPalette(QPalette(color));
-         colorButton->setAutoFillBackground(true);
-     }
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/coloringtool/settings.h tupi-0.2+git05/src/plugins/tools/coloringtool/settings.h
--- tupi-0.2+git04/src/plugins/tools/coloringtool/settings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/coloringtool/settings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
-#include "tuptoolplugin.h"
-
-#include <QWidget>
-#include <QPushButton>
-
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Settings : public QWidget 
-{
-    Q_OBJECT
-
-    public:
-        Settings(QWidget *parent = 0);
-        ~Settings();
-
-        void setParameters(const QString &name, int framesTotal, int startFrame);
-        void setParameters(TupItemTweener *currentTween);
-        void initStartCombo(int totalFrames, int currentIndex);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-
-        int totalSteps();
-
-        QString currentTweenName() const;
-        void activatePropertiesMode(TupToolPlugin::EditMode mode);
-        void notifySelection(bool flag);
-        int startComboSize();
-        void setInitialColor(QColor color);
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame);
-
-    private slots:
-        void applyTween();
-        void emitOptionChanged(int option);
-        void checkBottomLimit(int index);
-        void checkTopLimit(int index);
-        void updateLoopCheckbox(int state);
-        void updateReverseCheckbox(int state);
-        void setInitialColor();
-        void setEndingColor();
-        
-    signals:
-        void clickedSelect();
-        void clickedDefineProperties();
-        void clickedApplyTween();
-        void clickedResetTween();
-        void startingPointChanged(int index);
-        
-    private:
-        void setInnerForm();
-        void activeInnerForm(bool enable);
-        void setEditMode();
-        void checkFramesRange();
-        void updateColor(QColor color, QPushButton *colorButton);
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/coloringtool/tweener.cpp tupi-0.2+git05/src/plugins/tools/coloringtool/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/coloringtool/tweener.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/coloringtool/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,608 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tweener.h"
-#include "configurator.h"
-#include "tupgraphiclibraryitem.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "taction.h"
-#include "tosd.h"
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicsscene.h"
-#include "tupgraphicobject.h"
-#include "tuppathitem.h"
-#include "tupellipseitem.h"
-#include "tuplineitem.h"
-#include "tuprectitem.h"
-#include "tuppixmapitem.h"
-#include "tupsvgitem.h"
-#include "tupitemtweener.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QMatrix>
-#include <QGraphicsView>
-#include <QDomDocument>
-#include <QDir>
-
-struct Tweener::Private
-{
-    QMap<QString, TAction *> actions;
-    Configurator *configurator;
-
-    TupGraphicsScene *scene;
-    QList<QGraphicsItem *> objects;
-
-    TupItemTweener *currentTween;
-    int initFrame;
-    int initLayer;
-    int initScene;
-
-    TupToolPlugin::Mode mode;
-    TupToolPlugin::EditMode editMode;
-};
-
-Tweener::Tweener() : TupToolPlugin(), k(new Private)
-{
-    setupActions();
-    k->configurator = 0;
-}
-
-Tweener::~Tweener()
-{
-    delete k;
-}
-
-/* This method initializes the plugin */
-
-void Tweener::init(TupGraphicsScene *scene)
-{
-    k->scene = scene;
-    k->objects.clear();
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-
-    k->configurator->resetUI();
-
-    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Coloring);
-    if (tweenList.size() > 0) {
-        k->configurator->loadTweenList(tweenList);
-        setCurrentTween(tweenList.at(0));
-    }
-
-    int total = framesTotal();
-    k->configurator->initStartCombo(total, k->initFrame);
-}
-
-void Tweener::updateStartPoint(int index)
-{
-     if (k->initFrame != index && index >= 0)
-         k->initFrame = index;
-}
-
-/* This method returns the plugin name */
-
-QStringList Tweener::keys() const
-{
-    return QStringList() << tr("Coloring Tween");
-}
-
-/* This method makes an action when the mouse is pressed on the workspace 
- * depending on the active mode: Selecting an object or Creating a path  
-*/
-
-void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method is executed while the mouse is pressed and on movement */
-
-void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method finishes the action started on the press method depending
- * on the active mode: Selecting an object or Creating a path
-*/
-
-void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (scene->currentFrameIndex() == k->initFrame) {
-        if (k->editMode == TupToolPlugin::Selection) {
-            if (scene->selectedItems().size() > 0) {
-                k->objects = scene->selectedItems();
-                foreach (QGraphicsItem *item, k->objects) {
-                         if (TupGraphicLibraryItem *libraryItem = qgraphicsitem_cast<TupGraphicLibraryItem *>(item)) {
-                              if (libraryItem->type() == TupLibraryObject::Image) {
-                                  clearSelection();
-                                  TOsd::self()->display(tr("Error"), tr("Coloring Tween can't be applied to raster images"), TOsd::Error);
-                                  return;
-                              }
-                         }
-
-                         if (qgraphicsitem_cast<TupSvgItem *>(item)) {
-                             clearSelection();         
-                             TOsd::self()->display(tr("Error"), tr("Coloring Tween can't be applied to SVG files"), TOsd::Error);
-                             return;
-                         }
-                }
-
-                QGraphicsItem *item = k->objects.at(0);
-                QColor color = QColor("#fff");
-                if (TupPathItem *path = qgraphicsitem_cast<TupPathItem *>(item)) {
-                    color = path->pen().color();
-                } else if (TupEllipseItem *ellipse = qgraphicsitem_cast<TupEllipseItem *>(item)) {
-                           color = ellipse->pen().color();
-                } else if (TupLineItem *line = qgraphicsitem_cast<TupLineItem *>(item)) {
-                           color = line->pen().color();
-                } else if (TupRectItem *rect = qgraphicsitem_cast<TupRectItem *>(item)) {
-                           color = rect->pen().color();
-                }
-
-                k->configurator->setInitialColor(color);
-                k->configurator->notifySelection(true);
-            }
-        }
-    }
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-QMap<QString, TAction *> Tweener::actions() const
-{
-    return k->actions;
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-int Tweener::toolType() const
-{
-    return TupToolInterface::Tweener;
-}
-
-/* This method returns the tool panel associated to this plugin */
-
-QWidget *Tweener::configurator()
-{
-    if (!k->configurator) {
-        k->mode = TupToolPlugin::View;
-
-        k->configurator = new Configurator;
-        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
-        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
-        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
-        connect(k->configurator, SIGNAL(clickedDefineProperties()), this, SLOT(setPropertiesMode()));
-        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
-        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode))); 
-        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
-        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    } 
-
-    return k->configurator;
-}
-
-/* This method is called when there's a change on/of scene */
-void Tweener::aboutToChangeScene(TupGraphicsScene *)
-{
-}
-
-/* This method is called when this plugin is off */
-
-void Tweener::aboutToChangeTool()
-{
-}
-
-/* This method defines the actions contained in this plugin */
-
-void Tweener::setupActions()
-{
-    TAction *action = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "coloring_tween.png"),
-                                      tr("Coloring Tween"), this);
-    action->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
-    action->setShortcut(QKeySequence(tr("Shift+C")));
-
-    k->actions.insert(tr("Coloring Tween"), action);
-}
-
-/* This method saves the settings of this plugin */
-
-void Tweener::saveConfig()
-{
-}
-
-/* This method updates the workspace when the plugin changes the scene */
-
-void Tweener::updateScene(TupGraphicsScene *scene)
-{
-    k->mode = k->configurator->mode();
-
-    if (k->mode == TupToolPlugin::Edit) {
-        int framesNumber = framesTotal();
-
-        if (k->configurator->startComboSize() < framesNumber)
-            k->configurator->initStartCombo(framesNumber, k->initFrame);
-
-    } else if (k->mode == TupToolPlugin::Add) {
-               int total = framesTotal();
-
-               if (k->editMode == TupToolPlugin::Properties) {
-                   if (total > k->configurator->startComboSize()) {
-                       k->configurator->activateMode(TupToolPlugin::Selection);
-                       clearSelection();
-                       setSelection();
-                   }
-               } else if (k->editMode == TupToolPlugin::Selection) {
-                          if (scene->currentFrameIndex() != k->initFrame)
-                              clearSelection();
-                          k->initFrame = scene->currentFrameIndex();
-                          setSelection();
-               }
-
-               if (k->configurator->startComboSize() < total) {
-                   k->configurator->initStartCombo(total, k->initFrame);
-               } else {
-                   if (scene->currentFrameIndex() != k->initFrame)
-                       k->configurator->setStartFrame(scene->currentFrameIndex());
-               }
-
-    } else {
-        if (scene->currentFrameIndex() != k->initFrame)
-            k->configurator->setStartFrame(scene->currentFrameIndex());
-    }
-}
-
-void Tweener::setCurrentTween(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    k->currentTween = scene->tween(name, TupItemTweener::Coloring);
-    if (k->currentTween)
-        k->configurator->setCurrentTween(k->currentTween);
-}
-
-int Tweener::framesTotal()
-{
-    int total = 1;
-    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
-    if (layer)
-        total = layer->framesTotal();
-
-    return total;
-}
-
-/* This method clears selection */
-
-void Tweener::clearSelection()
-{
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 if (item->isSelected())
-                     item->setSelected(false);
-        }
-        k->objects.clear();
-        k->configurator->notifySelection(false);
-    }
-}
-
-/* This method disables object selection */
-
-void Tweener::disableSelection()
-{
-    foreach (QGraphicsView *view, k->scene->views()) {
-             view->setDragMode (QGraphicsView::NoDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-void Tweener::setSelection()
-{
-    k->editMode = TupToolPlugin::Selection;
-
-    int bottomBoundary = 20000 + (k->initLayer*10000);
-    int topBoundary = bottomBoundary + 10000;
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             view->setDragMode(QGraphicsView::RubberBandDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
-                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-             }
-    }
-
-    // When Object selection is enabled, previous selection is set
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                 item->setSelected(true);
-        }
-        QGraphicsItem *item = k->objects.at(0);
-        QColor color = QColor();
-        if (TupPathItem *path = qgraphicsitem_cast<TupPathItem *>(item)) {
-            color = path->pen().color();
-        } else if (TupEllipseItem *ellipse = qgraphicsitem_cast<TupEllipseItem *>(item)) {
-                   color = ellipse->pen().color();
-        } else if (TupLineItem *line = qgraphicsitem_cast<TupLineItem *>(item)) {
-                   color = line->pen().color();
-        } else if (TupRectItem *rect = qgraphicsitem_cast<TupRectItem *>(item)) {
-                   color = rect->pen().color(); 
-        }
-        k->configurator->setInitialColor(color);
-        k->configurator->notifySelection(true);
-    }
-}
-
-void Tweener::setPropertiesMode()
-{
-    k->editMode = TupToolPlugin::Properties;
-    disableSelection();
-}
-
-/* This method resets this plugin */
-
-void Tweener::applyReset()
-{
-    disableSelection();
-    clearSelection();
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-}
-
-/* This method applies to the project, the Tween created from this plugin */
-
-void Tweener::applyTween()
-{
-    QString name = k->configurator->currentTweenName();
-
-    if (name.length() == 0) {
-        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
-        return;
-    }
-
-    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Coloring)) {
-        k->initFrame = k->scene->currentFrameIndex();
-        k->initLayer = k->scene->currentLayerIndex();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 int objectIndex = -1;
-
-                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = k->scene->currentFrame()->indexOf(svg);
-                 } else {
-                     objectIndex = k->scene->currentFrame()->indexOf(item);
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex, QPointF(), k->scene->spaceMode(),
-                                             type, TupProjectRequest::SetTween,
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame));
-                 emit requested(&request);
-        }
-    } else {
-        removeTweenFromProject(name);
-        QList<QGraphicsItem *> newList;
-
-        k->initFrame = k->configurator->startFrame();
-        k->initLayer = k->currentTween->initLayer();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 TupProject *project = k->scene->scene()->project();
-                 TupScene *scene = project->scene(k->initScene);
-                 TupLayer *layer = scene->layer(k->initLayer);
-                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
-                 int objectIndex = -1;
-                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
-
-                 if (svg) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = frame->indexOf(svg);
-                 } else {
-                     objectIndex = frame->indexOf(item);
-                 }
-
-                 if (k->initFrame != k->currentTween->initFrame()) {
-                     QDomDocument dom;
-                     if (type == TupLibraryObject::Svg)
-                         dom.appendChild(svg->toXml(dom));
-                     else
-                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
-
-                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame,
-                                                                                      0, QPointF(), k->scene->spaceMode(),
-                                                                                      type, TupProjectRequest::Add,
-                                                                                      dom.toString());
-                     emit requested(&request);
-
-                     request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer,
-                                                                    k->currentTween->initFrame(),
-                                                                    objectIndex, QPointF(), 
-                                                                    k->scene->spaceMode(), type,
-                                                                    TupProjectRequest::Remove);
-                     emit requested(&request);
-
-                     frame = layer->frame(k->initFrame);
-                     if (type == TupLibraryObject::Item) {
-                         objectIndex = frame->graphicItemsCount() - 1;
-                         newList.append(frame->graphic(objectIndex)->item());
-                     } else {
-                         objectIndex = frame->svgItemsCount() - 1;
-                         newList.append(frame->svg(objectIndex));
-                     }
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex, QPointF(), k->scene->spaceMode(),
-                                             type, TupProjectRequest::SetTween,
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame));
-                 emit requested(&request);
-        }
-
-        if (newList.size() > 0)
-            k->objects = newList;
-    }
-
-    int total = k->initFrame + k->configurator->totalSteps();
-    int framesNumber = framesTotal();
-    int layersTotal = k->scene->scene()->layersTotal();
-    TupProjectRequest request;
-
-    if (total >= framesNumber) {
-        for (int i = framesNumber; i < total; i++) {
-             for (int j = 0; j < layersTotal; j++) {
-                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i,
-                                                                  TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
-                  emit requested(&request);
-             }
-        }
-    }
-
-    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
-                                                    TupProjectRequest::Select, "1");
-    emit requested(&request);
-
-    setCurrentTween(name);
-    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
-}
-
-void Tweener::removeTweenFromProject(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    scene->removeTween(name, TupItemTweener::Coloring);
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      QString tip = item->toolTip();
-                      if (tip.startsWith(tr("Coloring Tween") + ": " + name))
-                          item->setToolTip("");
-             }
-    }
-}
-
-void Tweener::removeTween(const QString &name)
-{
-    removeTweenFromProject(name);
-    applyReset();
-}
-
-void Tweener::updateMode(TupToolPlugin::Mode mode)
-{
-    k->mode = mode;
-
-    if (k->mode == TupToolPlugin::Edit) {
-        k->initScene = k->currentTween->initScene();
-        k->initLayer = k->currentTween->initLayer();
-        k->initFrame = k->currentTween->initFrame();
-
-        if (k->initFrame != k->scene->currentFrameIndex()) {
-            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
-                                                                              TupProjectRequest::Select, "1");
-            emit requested(&request);
-
-            if (k->objects.isEmpty())
-                k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Coloring);
-        }
-    }
-}
-
-void Tweener::sceneResponse(const TupSceneResponse *event)
-{
-    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
-        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
-        init(k->scene);
-    }
-
-    if (event->action() == TupProjectRequest::Select)
-        init(k->scene);
-}
-
-void Tweener::layerResponse(const TupLayerResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove)
-        init(k->scene);
-}
-
-void Tweener::frameResponse(const TupFrameResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
-        init(k->scene);
-
-    if (event->action() == TupProjectRequest::Select) {
-        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
-            init(k->scene);
-    }
-}
-
-Q_EXPORT_PLUGIN2(tup_tweener, Tweener);
diff -Nru tupi-0.2+git04/src/plugins/tools/coloringtool/tweener.h tupi-0.2+git05/src/plugins/tools/coloringtool/tweener.h
--- tupi-0.2+git04/src/plugins/tools/coloringtool/tweener.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/coloringtool/tweener.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef COLORINGTWEENER_H
-#define COLORINGTWEENER_H
-
-#include "tuptoolplugin.h"
-#include "settings.h"
-#include "tupprojectresponse.h"
-
-/**
- * @author Gustav Gonzalez 
- * 
-*/
-
-class Tweener : public TupToolPlugin
-{
-    Q_OBJECT
-
-    public:
-        Tweener();
-        virtual ~Tweener();
-        virtual void init(TupGraphicsScene *scene);
-
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-        virtual QWidget *configurator();
-
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-
-        virtual void updateScene(TupGraphicsScene *scene);
-        virtual void saveConfig();
-
-        virtual void sceneResponse(const TupSceneResponse *event);
-        virtual void layerResponse(const TupLayerResponse *event);
-        virtual void frameResponse(const TupFrameResponse *event);
-
-    private:
-        void setupActions();
-        int framesTotal();
-        void clearSelection();
-        void disableSelection();
-        void removeTweenFromProject(const QString &name);
-
-    private:
-        struct Private;
-        Private *const k;
-
-    private slots:
-        void setCurrentTween(const QString &name);
-        void setSelection();
-        void setPropertiesMode(); 
-        void updateMode(TupToolPlugin::Mode mode);
-        void updateStartPoint(int index);
-        void applyReset();
-        void applyTween();
-        void removeTween(const QString &name);
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/common/buttonspanel.cpp tupi-0.2+git05/src/plugins/tools/common/buttonspanel.cpp
--- tupi-0.2+git04/src/plugins/tools/common/buttonspanel.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/buttonspanel.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,12 +34,6 @@
  ***************************************************************************/
 
 #include "buttonspanel.h"
-#include "timagebutton.h"
-#include "tdebug.h"
-
-#include <QHBoxLayout>
-#include <QBoxLayout>
-#include <QDir>
 
 ButtonsPanel::ButtonsPanel(QWidget *parent) : QWidget(parent)
 {
diff -Nru tupi-0.2+git04/src/plugins/tools/common/buttonspanel.h tupi-0.2+git05/src/plugins/tools/common/buttonspanel.h
--- tupi-0.2+git04/src/plugins/tools/common/buttonspanel.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/buttonspanel.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,15 +36,20 @@
 #ifndef BUTTONSPANEL_H
 #define BUTTONSPANEL_H
 
+#include "tglobal.h"
 #include "tapplicationproperties.h"
+#include "timagebutton.h"
 
 #include <QWidget>
+#include <QHBoxLayout>
+#include <QBoxLayout>
+#include <QDir>
 
 /**
  * @author Gustav Gonzalez 
 */
 
-class ButtonsPanel: public QWidget 
+class TUPI_EXPORT ButtonsPanel: public QWidget 
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/plugins/tools/common/common.pri tupi-0.2+git05/src/plugins/tools/common/common.pri
--- tupi-0.2+git04/src/plugins/tools/common/common.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/common.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,5 +1,9 @@
-
 INCLUDEPATH += $$COMMON_DIR
 
-LIBS += -L$$COMMON_DIR -ltupiplugincommon
+unix {
+    LIBS += -L$$COMMON_DIR -ltupiplugincommon
+}
 
+win32 {
+    LIBS += -L$$COMMON_DIR/release/ -ltupiplugincommon
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/common/common.pro tupi-0.2+git05/src/plugins/tools/common/common.pro
--- tupi-0.2+git04/src/plugins/tools/common/common.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/common.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,7 +1,14 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/common.pro
-# Target is a library:  
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
 
 INSTALLS += target 
 target.path = /lib/ 
@@ -25,6 +32,7 @@
            stepsviewer.cpp \
            spinboxdelegate.cpp \
            target.cpp
+		   
 *:!macx {
     CONFIG += dll warn_on
 }
@@ -34,6 +42,11 @@
 
 FRAMEWORK_DIR = "../../../framework"
 include($$FRAMEWORK_DIR/framework.pri)
-include(./tools_config.pri)
 
-include(../../../../tupiglobal.pri)
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+LIBBASE_DIR = ../../../libbase
+
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$LIBBASE_DIR/libbase.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/common/spinboxdelegate.cpp tupi-0.2+git05/src/plugins/tools/common/spinboxdelegate.cpp
--- tupi-0.2+git04/src/plugins/tools/common/spinboxdelegate.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/spinboxdelegate.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,9 +34,6 @@
  ***************************************************************************/
 
 #include "spinboxdelegate.h"
-#include "tdebug.h"
-
-#include <QModelIndex>
 
 SpinBoxDelegate::SpinBoxDelegate(QObject *parent)
     : QItemDelegate(parent)
@@ -62,7 +59,7 @@
 }
 
 void SpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
-                    const QModelIndex &index)
+                    const QModelIndex &index) const
 {
     QSpinBox *spinBox = static_cast<QSpinBox*>(editor);
     spinBox->interpretText();
diff -Nru tupi-0.2+git04/src/plugins/tools/common/spinboxdelegate.h tupi-0.2+git05/src/plugins/tools/common/spinboxdelegate.h
--- tupi-0.2+git04/src/plugins/tools/common/spinboxdelegate.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/spinboxdelegate.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,24 +36,27 @@
 #ifndef SPINBOXDELEGATE_H
 #define SPINBOXDELEGATE_H
 
+#include "tglobal.h"
+
 #include <QItemDelegate>
 #include <QSpinBox>
+#include <QModelIndex>
 
-class SpinBoxDelegate : public QItemDelegate
+class TUPI_EXPORT SpinBoxDelegate : public QItemDelegate
 {
     Q_OBJECT
+
     public:
         SpinBoxDelegate(QObject *parent = 0);
         QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,  const QModelIndex &index) const;
 
         void setEditorData(QWidget *editor, const QModelIndex &index) const;
-        void setModelData(QWidget *editor, QAbstractItemModel *model,
-                  const QModelIndex &index);
+        virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
 
         void updateEditorGeometry(QWidget *editor,
                       const QStyleOptionViewItem &option, const QModelIndex &index) const;
     signals:
-        void dataUpdated();
+        void dataUpdated() const;
 };
 
 #endif
diff -Nru tupi-0.2+git04/src/plugins/tools/common/stepsviewer.cpp tupi-0.2+git05/src/plugins/tools/common/stepsviewer.cpp
--- tupi-0.2+git04/src/plugins/tools/common/stepsviewer.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/stepsviewer.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,17 +34,6 @@
  ***************************************************************************/
 
 #include "stepsviewer.h"
-#include "tuptweenerstep.h"
-#include "spinboxdelegate.h"
-#include "tpushbutton.h"
-#include "tdebug.h"
-
-#include <cmath>
-#include <QGraphicsPathItem>
-#include <QDebug>
-#include <QBoxLayout>
-#include <QHeaderView>
-#include <QPainter>
 
 struct StepsViewer::Private
 {
@@ -100,7 +89,6 @@
     QPolygonF points = path->path().toFillPolygon();
 
     if (points.count() > 2) {
-
         int count = 0; 
 
         k->points.clear();
@@ -216,6 +204,8 @@
     for (int i=0; i < k->dots->size(); i++) {
          // TupTweenerStep *step = new TupTweenerStep(count);
          TupTweenerStep *step = new TupTweenerStep(i);
+
+         // QPointF point = k->dots->at(i); 
          step->setPosition(k->dots->at(i));
          stepsVector << step;
          // count++;
diff -Nru tupi-0.2+git04/src/plugins/tools/common/stepsviewer.h tupi-0.2+git05/src/plugins/tools/common/stepsviewer.h
--- tupi-0.2+git04/src/plugins/tools/common/stepsviewer.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/stepsviewer.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,16 +36,27 @@
 #ifndef STEPSVIEWER_H
 #define STEPSVIEWER_H
 
+#include "tglobal.h"
+#include "tuptweenerstep.h"
+#include "spinboxdelegate.h"
+#include "tpushbutton.h"
+
 #include <QTableWidget>
+#include <cmath>
+#include <QGraphicsPathItem>
+#include <QDebug>
+#include <QBoxLayout>
+#include <QHeaderView>
+#include <QPainter>
 
-class QGraphicsPathItem;
-class TupTweenerStep;
+// class QGraphicsPathItem;
+// class TupTweenerStep;
 
 /**
  * @author Jorge Cuadrado 
 */
 
-class StepsViewer : public QTableWidget
+class TUPI_EXPORT StepsViewer : public QTableWidget
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/plugins/tools/common/target.cpp tupi-0.2+git05/src/plugins/tools/common/target.cpp
--- tupi-0.2+git04/src/plugins/tools/common/target.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/target.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,17 +34,6 @@
  ***************************************************************************/
 
 #include "target.h"
-#include "tdebug.h"
-#include "tupgraphicalgorithm.h"
-#include "tupgraphicobject.h"
-
-#include <QCursor>
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#include <QStyleOption>
-#include <QStyleOptionButton>
-#include <QApplication>
 
 /**
  * This class defines the data structure for a node, and all the methods required to manipulate it.
@@ -52,7 +41,8 @@
  * @author Gustav Gonzalez 
 */
 
-Target::Target(const QPointF & pos, int zLevel, QGraphicsScene *scene) : QGraphicsItem(0, scene)
+// Target::Target(const QPointF & pos, int zLevel, QGraphicsScene *scene) : QGraphicsItem(0, scene)
+Target::Target(const QPointF & pos, int zLevel) : QGraphicsItem(0)
 {
     QGraphicsItem::setCursor(QCursor(Qt::PointingHandCursor));
     setFlag(ItemIsSelectable, false);
@@ -110,7 +100,11 @@
 void Target::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Target::mouseReleaseEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     emit positionUpdated(event->scenePos()); 
diff -Nru tupi-0.2+git04/src/plugins/tools/common/target.h tupi-0.2+git05/src/plugins/tools/common/target.h
--- tupi-0.2+git04/src/plugins/tools/common/target.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/target.h	2014-12-15 14:21:33.000000000 +0000
@@ -33,25 +33,36 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef NODE_H
-#define NODE_H
+#ifndef TARGET_H
+#define TARGET_H
+
+#include "tglobal.h"
+#include "tupgraphicalgorithm.h"
+#include "tupgraphicobject.h"
 
 #include <QGraphicsItem>
 #include <QObject>
 #include <QPointF>
+#include <QCursor>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QStyleOption>
+#include <QStyleOptionButton>
+#include <QApplication>
 
 /**
  * @author Gustav Gonzalez 
 */
 
-class Target : public QObject, public QGraphicsItem
+class TUPI_EXPORT Target : public QObject, public QGraphicsItem
 {
     Q_OBJECT
     Q_INTERFACES(QGraphicsItem)
     
     public:
         
-        Target(const QPointF & pos = QPoint(0,0), int zLevel = 0, QGraphicsScene * scene = 0);
+        Target(const QPointF & pos = QPoint(0,0), int zLevel = 0);
         ~Target();
         
         void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *);
diff -Nru tupi-0.2+git04/src/plugins/tools/common/tools_config.pri tupi-0.2+git05/src/plugins/tools/common/tools_config.pri
--- tupi-0.2+git04/src/plugins/tools/common/tools_config.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/tools_config.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,4 +1,3 @@
-
 STORE_DIR = ../../../../src/store
 LIBTUPI_DIR = ../../../../src/libtupi
 LIBBASE_DIR = ../../../../src/libbase
diff -Nru tupi-0.2+git04/src/plugins/tools/common/tweenmanager.cpp tupi-0.2+git05/src/plugins/tools/common/tweenmanager.cpp
--- tupi-0.2+git04/src/plugins/tools/common/tweenmanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/tweenmanager.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -34,16 +34,6 @@
  ***************************************************************************/
 
 #include "tweenmanager.h"
-#include "timagebutton.h"
-#include "tosd.h"
-#include "tdebug.h"
-
-#include <QHBoxLayout>
-#include <QBoxLayout>
-#include <QLineEdit>
-#include <QListWidget>
-#include <QMenu>
-#include <QDir>
 
 struct TweenManager::Private
 {
diff -Nru tupi-0.2+git04/src/plugins/tools/common/tweenmanager.h tupi-0.2+git05/src/plugins/tools/common/tweenmanager.h
--- tupi-0.2+git04/src/plugins/tools/common/tweenmanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/common/tweenmanager.h	2014-12-15 14:21:33.000000000 +0000
@@ -36,20 +36,30 @@
 #ifndef TWEENMANAGER_H
 #define TWEENMANAGER_H
 
+#include "tglobal.h"
+#include "timagebutton.h"
+#include "tosd.h"
+
 #include <QWidget>
+#include <QHBoxLayout>
+#include <QBoxLayout>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QMenu>
+#include <QDir>
 
 /**
  * @author Gustav Gonzalez 
 */
 
-class QListWidgetItem;
+// class QListWidgetItem;
 
-class TweenManager: public QWidget 
+class TUPI_EXPORT TweenManager: public QWidget 
 {
     Q_OBJECT
 
     public:
-
         TweenManager(QWidget *parent = 0);
         ~TweenManager();
         void loadTweenList(QList<QString> tweenList);
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/compound.pro tupi-0.2+git05/src/plugins/tools/compound/compound.pro
--- tupi-0.2+git04/src/plugins/tools/compound/compound.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/compound.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,44 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += tweener.h \
+           configurator.h \
+           tweenerpanel.h \
+           tweenertable.h \
+           positionsettings.h
+
+SOURCES += tweener.cpp \
+           # buttonspanel.cpp \
+           configurator.cpp \
+           tweenerpanel.cpp \
+           tweenertable.cpp \
+           positionsettings.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupicompoundtool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/compoundtool.json tupi-0.2+git05/src/plugins/tools/compound/compoundtool.json
--- tupi-0.2+git04/src/plugins/tools/compound/compoundtool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/compoundtool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "CompoundTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/configurator.cpp tupi-0.2+git05/src/plugins/tools/compound/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/compound/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,328 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+#include "tweenmanager.h"
+#include "buttonspanel.h"
+#include "tupitemtweener.h"
+#include "tosd.h"
+
+struct Configurator::Private
+{
+    QBoxLayout *layout;
+    QBoxLayout *settingsLayout;
+
+    TweenerPanel *tweenList;
+    TweenManager *tweenManager;
+    ButtonsPanel *controlPanel;
+
+    TupItemTweener *currentTween;
+
+    int framesTotal;
+    int currentFrame;
+
+    TweenerPanel::Mode mode;
+    Configurator::GuiState state;
+};
+
+Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
+{
+    k->framesTotal = 1;
+    k->currentFrame = 0;
+
+    k->mode = TweenerPanel::View;
+    k->state = Configurator::Manager;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    QLabel *title = new QLabel(tr("Compound Tween"));
+    title->setAlignment(Qt::AlignHCenter);
+    title->setFont(QFont("Arial", 8, QFont::Bold));
+
+    k->layout->addWidget(title);
+
+    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    k->settingsLayout->setMargin(0);
+    k->settingsLayout->setSpacing(0);
+
+    setTweenManagerPanel();
+    setButtonsPanel();
+    setTweenerPanel();
+
+    k->layout->addLayout(k->settingsLayout);
+    k->layout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    delete k;
+}
+
+void Configurator::setTweenManagerPanel()
+{
+    k->tweenManager = new TweenManager(this);
+    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
+    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
+
+    k->settingsLayout->addWidget(k->tweenManager);
+
+    k->state = Configurator::Manager;
+}
+
+void Configurator::activeTweenManagerPanel(bool enable)
+{
+    if (enable)
+        k->tweenManager->show();
+    else
+        k->tweenManager->hide();
+
+    if (k->tweenManager->listSize() > 0)
+        activeButtonsPanel(enable);
+}
+
+void Configurator::setTweenerPanel()
+{
+    k->tweenList = new TweenerPanel(this);
+
+    connect(k->tweenList, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
+    connect(k->tweenList, SIGNAL(clickedTweenProperties()), this, SIGNAL(clickedTweenProperties()));
+    connect(k->tweenList, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
+
+    connect(k->tweenList, SIGNAL(tweenPropertiesActivated(TweenerPanel::TweenerType)), 
+            this, SIGNAL(tweenPropertiesActivated(TweenerPanel::TweenerType)));
+
+    connect(k->tweenList, SIGNAL(startingPointChanged(int)), 
+            this, SIGNAL(startingPointChanged(int)));
+
+    connect(k->tweenList, SIGNAL(clickedResetTween()), this, SLOT(closeTweenList()));
+    connect(k->tweenList, SIGNAL(loadPath(bool, bool)), this, SIGNAL(loadPath(bool, bool)));
+
+    k->settingsLayout->addWidget(k->tweenList);
+    activeTweenerPanel(false);
+}
+
+void Configurator::activeTweenerPanel(bool enable)
+{
+    if (enable)
+        k->tweenList->show();
+    else
+        k->tweenList->hide();
+}
+
+void Configurator::setButtonsPanel()
+{
+    k->controlPanel = new ButtonsPanel(this);
+    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
+    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
+
+    k->settingsLayout->addWidget(k->controlPanel);
+
+    activeButtonsPanel(false);
+}
+
+void Configurator::activeButtonsPanel(bool enable)
+{
+    if (enable)
+        k->controlPanel->show();
+    else
+        k->controlPanel->hide();
+}
+
+void Configurator::setCurrentTween(TupItemTweener *currentTween)
+{
+    k->currentTween = currentTween;
+}
+
+void Configurator::loadTweenList(QList<QString> tweenList)
+{
+    k->tweenManager->loadTweenList(tweenList);
+    if (tweenList.count() > 0)
+        activeButtonsPanel(true);
+}
+
+void Configurator::initStartCombo(int framesTotal, int currentFrame)
+{
+    k->framesTotal = framesTotal;
+    k->currentFrame = currentFrame;
+    k->tweenList->initStartCombo(framesTotal, currentFrame);
+}
+
+void Configurator::setStartFrame(int currentIndex)
+{
+    k->currentFrame = currentIndex;
+    k->tweenList->setStartFrame(currentIndex);
+}
+
+int Configurator::startComboSize()
+{
+    return k->tweenList->startComboSize();
+}
+
+void Configurator::updateSteps(const QGraphicsPathItem *path, QPointF offset)
+{
+    k->tweenList->updateSteps(path, offset);
+}
+
+QString Configurator::tweenToXml(int currentFrame, QPointF point)
+{
+    return k->tweenList->tweenToXml(currentFrame, point);
+}
+
+int Configurator::totalSteps()
+{
+    return k->tweenList->totalSteps();
+}
+
+void Configurator::activateMode(TweenerPanel::EditMode mode)
+{
+    k->tweenList->activateMode(mode);
+}
+
+void Configurator::addTween(const QString &name)
+{
+    activeTweenManagerPanel(false);
+
+    k->mode = TweenerPanel::Add;
+    k->state = Configurator::TweenSettings;
+
+    // tFatal() << "Configurator::addTween() - framesTotal: " << k->framesTotal;
+    // tFatal() << "Configurator::addTween() - currentFrame: " << k->currentFrame;
+
+    k->tweenList->setParameters(name, k->framesTotal, k->currentFrame);
+    activeTweenerPanel(true);
+
+    emit setMode(k->mode);
+}
+
+void Configurator::editTween()
+{
+    activeTweenManagerPanel(false);
+
+    k->mode = TweenerPanel::Edit;
+    k->state = Configurator::TweenSettings;
+
+    k->tweenList->notifySelection(true);
+    k->tweenList->setParameters(k->currentTween);
+    activeTweenerPanel(true);
+
+    // tFatal() << "Configurator::editTween() - Calling for Edition order!!!";
+
+    emit setMode(k->mode);
+}
+
+void Configurator::removeTween()
+{
+    QString name = k->tweenManager->currentTweenName();
+    k->tweenManager->removeItemFromList();
+
+    removeTween(name);
+}
+
+void Configurator::removeTween(const QString &name)
+{
+    if (k->tweenManager->listSize() == 0)
+        activeButtonsPanel(false);
+
+    emit clickedRemoveTween(name);
+}
+
+QString Configurator::currentTweenName() const
+{
+    QString oldName = k->tweenManager->currentTweenName();
+    QString newName = k->tweenList->currentTweenName();
+
+    if (oldName.compare(newName) != 0)
+        k->tweenManager->updateTweenName(newName);
+
+    return newName;
+}
+
+void Configurator::notifySelection(bool flag)
+{
+    k->tweenList->notifySelection(flag);
+}
+
+void Configurator::cleanTweensForms()
+{
+    k->tweenList->cleanTweensForms();
+}
+
+void Configurator::closeTweenList()
+{
+    if (k->mode == TweenerPanel::Add)
+        k->tweenManager->removeItemFromList();
+
+    emit clickedResetInterface();
+
+    closeTweenerPanel();
+}
+
+void Configurator::closeTweenerPanel()
+{
+    if (k->state == Configurator::TweenSettings) {
+        activeTweenManagerPanel(true);
+        activeTweenerPanel(false);
+        k->mode = TweenerPanel::View;
+        k->state = Configurator::Manager;
+    }
+}
+
+TweenerPanel::Mode Configurator::mode()
+{
+    return k->mode;
+}
+
+void Configurator::applyItem()
+{
+     k->mode = TweenerPanel::Edit;
+     emit clickedApplyTween();
+}
+
+void Configurator::resetUI()
+{
+    k->tweenManager->resetUI();
+    closeTweenerPanel();
+    k->tweenList->notifySelection(false);
+    k->tweenList->resetTweener();
+}
+
+void Configurator::updateTweenData(const QString &name)
+{
+    emit getTweenData(name);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/configurator.h tupi-0.2+git05/src/plugins/tools/compound/configurator.h
--- tupi-0.2+git04/src/plugins/tools/compound/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,118 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "tglobal.h"
+#include "tweenerpanel.h"
+
+#include <QFrame>
+#include <QLabel>
+#include <QBoxLayout>
+
+class QGraphicsPathItem;
+class QListWidgetItem;
+class TupItemTweener;
+// class TweenerPanel;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Configurator : public QFrame
+{
+    Q_OBJECT
+
+    public:
+        enum GuiState { Manager = 1, TweenSettings };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+
+        void loadTweenList(QList<QString> tweenList);
+
+        void initStartCombo(int framesTotal, int currentFrame);
+        void setStartFrame(int currentIndex);
+
+        void updateSteps(const QGraphicsPathItem *path, QPointF offset);
+
+        int totalSteps();
+        void activateMode(TweenerPanel::EditMode mode);
+
+        void cleanTweensForms();
+        void setCurrentTween(TupItemTweener *currentTween);
+        QString currentTweenName() const;
+        void notifySelection(bool flag);
+        int startComboSize();
+        void closeTweenerPanel();
+        TweenerPanel::Mode mode();
+        void resetUI();
+        QString tweenToXml(int currentFrame, QPointF point);
+        
+    private slots:
+        void applyItem();
+        void addTween(const QString &name);
+        void editTween();
+        void removeTween();
+        void removeTween(const QString &name);
+        void closeTweenList();
+        void updateTweenData(const QString &name);
+        
+    signals:
+        void clickedSelect();
+        void clickedTweenProperties();
+        void tweenPropertiesActivated(TweenerPanel::TweenerType flag);
+        void setMode(TweenerPanel::Mode mode);
+        void clickedRemoveTween(const QString &name);
+        void clickedApplyTween();
+        void clickedResetInterface();
+        void loadPath(bool enable, bool reset);
+        void getTweenData(const QString &name);
+        void startingPointChanged(int index);
+
+    private:
+        void setTweenerPanel();
+        void activeTweenerPanel(bool enable);
+        void setTweenManagerPanel();
+        void activeTweenManagerPanel(bool enable);
+        void setButtonsPanel();
+        void activeButtonsPanel(bool enable);
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/positionsettings.cpp tupi-0.2+git05/src/plugins/tools/compound/positionsettings.cpp
--- tupi-0.2+git04/src/plugins/tools/compound/positionsettings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/positionsettings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,315 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "positionsettings.h"
+#include "tradiobuttongroup.h"
+#include "tseparator.h"
+#include "timagebutton.h"
+#include "tupitemtweener.h"
+#include "stepsviewer.h"
+#include "tuptweenerstep.h"
+#include "tosd.h"
+
+struct PositionSettings::Private
+{
+    QBoxLayout *layout; 
+
+    StepsViewer *stepViewer;
+    QComboBox *comboInit;
+    QLabel *totalLabel;
+    TweenerPanel::Mode mode; 
+
+    const QGraphicsPathItem *path;
+    QPointF offset;
+
+    TImageButton *applyButton;
+    TImageButton *closeButton;
+};
+
+PositionSettings::PositionSettings(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    setFont(QFont("Arial", 8, QFont::Normal, false));
+
+    QLabel *componentLabel = new QLabel(tr("Component") + ": ");
+    componentLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+
+    QLabel *componentName = new QLabel(tr("Position"));
+    componentName->setAlignment(Qt::AlignHCenter);
+    componentName->setFont(QFont("Arial", 8, QFont::Bold));
+
+    QHBoxLayout *labelLayout = new QHBoxLayout;
+    labelLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    labelLayout->setMargin(0);
+    labelLayout->setSpacing(0);
+    labelLayout->addWidget(componentLabel);
+    labelLayout->addWidget(componentName);
+
+    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
+    startingLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    k->comboInit = new QComboBox();
+    k->comboInit->setFixedWidth(60);
+
+    // SQA: Remove this instruction in the right moment
+    // k->comboInit->setEnabled(false);
+
+    connect(k->comboInit, SIGNAL(currentIndexChanged(int)), this, SIGNAL(startingPointChanged(int)));
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(k->comboInit);
+
+    k->layout->addLayout(labelLayout);
+    k->layout->addWidget(new TSeparator(Qt::Horizontal));
+
+    k->layout->addWidget(startingLabel);
+    k->layout->addLayout(startLayout);
+
+    k->stepViewer = new StepsViewer;
+    k->stepViewer->verticalHeader()->hide();
+
+    k->layout->addWidget(k->stepViewer);
+
+    k->totalLabel = new QLabel(tr("Frames Total") + ": 0");
+    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    QHBoxLayout *totalLayout = new QHBoxLayout;
+    totalLayout->setAlignment(Qt::AlignHCenter);
+    totalLayout->setMargin(0);
+    totalLayout->setSpacing(0);
+    totalLayout->addWidget(k->totalLabel);
+
+    k->layout->addLayout(totalLayout);
+
+    k->applyButton = new TImageButton(QPixmap(kAppProp->themeDir() + "/"  + "icons/save.png"), 22);
+    connect(k->applyButton, SIGNAL(clicked()), this, SLOT(applyTween()));
+    k->applyButton->setEnabled(false);
+
+    k->closeButton = new TImageButton(QPixmap(kAppProp->themeDir() + "/"  + "icons/close.png"), 22);
+    connect(k->closeButton, SIGNAL(clicked()), this, SLOT(closeTweenProperties()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(10);
+    buttonsLayout->addWidget(k->applyButton);
+    buttonsLayout->addWidget(k->closeButton);
+
+    k->layout->addSpacing(10);
+    k->layout->addLayout(buttonsLayout);
+    k->layout->setSpacing(5);
+}
+
+PositionSettings::~PositionSettings()
+{
+    delete k;
+}
+
+// Adding new Tween
+
+void PositionSettings::setParameters(int framesTotal, int initFrame)
+{
+    k->mode = TweenerPanel::Add;
+
+    k->stepViewer->cleanRows();
+    k->totalLabel->setText(tr("Frames Total") + ": 0");
+
+    k->comboInit->setEnabled(false);
+    k->closeButton->setIcon(QPixmap(kAppProp->themeDir() + "/"  + "icons/close.png"));
+    k->closeButton->setToolTip(tr("Cancel Tween"));
+
+    initStartCombo(framesTotal, initFrame);
+}
+
+// Editing new Tween
+
+void PositionSettings::setParameters(TupItemTweener *currentTween)
+{
+    setEditMode();
+
+    k->comboInit->setEnabled(true);
+
+    initStartCombo(currentTween->frames(), currentTween->initFrame());
+
+    k->stepViewer->setPath(currentTween->graphicsPath());
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->stepViewer->totalSteps()));
+}
+
+void PositionSettings::initStartCombo(int framesTotal, int currentIndex)
+{
+    k->comboInit->clear();
+    for (int i=1; i<=framesTotal; i++)
+         k->comboInit->addItem(QString::number(i));
+
+    k->comboInit->setCurrentIndex(currentIndex);
+}
+
+void PositionSettings::setStartFrame(int currentIndex)
+{
+    k->comboInit->setCurrentIndex(currentIndex);
+}
+
+int PositionSettings::initFrame()
+{
+    return k->comboInit->currentIndex();
+}
+
+int PositionSettings::startComboSize()
+{
+    return k->comboInit->count();
+}
+
+void PositionSettings::updateSteps(const QGraphicsPathItem *path, QPointF offset)
+{
+    k->path = path;
+    k->offset = offset;
+    k->stepViewer->setPath(path);
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->stepViewer->totalSteps()));
+
+    if (!k->applyButton->isEnabled())
+        k->applyButton->setEnabled(true);
+}
+
+int PositionSettings::totalSteps()
+{
+    return k->stepViewer->totalSteps();
+}
+
+void PositionSettings::applyTween()
+{
+    if (totalSteps() <= 2) {
+        TOsd::self()->display(tr("Info"), tr("You must define a path for this Tween!"), TOsd::Info);
+        return;
+    }
+
+    setEditMode();
+
+    if (!k->comboInit->isEnabled())
+        k->comboInit->setEnabled(true);
+
+    QString text(tr("Position Tween is set!")); 
+
+    emit clickedApplyTween(TweenerPanel::Position, text);
+}
+
+void PositionSettings::resetTween()
+{
+    k->stepViewer->cleanRows();
+    k->totalLabel->setText(tr("Frames Total") + ": 0");
+}
+
+void PositionSettings::closeTweenProperties()
+{
+    if (k->mode == TweenerPanel::Add)
+        resetTween(); 
+
+    // tFatal() << "PositionSettings::closeTweenProperties() - Mode: " << k->mode;
+
+    emit clickedCloseTweenProperties(k->mode);
+}
+
+void PositionSettings::setEditMode()
+{
+    k->mode = TweenerPanel::Edit;
+    k->closeButton->setIcon(QPixmap(kAppProp->themeDir() + "/"  + "icons/close_properties.png"));
+    k->closeButton->setToolTip(tr("Close Tween properties"));
+}
+
+/* This method transforms the path created into a QString representation */
+
+QString PositionSettings::pathToCoords(const QGraphicsPathItem *path, QPointF offset)
+{
+    QString strPath = "";
+    QChar t;
+    int offsetX = offset.x();
+    int offsetY = offset.y();
+
+    for (int i=0; i < path->path().elementCount(); i++) {
+         QPainterPath::Element e = path->path().elementAt(i);
+         switch (e.type) {
+            case QPainterPath::MoveToElement:
+            {
+                if (t != 'M') {
+                    t = 'M';
+                    strPath += "M " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                } else {
+                    strPath += QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                }
+            }
+            break;
+            case QPainterPath::LineToElement:
+            {
+                if (t != 'L') {
+                    t = 'L';
+                    strPath += " L " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                } else {
+                    strPath += QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                }
+            }
+            break;
+            case QPainterPath::CurveToElement:
+            {
+                if (t != 'C') {
+                    t = 'C';
+                    strPath += " C " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                } else {
+                    strPath += "  " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                }
+            }
+            break;
+            case QPainterPath::CurveToDataElement:
+            {
+                if (t == 'C')
+                    strPath +=  " " + QString::number(e.x + offsetX) + "  " + QString::number(e.y + offsetY) + " ";
+            }
+            break;
+        }
+    }
+
+    return strPath.trimmed();
+}
+
+QString PositionSettings::pathString()
+{
+    return pathToCoords(k->path, k->offset);
+}
+
+QVector<TupTweenerStep *> PositionSettings::steps()
+{
+    return k->stepViewer->steps();
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/positionsettings.h tupi-0.2+git05/src/plugins/tools/compound/positionsettings.h
--- tupi-0.2+git04/src/plugins/tools/compound/positionsettings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/positionsettings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,103 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef POSITIONSETTINGS_H
+#define POSITIONSETTINGS_H
+
+#include "tglobal.h"
+#include "tweenerpanel.h"
+#include "tuptweenerstep.h"
+
+#include <QWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QComboBox>
+#include <QPushButton>
+#include <QBoxLayout>
+#include <QHeaderView>
+#include <QGraphicsPathItem>
+
+class QGraphicsPathItem;
+class TupItemTweener;
+// class TweenerPanel;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN PositionSettings : public QWidget 
+{
+    Q_OBJECT
+
+    public:
+
+        PositionSettings(QWidget *parent = 0);
+        ~PositionSettings();
+
+        void setParameters(int framesTotal, int initFrame);
+        void setParameters(TupItemTweener *currentTween);
+        void initStartCombo(int totalFrames, int currentIndex);
+        void setStartFrame(int currentIndex);
+        int initFrame();
+
+        void updateSteps(const QGraphicsPathItem *path, QPointF offset);
+        int totalSteps();
+        int startComboSize();
+        QString pathString();
+        QVector<TupTweenerStep *> steps();
+
+    public slots:
+        void resetTween();
+        
+    private slots:
+        void applyTween();
+        void closeTweenProperties();
+        
+    signals:
+        void clickedCreatePath();
+        void clickedSelect();
+        void clickedCloseTweenProperties(TweenerPanel::Mode mode);
+        void clickedApplyTween(TweenerPanel::TweenerType type, const QString &text);
+        void startingPointChanged(int index);
+        
+    private:
+        QString pathToCoords(const QGraphicsPathItem *path, QPointF offset);
+        void setEditMode();
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/tweener.cpp tupi-0.2+git05/src/plugins/tools/compound/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/compound/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/tweener.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,944 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tweener.h"
+#include "taction.h"
+#include "tnodegroup.h"
+#include "tosd.h"
+#include "tupsvg2qt.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicsscene.h"
+#include "tupgraphicobject.h"
+#include "tuppathitem.h"
+#include "tupellipseitem.h"
+#include "tuprectitem.h"
+#include "tuplineitem.h"
+#include "tupsvgitem.h"
+#include "tupitemtweener.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+
+struct Tweener::Private
+{
+    QMap<QString, TAction *> actions;
+    Configurator *configurator;
+
+    TupGraphicsScene *scene;
+    QGraphicsPathItem *path;
+    QList<QGraphicsItem *> objects;
+
+    TupItemTweener *currentTween;
+
+    TNodeGroup *group;
+
+    bool pathAdded;
+    int startPoint;
+
+    TweenerPanel::Mode mode;
+    TweenerPanel::TweenerType currentTweenType;
+    TweenerPanel::EditMode editMode;
+
+    QPointF itemObjectReference;
+    QPointF pathOffset;
+    QPointF firstNode;
+
+    int baseZValue;
+};
+
+Tweener::Tweener() : TupToolPlugin(), k(new Private)
+{
+    setupActions();
+
+    k->configurator = 0;
+    k->path = 0;
+    k->group = 0;
+    k->startPoint = 0;
+}
+
+Tweener::~Tweener()
+{
+    delete k;
+}
+
+/* This method initializes the plugin */
+
+void Tweener::init(TupGraphicsScene *scene)
+{
+    delete k->path;
+    k->path = 0;
+    k->pathAdded = false;
+    delete k->group;
+    k->group = 0;
+    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
+
+    k->scene = scene;
+    k->objects.clear();
+
+    k->pathOffset = QPointF(0, 0); 
+    k->firstNode = QPointF(0, 0);
+    k->itemObjectReference = QPointF(0, 0);
+
+    k->mode = TweenerPanel::View;
+    k->editMode = TweenerPanel::None;
+
+    k->configurator->resetUI();
+
+    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Compound);
+    if (tweenList.size() > 0) {
+        k->configurator->loadTweenList(tweenList);
+        setCurrentTween(tweenList.at(0));
+    }
+
+    int total = framesTotal();
+    k->configurator->initStartCombo(total, k->scene->currentFrameIndex());
+}
+
+void Tweener::updateStartPoint(int index)
+{
+    if (k->startPoint != index && index >= 0) {
+        // tFatal() << "Tweener::updateStartPoint() - New Start Point: " << k->startPoint;
+        k->startPoint = index;
+    }
+}
+
+/* This method returns the plugin name */
+
+QStringList Tweener::keys() const
+{
+    return QStringList() << tr("Compound Tween");
+}
+
+/* This method makes an action when the mouse is pressed on the workspace 
+ * depending on the active mode: Selecting an object or Creating a path  
+*/
+
+void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::press()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+
+    if (k->editMode == TweenerPanel::TweenProperties && k->scene->currentFrameIndex() == k->startPoint) {
+        if (k->currentTweenType == TweenerPanel::Position) {
+            if (k->path) {
+                QPointF point = k->path->mapFromParent(input->pos());
+                QPainterPath path = k->path->path();
+                path.cubicTo(point, point, point);
+                k->path->setPath(path);
+            }
+        } else {
+        #ifdef K_DEBUG
+            QString msg = "Tweener::press() - Error: No position!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
+        #endif 
+        }
+    } 
+}
+
+/* This method is executed while the mouse is pressed and on movement */
+
+void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method finishes the action started on the press method depending
+ * on the active mode: Selecting an object or Creating a path
+*/
+
+void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::release()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (scene->currentFrameIndex() == k->startPoint) {
+        if (k->editMode == TweenerPanel::TweenProperties) {
+            if (k->currentTweenType == TweenerPanel::Position) {
+                if (k->group) {
+                    k->group->createNodes(k->path);
+                    k->group->expandAllNodes();
+                    k->configurator->updateSteps(k->path, k->pathOffset);
+                    QPainterPath::Element e = k->path->path().elementAt(0);
+                    QPointF begin = QPointF(e.x, e.y);
+
+                    if (begin != k->firstNode) {
+                        QPointF oldPos = k->firstNode;
+                        QPointF newPos = begin;
+
+                        int distanceX = newPos.x() - oldPos.x();
+                        int distanceY = newPos.y() - oldPos.y();
+
+                        if (k->objects.size() > 0) {
+                            foreach (QGraphicsItem *item, k->objects)
+                                     item->moveBy(distanceX, distanceY);
+                            QGraphicsItem *item = k->objects.at(0);
+                            QRectF rect = item->sceneBoundingRect();
+                            k->itemObjectReference = rect.center();
+                        }
+
+                        k->firstNode = newPos;
+                    }
+                }
+            } else {
+                #ifdef K_DEBUG
+                    QString msg = "Tweener::release() - No position!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tFatal() << msg;
+                    #endif
+                #endif
+            }
+        } else {
+
+            // if k->editMode == TweenerPanel::TweenSelection
+
+            if (scene->selectedItems().size() > 0) {
+
+                k->objects = scene->selectedItems();
+                k->configurator->notifySelection(true);
+
+                QGraphicsItem *item = k->objects.at(0);
+                QRectF rect = item->sceneBoundingRect();
+                QPointF newPos = rect.center();
+                QPointF oldPos = k->itemObjectReference;
+                k->itemObjectReference = newPos;
+
+                if (!k->path) {
+                    k->path = new QGraphicsPathItem;
+                    k->path->setZValue(maxZValue());
+
+                    QColor color = Qt::lightGray;
+                    color.setAlpha(200);
+                    QPen pen(QBrush(color), 1, Qt::DotLine);
+                    k->path->setPen(pen);
+
+                    QPainterPath path;
+                    path.moveTo(newPos);
+                    k->firstNode = newPos;
+                    k->path->setPath(path);
+                    scene->addItem(k->path);
+                    k->pathAdded = true;
+
+                    k->pathOffset = QPointF(0, 0);
+                } else {
+                    int distanceX = newPos.x() - oldPos.x();
+                    int distanceY = newPos.y() - oldPos.y();
+                    k->path->moveBy(distanceX, distanceY);
+
+                    k->pathOffset = QPointF(distanceX, distanceY);
+                }
+            } 
+        }
+    } 
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+QMap<QString, TAction *> Tweener::actions() const
+{
+    return k->actions;
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+int Tweener::toolType() const
+{
+    return TupToolInterface::Tweener;
+}
+
+/* This method returns the tool panel associated to this plugin */
+
+QWidget *Tweener::configurator()
+{
+    if (!k->configurator) {
+        k->mode = TweenerPanel::View;
+
+        k->configurator = new Configurator;
+
+        connect(k->configurator, SIGNAL(tweenPropertiesActivated(TweenerPanel::TweenerType)), 
+                this, SLOT(updateCurrentTweenerType(TweenerPanel::TweenerType)));
+
+        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
+
+        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelect()));
+        connect(k->configurator, SIGNAL(clickedTweenProperties()), this, SLOT(tweenListMode()));
+
+        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
+        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
+        connect(k->configurator, SIGNAL(loadPath(bool, bool)), this, SLOT(setPath(bool, bool)));
+
+        connect(k->configurator, SIGNAL(setMode(TweenerPanel::Mode)), this, SLOT(updateMode(TweenerPanel::Mode)));
+        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
+        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
+
+    } else {
+        k->mode = k->configurator->mode();
+    }
+
+    return k->configurator;
+}
+
+/* This method is called when there's a change on/of scene */
+void Tweener::aboutToChangeScene(TupGraphicsScene *)
+{
+}
+
+/* This method is called when this plugin is off */
+void Tweener::aboutToChangeTool()
+{
+    if (k->editMode == TweenerPanel::Selection) {
+        clearSelection();
+        disableSelection();
+    } else if (k->editMode == TweenerPanel::TweenProperties) {
+        if (k->currentTweenType == TweenerPanel::Position) {
+            if (k->path) {
+                // tFatal() << "Tweener::aboutToChangeTool() - Removing path!";
+                k->scene->removeItem(k->path);
+                k->pathAdded = false;
+                delete k->group;
+                k->group = 0;
+            }
+        }
+    }
+
+    k->mode = TweenerPanel::View;
+    k->editMode = TweenerPanel::None;
+    k->currentTweenType = TweenerPanel::Undefined;
+}
+
+/* SQA: What is it? 
+bool Tweener::isComplete() const
+{
+    return true;
+}
+*/
+
+/* This method defines the actions contained in this plugin */
+
+void Tweener::setupActions()
+{
+    TAction *translater = new TAction(QPixmap(kAppProp->themeDir() + "icons/compound_tween.png"), 
+                                      tr("Compound Tween"), this);
+    translater->setCursor(QCursor(kAppProp->themeDir() + "cursors/tweener.png"));
+    translater->setShortcut(QKeySequence(tr("Shift+X")));
+
+    k->actions.insert(tr("Compound Tween"), translater);
+}
+
+/* This method initializes the "Create path" mode */
+
+void Tweener::setCreatePath()
+{
+    if (k->path) {
+        k->pathOffset = QPointF(0, 0);
+
+        if (!k->pathAdded) {
+            k->scene->addItem(k->path);
+            k->pathAdded = true;
+        } 
+
+        if (k->group) {
+            k->group->createNodes(k->path);
+        } else {
+            k->group = new TNodeGroup(k->path, k->scene, TNodeGroup::CompoundTween, k->baseZValue);
+            connect(k->group, SIGNAL(nodeReleased()), SLOT(updatePath()));
+            k->group->createNodes(k->path);
+        }
+        k->group->expandAllNodes();
+
+    }
+
+    disableSelection();
+}
+
+/* This method initializes the "Select object" mode */
+
+void Tweener::setSelect()
+{
+    if (k->mode == TweenerPanel::Edit) {
+        if (k->startPoint != k->scene->currentFrameIndex()) {
+            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
+                                                                            k->scene->currentLayerIndex(),
+                                                                            k->startPoint, TupProjectRequest::Select, "1");
+            emit requested(&request);
+        }
+    }
+
+    k->editMode = TweenerPanel::Selection;
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             view->setDragMode(QGraphicsView::RubberBandDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      if ((item->zValue() >= 20000) && (item->toolTip().length()==0)) {
+                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                      }
+             }
+    }
+
+    // When Object selection is enabled, previous selection is set
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                 item->setSelected(true);
+        }
+    }
+}
+
+/* This method resets this plugin */
+
+void Tweener::applyReset()
+{
+    // tFatal() << "Tweener::applyReset() - Fire in the hole!";
+
+    k->mode = TweenerPanel::View;
+    k->editMode = TweenerPanel::None;
+    k->currentTweenType = TweenerPanel::Undefined;
+
+    clearSelection();
+    disableSelection();
+
+    k->pathAdded = false;
+    k->path = 0;
+
+    k->startPoint = k->scene->currentFrameIndex();
+    k->configurator->cleanTweensForms();
+}
+
+/* This method applies to the project, the Tween created from this plugin */
+
+void Tweener::applyTween()
+{
+    QString name = k->configurator->currentTweenName();
+
+    if (name.length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
+        return;
+    }
+
+    // SQA: Remove this code
+    /*
+    if (k->startPoint != k->scene->currentFrameIndex()) {
+        TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
+                                                                       k->scene->currentLayerIndex(),
+                                                                       k->startPoint, TupProjectRequest::Select, "1");
+        emit requested(&request);
+    }
+    */
+
+    /*
+    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Compound))
+        tFatal() << "Tweener::applyTween() - Tween " << name << " is NEW!!!"; 
+    else
+        tFatal() << "Tweener::applyTween() - Tween " << name << " is NOT NEW!!!";
+    */
+  
+    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Compound)) {
+        foreach (QGraphicsItem *item, k->objects) {   
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 int objectIndex = k->scene->currentFrame()->indexOf(item); 
+                 QRectF rect = item->sceneBoundingRect();
+                 QPointF point = rect.topLeft();
+
+                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = k->scene->currentFrame()->indexOf(svg);
+                 } else {
+                     if (qgraphicsitem_cast<TupPathItem *>(item) || qgraphicsitem_cast<TupEllipseItem *>(item) 
+                         || qgraphicsitem_cast<TupLineItem *>(item) || qgraphicsitem_cast<TupRectItem *>(item))
+                         point = item->pos();
+                 }
+
+                 // tFatal() << "Tweener::applyTween() - Point 1: [" << point.x() << ", " << point.y() << "]";
+                 QDomDocument dom;
+                 dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
+                 // tFatal() << "";
+                 // tFatal() << "Tweener::applyTween() - " << dom.toString();
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                            k->scene->currentSceneIndex(),
+                                            k->scene->currentLayerIndex(),
+                                            k->startPoint,
+                                            objectIndex,
+                                            QPointF(), k->scene->spaceMode(), 
+                                            type, TupProjectRequest::SetTween, 
+                                            k->configurator->tweenToXml(k->startPoint, point));
+                 emit requested(&request);
+        }
+
+        int framesNumber = framesTotal();
+        int total = k->startPoint + k->configurator->totalSteps() - 1;
+
+        if (total > framesNumber) {
+            for (int i = framesNumber; i <= total; i++) {
+                 TupProjectRequest requestFrame = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
+                                                                                      k->scene->currentLayerIndex(),
+                                                                                      i, TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
+                 emit requested(&requestFrame);
+            }
+        }
+
+        TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(), 
+                                                                        k->scene->currentLayerIndex(),
+                                                                        k->startPoint, TupProjectRequest::Select, "1");
+        emit requested(&request);
+    } else {
+        removeTweenFromProject(name);
+        QList<QGraphicsItem *> newList;
+
+        foreach (QGraphicsItem *item, k->objects) {
+
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 TupScene *scene = k->scene->scene();
+                 TupLayer *layer = scene->layer(k->scene->currentLayerIndex());
+                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
+                 int objectIndex = frame->indexOf(item);
+
+                 QRectF rect = item->sceneBoundingRect();
+                 QPointF point = rect.topLeft();
+
+                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = frame->indexOf(svg);
+                 } else {
+                     if (qgraphicsitem_cast<TupPathItem *>(item) || qgraphicsitem_cast<TupEllipseItem *>(item) 
+                         || qgraphicsitem_cast<TupLineItem *>(item) || qgraphicsitem_cast<TupRectItem *>(item))
+                         point = item->pos();
+                 }
+
+                 if (k->startPoint != k->currentTween->initFrame()) {
+                     QDomDocument dom;
+                     dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
+
+                     /*
+                     tFatal() << "Tweener::applyTween() - Point 2: [" << point.x() << ", " << point.y() << "]";
+                     tFatal() << "";
+                     tFatal() << "Tweener::applyTween() - " << dom.toString();
+                     */
+
+                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(), 
+                                                                                    k->scene->currentLayerIndex(), 
+                                                                                    k->startPoint, -1, 
+                                                                                    QPointF(), k->scene->spaceMode(),
+                                                                                    type, TupProjectRequest::Add, 
+                                                                                    dom.toString());
+                     emit requested(&request);
+
+                     request = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(), 
+                                                                   k->scene->currentLayerIndex(),
+                                                                   k->currentTween->initFrame(),
+                                                                   objectIndex, QPointF(), 
+                                                                   k->scene->spaceMode(), type,
+                                                                   TupProjectRequest::Remove);
+                     emit requested(&request);
+
+                     frame = layer->frame(k->startPoint);
+                     if (type == TupLibraryObject::Item)
+                         objectIndex = frame->graphicItemsCount() - 1;
+                     else
+                         objectIndex = frame->svgItemsCount() - 1;
+
+                     newList.append(frame->graphic(objectIndex)->item());
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                            k->scene->currentSceneIndex(),
+                                            k->scene->currentLayerIndex(),
+                                            k->startPoint,
+                                            objectIndex,
+                                            QPointF(), k->scene->spaceMode(), 
+                                            type, TupProjectRequest::SetTween,
+                                            k->configurator->tweenToXml(k->startPoint, point));
+                 emit requested(&request);
+
+                 int total = k->startPoint + k->configurator->totalSteps();
+
+                 int framesNumber = framesTotal();
+
+                 if (framesNumber < total) {
+                     for (int i = framesNumber; i < total; i++) {
+                          TupProjectRequest requestFrame = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
+                                                          k->scene->currentLayerIndex(),
+                                                          i, TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
+                          emit requested(&requestFrame);
+                     }
+                 }
+
+                 request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(), k->scene->currentLayerIndex(),
+                                                                k->startPoint, TupProjectRequest::Select, "1");
+                 emit requested(&request);
+        }
+
+        if (newList.size() > 0)
+            k->objects = newList;
+    }
+
+    setCurrentTween(name);
+
+    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
+}
+
+/* This method updates the data of the path into the tool panel 
+ * and disables edition mode for nodes
+*/
+
+void Tweener::updatePath()
+{
+    k->configurator->updateSteps(k->path, k->pathOffset);
+}
+
+/* This method saves the settings of this plugin */
+
+void Tweener::saveConfig()
+{
+}
+
+/* This method updates the workspace when the plugin changes the scene */
+
+void Tweener::updateScene(TupGraphicsScene *scene)
+{
+    k->mode = k->configurator->mode();
+
+    if(k->mode == TweenerPanel::Edit) {
+
+       // tFatal() << "Tweener::updateScene() - Mode: TweenerPanel::Edit";
+
+       int total = k->startPoint + k->configurator->totalSteps();
+
+       if (k->editMode == TweenerPanel::TweenProperties) {
+           if (k->currentTweenType == TweenerPanel::Position) {
+               if (scene->currentFrameIndex() >= k->startPoint && scene->currentFrameIndex() < total) {
+                   if (k->path && k->group) {
+                       k->scene->addItem(k->path);            
+                       k->group->createNodes(k->path);
+                       k->group->expandAllNodes();
+                   }
+               }
+           }
+       } 
+
+       int framesNumber = framesTotal();
+
+       if (k->configurator->startComboSize() < framesNumber)
+           k->configurator->initStartCombo(framesNumber, k->startPoint);
+
+    } else if (k->mode == TweenerPanel::Add) {
+
+               // tFatal() << "Tweener::updateScene() - Mode: TweenerPanel::Add";
+
+               int total = framesTotal();
+
+               if (k->configurator->startComboSize() < total) {
+                   k->configurator->initStartCombo(total, k->startPoint);
+               } else {
+                   if (scene->currentFrameIndex() != k->startPoint)
+                       k->configurator->setStartFrame(scene->currentFrameIndex());
+               }
+
+               if (k->editMode == TweenerPanel::TweenProperties) {
+                   if (k->currentTweenType == TweenerPanel::Position)
+                       k->path = 0;
+
+                   k->configurator->cleanTweensForms();
+
+                   clearSelection();
+                   k->configurator->activateMode(TweenerPanel::Selection);
+               } else if (k->editMode == TweenerPanel::Selection) {
+                          if (k->currentTweenType == TweenerPanel::Position)                       
+                              k->path = 0;
+
+                          if (scene->currentFrameIndex() != k->startPoint) {
+                              clearSelection();
+                              k->startPoint = scene->currentFrameIndex();
+                              setSelect();
+                          }
+               } else if (k->editMode == TweenerPanel::TweenList) {
+                          if (scene->currentFrameIndex() != k->startPoint) {
+                              k->startPoint = scene->currentFrameIndex(); 
+                              clearSelection();
+                              k->configurator->activateMode(TweenerPanel::Selection);
+                          }
+               }
+    } else {
+             // tFatal() << "Tweener::updateScene() - Mode: TweenerPanel::View";
+
+             if (scene->currentFrameIndex() != k->startPoint) {
+                 k->configurator->setStartFrame(scene->currentFrameIndex());
+             }
+    }
+}
+
+void Tweener::updateMode(TweenerPanel::Mode mode)
+{
+    k->mode = mode;
+
+    if (k->mode == TweenerPanel::Edit)
+        setEditEnv();
+}
+
+int Tweener::maxZValue()
+{
+    int max = -1;
+    foreach (QGraphicsView *view, k->scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      if (item->zValue() > max)
+                          max = item->zValue();
+
+             }
+    }
+
+    return max + 1;
+}
+
+void Tweener::removeTweenFromProject(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    scene->removeTween(name, TupItemTweener::Compound);
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      QString tip = item->toolTip();
+                      if (tip.startsWith(tr("Compound Tween") + ": " + name))
+                          item->setToolTip("");
+             }
+    }
+}
+
+void Tweener::removeTween(const QString &name)
+{
+    removeTweenFromProject(name);
+    applyReset();
+}
+
+void Tweener::setCurrentTween(const QString &name)
+{
+    // tFatal() << "Tweener::setCurrentTween(Tweener::setCurrentTween() - Updating tweener: " << name;
+
+    TupScene *scene = k->scene->scene();
+    k->currentTween = scene->tween(name, TupItemTweener::Compound);
+    if (k->currentTween) {
+        k->configurator->setCurrentTween(k->currentTween);
+    } 
+}
+
+void Tweener::setEditEnv()
+{
+    // tFatal() << "void Tweener::setEditEnv() - Just tracing!!!";
+
+    k->startPoint = k->currentTween->initFrame();
+    if (k->startPoint != k->scene->currentFrameIndex()) {
+        TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
+                                                                       k->scene->currentLayerIndex(),
+                                                                       k->startPoint, TupProjectRequest::Select, "1");
+        emit requested(&request);
+    }
+
+    k->mode = TweenerPanel::Edit;
+
+    TupScene *scene = k->scene->scene();
+    k->objects = scene->getItemsFromTween(k->currentTween->name(), TupItemTweener::Compound);
+    QGraphicsItem *item = k->objects.at(0);
+    QRectF rect = item->sceneBoundingRect();
+    k->itemObjectReference = rect.center();
+
+    if (k->currentTween->contains(TupItemTweener::Position)) {
+        // tFatal() << "void Tweener::setEditEnv() - Adding path!";
+
+        k->path = k->currentTween->graphicsPath();
+        k->path->setZValue(maxZValue());
+
+        QPainterPath::Element e  = k->path->path().elementAt(0);
+        k->firstNode = QPointF(e.x, e.y);
+
+        QPointF oldPos = QPointF(e.x, e.y);
+        QPointF newPos = rect.center();
+
+        int distanceX = newPos.x() - oldPos.x();
+        int distanceY = newPos.y() - oldPos.y();
+        k->path->moveBy(distanceX, distanceY);
+        k->pathOffset = QPointF(distanceX, distanceY);
+
+        QColor color = Qt::lightGray;
+        color.setAlpha(200);
+        QPen pen(QBrush(color), 1, Qt::DotLine);
+        k->path->setPen(pen);
+
+        // setCreatePath();
+    }
+}
+
+int Tweener::framesTotal()
+{
+    int total = 1;
+    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
+    if (layer)
+        total = layer->framesTotal();
+
+    return total;
+}
+
+/* This method clear selection */
+
+void Tweener::clearSelection()
+{
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 if (item->isSelected())
+                     item->setSelected(false);
+        }
+        k->objects.clear();
+        k->configurator->notifySelection(false);
+    }
+}
+
+/* This method disables object selection */
+
+void Tweener::disableSelection()
+{
+    foreach (QGraphicsView *view, k->scene->views()) {
+             view->setDragMode (QGraphicsView::NoDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+void Tweener::updateCurrentTweenerType(TweenerPanel::TweenerType type)
+{
+    // tFatal() << "updateCurrentTweenerType() - Just following type: " << type;
+    k->currentTweenType = type;
+    k->editMode = TweenerPanel::TweenProperties;
+
+    if (k->currentTweenType == TweenerPanel::Position) {
+        // tFatal() << "Tweener::updateCurrentTweenerType() - Setting path!";
+        setCreatePath();
+    } else  {
+        // tFatal() << "Tweener::updateCurrentTweenerType() - Type is not Position!";
+    }
+}
+
+void Tweener::setPath(bool isEnabled, bool reset)
+{
+    if (isEnabled) {
+        k->editMode = TweenerPanel::TweenProperties;
+        setCreatePath();
+    } else {
+        if (k->group) {
+            k->group->clear();
+            k->group = 0;
+        }
+
+        if (k->path) {
+
+            if (k->startPoint == k->scene->currentFrameIndex())
+                k->scene->removeItem(k->path);
+
+            k->pathAdded = false;
+
+            if (reset) {
+                QPainterPath::Element e  = k->path->path().elementAt(0);
+                QPointF newPos = QPointF(e.x, e.y);
+
+                k->path = new QGraphicsPathItem;
+                k->path->setZValue(maxZValue());
+
+                QColor color = Qt::lightGray;
+                color.setAlpha(200);
+                QPen pen(QBrush(color), 1, Qt::DotLine);
+                k->path->setPen(pen);
+
+                QPainterPath path;
+                path.moveTo(newPos);
+                k->firstNode = newPos;
+                k->path->setPath(path);
+            }
+        }
+    }
+}
+
+void Tweener::tweenListMode()
+{
+   k->editMode = TweenerPanel::TweenList;
+   disableSelection();
+}
+
+void Tweener::sceneResponse(const TupSceneResponse *event)
+{
+    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
+        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
+        init(k->scene);
+    }
+
+    if (event->action() == TupProjectRequest::Select)
+        init(k->scene);
+}
+
+void Tweener::layerResponse(const TupLayerResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove)
+        init(k->scene);
+}
+
+void Tweener::frameResponse(const TupFrameResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
+        init(k->scene);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/tweener.h tupi-0.2+git05/src/plugins/tools/compound/tweener.h
--- tupi-0.2+git04/src/plugins/tools/compound/tweener.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/tweener.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,117 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef COMPOUNDTWEENER_H
+#define COMPOUNDTWEENER_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "configurator.h"
+#include "tweenerpanel.h"
+#include "tupprojectresponse.h"
+
+#include <QPointF>
+#include <QKeySequence>
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QMatrix>
+#include <QGraphicsLineItem>
+#include <QGraphicsView>
+#include <QDomDocument>
+
+/**
+ * @author Gustav Gonzalez 
+ *
+*/
+
+class TUPI_PLUGIN Tweener : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "compoundtool.json")
+
+    public:
+        Tweener();
+        virtual ~Tweener();
+        virtual void init(TupGraphicsScene *scene);
+
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void updateScene(TupGraphicsScene *scene);
+        virtual QMap<QString, TAction *>actions() const;
+        virtual QWidget *configurator();
+        virtual void aboutToChangeTool();
+        virtual void saveConfig();
+
+        int toolType() const;
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        // bool isComplete() const;
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+        virtual void layerResponse(const TupLayerResponse *event);
+        virtual void frameResponse(const TupFrameResponse *event);
+
+    private:
+        int framesTotal();
+        void setupActions();
+        int maxZValue();
+        void clearSelection();
+        void removeTweenFromProject(const QString &name);
+        void disableSelection();
+
+    private:
+        struct Private;
+        Private *const k;
+
+    private slots:
+        void updateCurrentTweenerType(TweenerPanel::TweenerType type);
+        void applyReset();
+        void applyTween();
+        void removeTween(const QString &name);
+        void setCreatePath();
+        void setSelect();
+        void setEditEnv();
+        void updateMode(TweenerPanel::Mode mode);
+        void updateStartPoint(int index);
+        void setCurrentTween(const QString &name);
+        void setPath(bool isEnabled, bool reset);
+        void tweenListMode();
+
+    public slots:
+        void updatePath();
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/tweenerpanel.cpp tupi-0.2+git05/src/plugins/tools/compound/tweenerpanel.cpp
--- tupi-0.2+git04/src/plugins/tools/compound/tweenerpanel.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/tweenerpanel.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,547 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tweenerpanel.h"
+#include "positionsettings.h"
+#include "tradiobuttongroup.h"
+#include "timagebutton.h"
+#include "tseparator.h"
+#include "tweenertable.h"
+#include "tosd.h"
+
+struct TweenerPanel::Private
+{
+    QWidget *optionsPanel;
+    QWidget *tweenerTablePanel; QWidget *buttonsPanel;
+    QBoxLayout *layout;
+
+    QList<QWidget*> *panelList;
+
+    TweenerPanel::Mode mode;
+    EditMode editMode;
+
+    QLineEdit *input;
+    TRadioButtonGroup *options;
+
+    TweenerTable *tweenerTable;
+    int currentTweenIndex;
+    QList<TweenerPanel::TweenerType> tweenerList;
+
+    PositionSettings *positionPanel;
+
+    QLabel *totalLabel;
+    int totalSteps;
+
+    bool selectionDone;
+
+    TImageButton *applyButton;
+    TImageButton *closeButton;
+};
+
+TweenerPanel::TweenerPanel(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    k->selectionDone = false;
+    k->editMode = TweenerPanel::None;
+    k->totalSteps = 0;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    setFont(QFont("Arial", 8, QFont::Normal, false));
+
+    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
+    k->input = new QLineEdit;
+
+    QHBoxLayout *nameLayout = new QHBoxLayout;
+    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    nameLayout->setMargin(0);
+    nameLayout->setSpacing(0);
+    nameLayout->addWidget(nameLabel);
+    nameLayout->addWidget(k->input);
+
+    k->layout->addLayout(nameLayout);
+
+    setOptionsPanel();
+    setTweenerTableForm();
+    loadTweenComponents();
+    setButtonsPanel();
+
+    k->layout->setSpacing(0);
+
+    activateMode(TweenerPanel::Selection);
+}
+
+TweenerPanel::~TweenerPanel()
+{
+    delete k;
+}
+
+void TweenerPanel::setOptionsPanel()
+{
+    k->optionsPanel = new QWidget;
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->optionsPanel);
+    innerLayout->setMargin(0);
+    innerLayout->setSpacing(0);
+
+    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
+    k->options->addItem(tr("Select object"), 0);
+    k->options->addItem(tr("Set Tweeners"), 1);
+    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
+
+    innerLayout->addWidget(k->options);
+
+    k->layout->addWidget(k->optionsPanel);
+    activeOptionsPanel(true);
+}
+
+void TweenerPanel::activeOptionsPanel(bool enable)
+{
+    if (enable && !k->optionsPanel->isVisible())
+        k->optionsPanel->show();
+    else
+        k->optionsPanel->hide();
+}
+
+void TweenerPanel::setTweenerTableForm()
+{
+    k->tweenerTablePanel = new QWidget;
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->tweenerTablePanel);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QLabel *startingLabel = new QLabel(tr("Tweeners") + ": ");
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(startingLabel);
+
+    k->tweenerTable = new TweenerTable;
+    connect(k->tweenerTable, SIGNAL(callTweenerSettings(int)), this, SLOT(showTweenSettings(int)));
+    connect(k->tweenerTable, SIGNAL(enableSaveTween(bool)), this, SLOT(enableApplyButton(bool)));
+
+    innerLayout->addLayout(startLayout);
+    innerLayout->addWidget(k->tweenerTable);
+
+    k->layout->addWidget(k->tweenerTablePanel);
+    activeTweenerTableForm(false);
+}
+
+void TweenerPanel::activeTweenerTableForm(bool enable)
+{
+    if (enable && !k->tweenerTablePanel->isVisible())
+        k->tweenerTablePanel->show();
+    else
+        k->tweenerTablePanel->hide();
+}
+
+void TweenerPanel::setButtonsPanel()
+{
+    k->buttonsPanel = new QWidget;
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->buttonsPanel);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    k->applyButton = new TImageButton(QPixmap(kAppProp->themeDir() + "/"  + "icons/save.png"), 22);
+    k->applyButton->setDisabled(true);
+    connect(k->applyButton, SIGNAL(clicked()), this, SLOT(applyTween()));
+
+    k->closeButton = new TImageButton(QPixmap(kAppProp->themeDir() + "/"  + "icons/close.png"), 22);
+    connect(k->closeButton, SIGNAL(clicked()), this, SLOT(closePanel()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(10);
+    buttonsLayout->addWidget(k->applyButton);
+    buttonsLayout->addWidget(k->closeButton);
+
+    innerLayout->addLayout(buttonsLayout);
+
+    k->layout->addWidget(k->buttonsPanel);
+    activeButtonsPanel(true);
+}
+
+void TweenerPanel::activeButtonsPanel(bool enable)
+{
+    if (enable && !k->buttonsPanel->isVisible())
+        k->buttonsPanel->show();
+    else
+        k->buttonsPanel->hide();
+}
+
+void TweenerPanel::loadTweenComponents()
+{
+    QStringList labels;
+    labels << tr("Position") << tr("Rotation") << tr("Scale") << tr("Shear") << tr("Opacity") << tr("Coloring");
+    k->panelList = new QList<QWidget*>();
+
+    for (int i = 0; i < labels.size(); ++i) {
+
+         switch(i)  {
+                case TweenerPanel::Position:
+                     // tFatal() << "TweenerPanel::loadTweenComponents() - Opening Position gui";
+                     k->positionPanel = new PositionSettings;
+                     connect(k->positionPanel, SIGNAL(clickedApplyTween(TweenerPanel::TweenerType, const QString &)), 
+                             this, SLOT(activateTweenersTable(TweenerPanel::TweenerType, const QString &)));  
+                     connect(k->positionPanel, SIGNAL(clickedCloseTweenProperties(TweenerPanel::Mode)), 
+                             this, SLOT(updateTweenersTable(TweenerPanel::Mode)));
+                     connect(k->positionPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int))); 
+
+                     k->positionPanel->setParameters(k->totalSteps, 0);
+                     k->panelList->append(k->positionPanel);
+                break;
+                case TweenerPanel::Rotation:
+                     k->panelList->append(new QWidget);
+                break;
+                case TweenerPanel::Scale:
+                     k->panelList->append(new QWidget);
+                break;
+                case TweenerPanel::Shear:
+                     k->panelList->append(new QWidget);
+                break;
+                case TweenerPanel::Opacity:
+                     k->panelList->append(new QWidget); 
+                break;
+                case TweenerPanel::Coloring:
+                     k->panelList->append(new QWidget);
+                break;
+         }
+
+         k->layout->addWidget(k->panelList->at(i));
+         activeTweenComponent(i, false);
+    }
+}
+
+void TweenerPanel::activeTweenComponent(int index, bool enable)
+{
+    if (enable && !k->panelList->at(index)->isVisible()) {
+        k->panelList->at(index)->show();
+    } else {
+        k->currentTweenIndex = -1;
+        k->panelList->at(index)->hide();
+    }
+}
+
+// Adding new Tween
+
+void TweenerPanel::setParameters(const QString &name, int framesTotal, int startFrame)
+{
+    // k->tweenerTable->resetTable();
+
+    k->currentTweenIndex = -1;
+
+    k->positionPanel->setParameters(framesTotal, startFrame);
+
+    k->mode = TweenerPanel::Add;
+    k->input->setText(name);
+
+    activateMode(TweenerPanel::Selection);
+
+    k->applyButton->setToolTip(tr("Save Tween"));
+    k->closeButton->setIcon(QPixmap(kAppProp->themeDir() + "/"  + "icons/close.png"));
+    k->closeButton->setToolTip(tr("Cancel Tween"));
+}
+
+// Editing Tween
+
+void TweenerPanel::setParameters(TupItemTweener *currentTween)
+{
+    // tFatal() << "TweenerPanel::setParameters() - Loading Tween: " << currentTween->name();
+
+    k->currentTweenIndex = -1;
+
+    setEditMode();
+
+    k->input->setText(currentTween->name());
+    activateMode(TweenerPanel::TweenList);
+
+    for (int i=0; i < 6; i++) {
+         if (currentTween->contains(TupItemTweener::Type(i))) {
+             // tFatal() << "TweenerPanel::setParameters() - Tween contains: " << i;
+             k->tweenerTable->checkTween(i, true);
+             switch(i) {
+                    case 0:
+                         k->tweenerList.append(TweenerPanel::TweenerType(i));
+                         k->positionPanel->setParameters(currentTween);
+                         // emit loadPath(true, false);
+                    break;
+             }
+         }
+    }
+}
+
+void TweenerPanel::emitOptionChanged(int option)
+{
+    switch (option) {
+            case 0:
+             {
+                 k->editMode = TweenerPanel::Selection;
+                 emit clickedSelect();
+                 activeTweenerTableForm(false);
+             }
+            break;
+            case 1:
+             {
+                 if (k->selectionDone) {
+                     activeTweenerTableForm(true);
+
+                     k->editMode = TweenerPanel::TweenList;
+                     emit clickedTweenProperties();
+                 } else {
+                     k->options->setCurrentIndex(0);
+                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
+                 }
+             }
+    }
+}
+
+void TweenerPanel::activateMode(TweenerPanel::EditMode mode)
+{
+    k->options->setCurrentIndex(mode);
+}
+
+void TweenerPanel::notifySelection(bool flag)
+{
+    k->selectionDone = flag;
+}
+
+void TweenerPanel::showTweenSettings(int tweenType)
+{
+    k->currentTweenIndex = tweenType;
+    k->editMode = TweenerPanel::TweenProperties;
+
+    activeOptionsPanel(false);
+    activeTweenerTableForm(false);
+    activeButtonsPanel(false);
+    activeTweenComponent(tweenType, true);
+
+    // tFatal() << "TweenerPanel::showTweenSettings() - Opening tween: " << tweenType;
+    emit tweenPropertiesActivated(TweenerPanel::TweenerType(tweenType));
+}
+
+void TweenerPanel::activateTweenersTable(TweenerPanel::TweenerType type, const QString &message)
+{
+    if (!k->tweenerList.contains(type))
+        k->tweenerList.append(type);
+
+    emit clickedApplyTween();
+
+    setEditMode();
+
+    if (!k->applyButton->isEnabled())
+        k->applyButton->setEnabled(true);
+
+    TOsd::self()->display(tr("Info"), message, TOsd::Info);
+}
+
+void TweenerPanel::updateTweenersTable(TweenerPanel::Mode mode)
+{
+    // tFatal() << "TweenerPanel::updateTweenersTable() - Just tracing!"; 
+
+    k->editMode = TweenerPanel::TweenList;
+
+    activeTweenComponent(k->currentTweenIndex, false);
+    activeOptionsPanel(true);
+    activeTweenerTableForm(true);
+    activeButtonsPanel(true);
+
+    bool reset = false;
+
+    if (mode == TweenerPanel::Add) {
+        // k->tweenerTable->checkTween(k->currentTweenIndex, false);
+        reset = true;
+    }
+
+    if (TweenerPanel::TweenerType(k->currentTweenIndex) == TweenerPanel::Position)
+        emit loadPath(false, reset);
+}
+
+void TweenerPanel::updateSteps(const QGraphicsPathItem *path, QPointF offset)
+{
+    k->positionPanel->updateSteps(path, offset);
+}
+
+void TweenerPanel::initStartCombo(int framesTotal, int currentFrame)
+{
+    k->positionPanel->initStartCombo(framesTotal, currentFrame);
+}
+
+int TweenerPanel::startComboSize()
+{
+    return k->positionPanel->startComboSize();
+}
+
+void TweenerPanel::applyTween()
+{
+    // tFatal() << "TweenerPanel::applyTween() - Just tracing!";
+    setEditMode();
+
+    emit clickedApplyTween();
+}
+
+void TweenerPanel::setEditMode()
+{
+    k->mode = TweenerPanel::Edit;
+
+    k->applyButton->setToolTip(tr("Update Tween"));
+    k->closeButton->setIcon(QPixmap(kAppProp->themeDir() + "/"  + "icons/close_properties.png"));
+    k->closeButton->setToolTip(tr("Close Tween properties"));
+}
+
+QString TweenerPanel::tweenToXml(int currentFrame, QPointF point)
+{
+   QString name = k->input->text();
+
+   if (name.length() <= 0) {
+       // print error message here
+       return 0;
+   }
+
+   QDomDocument doc;
+
+   QDomElement tweening = doc.createElement("tweening");
+   tweening.setAttribute("name", name);
+   tweening.setAttribute("type", TweenerPanel::Compound);
+   tweening.setAttribute("init", currentFrame);
+   tweening.setAttribute("frames", k->positionPanel->totalSteps());
+   tweening.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
+
+   QDomElement settings = doc.createElement("settings");
+
+   // tFatal() << "TweenerPanel::tweenToXml() - Tweener List Size: " << k->tweenerList.size();
+
+   for (int i=0; i < k->tweenerList.size(); i++) {
+        // tFatal() << "TweenerPanel::tweenToXml() - tweenerList: " << k->tweenerList.at(i);
+
+        if (k->tweenerList.at(i) == TweenerPanel::Position) {
+            QDomElement position = doc.createElement("position");
+            position.setAttribute("init", currentFrame);
+            position.setAttribute("frames", k->positionPanel->totalSteps());
+            position.setAttribute("coords", k->positionPanel->pathString()); 
+            settings.appendChild(position);
+        }
+   }
+
+   tweening.appendChild(settings);
+
+   foreach (TupTweenerStep *step, k->positionPanel->steps())
+            tweening.appendChild(step->toXml(doc));
+
+   doc.appendChild(tweening);
+
+   // tFatal() << "LOOK THIS";
+   // tFatal() << doc.toString();
+
+   return doc.toString();
+
+   /*
+   QString text;
+
+   text = "<tweening name=\"test\" type=\"7\" init=\"0\" frames=\"3\" origin=\"22,26\">";
+   text += "<settings>";
+   text += " <position init=\"0\" frames=\"3\" coords=\"M 53.5 53.5  C 245 140  229  333  229  333   392 2 4  387  331  387  331   522 47  587  137  587  137\" />";
+   text += "  <rotation init=\"0\" frames=\"3\" rotateDirection=\"0\" rotateSpeed=\"5\" rotationType=\"0\" />";
+   text += "</settings>";
+   text += "<step value=\"0\">";
+   text += "  <position x=\"0\" y=\"0\"/>";
+   text += "  <rotation angle=\"0\"/>";
+   text += "</step>";
+   text += " <step value=\"1\">";
+   text += "  <position x=\"20\" y=\"20\"/>";
+   text += "  <rotation angle=\"45\"/>";
+   text += " </step>";
+   text += " <step value=\"2\">";
+   text += "  <position x=\"40\" y=\"40\"/>";
+   text += "  <rotation angle=\"90\"/>";
+   text += " </step>";
+   text += "</tweening>";
+
+   return text;
+   */
+}
+
+int TweenerPanel::totalSteps()
+{
+    return k->positionPanel->totalSteps();
+}
+
+QString TweenerPanel::currentTweenName() const
+{
+    QString tweenName = k->input->text();
+    if (tweenName.length() > 0)
+        k->input->setFocus();
+
+    return tweenName;
+}
+
+void TweenerPanel::enableApplyButton(bool flag)
+{
+    k->applyButton->setEnabled(flag);
+}
+
+void TweenerPanel::cleanTweensForms()
+{
+    k->positionPanel->resetTween();
+    // Add another cleaning methods here 
+}
+
+void TweenerPanel::setStartFrame(int currentIndex)
+{
+    // k->currentFrame = currentIndex;
+    k->positionPanel->setStartFrame(currentIndex);
+}
+
+void TweenerPanel::closePanel()
+{
+    k->tweenerTable->resetTable();
+    emit clickedResetTween(); 
+}
+
+void TweenerPanel::resetTweener()
+{
+    if (k->currentTweenIndex != -1) {
+        activeTweenComponent(k->currentTweenIndex, false);
+        k->currentTweenIndex = -1;
+    }
+
+    k->tweenerTable->resetTable();
+
+    activeOptionsPanel(true);
+    activeTweenerTableForm(true);
+    activeButtonsPanel(true);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/tweenerpanel.h tupi-0.2+git05/src/plugins/tools/compound/tweenerpanel.h
--- tupi-0.2+git04/src/plugins/tools/compound/tweenerpanel.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/tweenerpanel.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,127 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TWEENERPANEL_H
+#define TWEENERPANEL_H
+
+#include "tglobal.h"
+#include "tupitemtweener.h"
+
+#include <QWidget>
+#include <QGraphicsPathItem>
+#include <QLabel>
+#include <QLineEdit>
+#include <QBoxLayout>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QHeaderView>
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class Configurator;
+
+class TUPI_PLUGIN TweenerPanel : public QWidget 
+{
+    Q_OBJECT
+
+    public:
+
+        enum TweenerType { 
+             Position = 0,
+             Rotation = 1,
+             Scale = 2,
+             Shear = 3,
+             Opacity = 4,
+             Coloring = 5,
+             Compound = 6,
+             Undefined = 7
+        };
+
+        enum Mode { Add = 1, Edit, View };
+        enum EditMode { Selection = 0, TweenList, TweenProperties, None };
+
+        TweenerPanel(QWidget *parent = 0);
+        ~TweenerPanel();
+
+        void setParameters(const QString &name, int framesTotal, int startFrame);
+        void setParameters(TupItemTweener *currentTween);
+        void activateMode(TweenerPanel::EditMode mode);
+        void notifySelection(bool flag);
+        void updateSteps(const QGraphicsPathItem *path, QPointF offset);
+        void initStartCombo(int framesTotal, int currentFrame);
+        int startComboSize();
+        QString tweenToXml(int currentFrame, QPointF point);
+        int totalSteps();
+        QString currentTweenName() const;
+        void cleanTweensForms();
+        void setStartFrame(int currentIndex);
+        void resetTweener();
+
+    private slots:
+        void emitOptionChanged(int option);
+        void showTweenSettings(int tweenType);
+        void activateTweenersTable(TweenerPanel::TweenerType type, const QString &message);
+        void updateTweenersTable(TweenerPanel::Mode mode);
+        void applyTween();
+        void closePanel();
+        void enableApplyButton(bool flag);
+        
+    signals:
+        void clickedSelect();
+        void clickedTweenProperties();
+        void clickedApplyTween();
+        void clickedResetTween();
+        void tweenPropertiesActivated(TweenerPanel::TweenerType flag);
+        void startingPointChanged(int index);
+        void loadPath(bool enable, bool reset);
+        
+    private:
+        void setOptionsPanel();
+        void activeOptionsPanel(bool enable);
+        void setTweenerTableForm();
+        void activeTweenerTableForm(bool enable);
+        void setButtonsPanel();
+        void activeButtonsPanel(bool enable);
+        void loadTweenComponents();
+        void activeTweenComponent(int index, bool enable);
+        void setEditMode();
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/tweenertable.cpp tupi-0.2+git05/src/plugins/tools/compound/tweenertable.cpp
--- tupi-0.2+git04/src/plugins/tools/compound/tweenertable.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/tweenertable.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,128 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tweenertable.h"
+#include "tpushbutton.h"
+#include "tseparator.h"
+
+struct TweenerTable::Private
+{
+    QList<QCheckBox*> *checkList;
+    QList<TPushButton*> *buttonList;
+};
+
+TweenerTable::TweenerTable(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QStringList labels;
+    labels << tr("Position") << tr("Rotation") << tr("Scale") << tr("Shear") << tr("Opacity") << tr("Coloring"); 
+
+    k->checkList = new QList<QCheckBox*>();
+    k->buttonList = new QList<TPushButton*>();
+
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    for (int i = 0; i < labels.size(); ++i) {
+         QHBoxLayout *itemLayout = new QHBoxLayout;
+         itemLayout->setAlignment(Qt::AlignHCenter);
+         itemLayout->setMargin(0);
+         itemLayout->setSpacing(5);
+
+         k->checkList->append(new QCheckBox(this));
+         k->buttonList->append(new TPushButton(this, labels.at(i), 1, i));
+
+         itemLayout->addWidget(k->checkList->at(i));
+         connect(k->checkList->at(i), SIGNAL(stateChanged(int)), this, SLOT(enableTween(int)));
+
+         itemLayout->addWidget(k->buttonList->at(i));
+         connect(k->buttonList->at(i), SIGNAL(clicked(int, int)), this, SLOT(showTweenSettings(int, int)));
+
+         k->buttonList->at(i)->setDisabled(true);
+         innerLayout->addLayout(itemLayout);
+    }
+
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+}
+
+TweenerTable::~TweenerTable()
+{
+    delete k;
+}
+
+void TweenerTable::showTweenSettings(int column, int row)
+{
+    Q_UNUSED(column);
+
+    // tFatal() << "TweenerTable::updatePath() - Row: " << row;
+    emit callTweenerSettings(row);
+}
+
+void TweenerTable::enableTween(int state)
+{
+    Q_UNUSED(state);
+
+    int counter = 0;
+
+    for (int i=0; i < k->checkList->size(); i++) {
+         if (k->checkList->at(i)->isChecked()) {
+             counter++;
+             if (!k->buttonList->at(i)->isEnabled())
+                 k->buttonList->at(i)->setEnabled(true);
+         } else {
+             if (k->buttonList->at(i)->isEnabled())
+                 k->buttonList->at(i)->setEnabled(false);
+         }
+    }
+
+    if (counter == 0)
+        emit enableSaveTween(false);
+    else
+        emit enableSaveTween(true);
+}
+
+void TweenerTable::checkTween(int index, bool flag)
+{
+    k->checkList->at(index)->setChecked(flag);    
+}
+
+void TweenerTable::resetTable()
+{
+    for (int i=0; i < k->checkList->size(); i++) {
+         if (k->checkList->at(i)->isChecked()) 
+             k->checkList->at(i)->setChecked(false);
+    }
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/compound/tweenertable.h tupi-0.2+git05/src/plugins/tools/compound/tweenertable.h
--- tupi-0.2+git04/src/plugins/tools/compound/tweenertable.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compound/tweenertable.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,73 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TWEENERTABLE_H
+#define TWEENERTABLE_H
+
+#include "tglobal.h"
+
+#include <QWidget>
+#include <QBoxLayout>
+#include <QCheckBox>
+#include <QPushButton>
+
+/**
+ * @author Gustav Gonzalez
+*/
+
+class TUPI_PLUGIN TweenerTable : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        TweenerTable(QWidget *parent = 0);
+        ~TweenerTable();
+        void checkTween(int index, bool flag);
+        void resetTable();
+
+    private slots:
+        void showTweenSettings(int column, int row);
+        void enableTween(int state); 
+
+    signals:
+        void callTweenerSettings(int row);
+        void enableSaveTween(bool flag);
+        
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/compoundtool.json tupi-0.2+git05/src/plugins/tools/compoundtool/compoundtool.json
--- tupi-0.2+git04/src/plugins/tools/compoundtool/compoundtool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/compoundtool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "CompoundTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/compoundtool.pro tupi-0.2+git05/src/plugins/tools/compoundtool/compoundtool.pro
--- tupi-0.2+git04/src/plugins/tools/compoundtool/compoundtool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/compoundtool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/compoundtool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += tweener.h \
-           configurator.h \
-           tweenerpanel.h \
-           tweenertable.h \
-           positionsettings.h
-
-SOURCES += tweener.cpp \
-           # buttonspanel.cpp \
-           configurator.cpp \
-           tweenerpanel.cpp \
-           tweenertable.cpp \
-           positionsettings.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupicompoundtool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/configurator.cpp tupi-0.2+git05/src/plugins/tools/compoundtool/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/compoundtool/configurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,333 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "configurator.h"
-#include "tweenmanager.h"
-#include "buttonspanel.h"
-
-#include "tupitemtweener.h"
-#include "tosd.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QBoxLayout>
-
-struct Configurator::Private
-{
-    QBoxLayout *layout;
-    QBoxLayout *settingsLayout;
-
-    TweenerPanel *tweenList;
-    TweenManager *tweenManager;
-    ButtonsPanel *controlPanel;
-
-    TupItemTweener *currentTween;
-
-    int framesTotal;
-    int currentFrame;
-
-    TweenerPanel::Mode mode;
-    Configurator::GuiState state;
-};
-
-Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
-{
-    k->framesTotal = 1;
-    k->currentFrame = 0;
-
-    k->mode = TweenerPanel::View;
-    k->state = Configurator::Manager;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-
-    QLabel *title = new QLabel(tr("Compound Tween"));
-    title->setAlignment(Qt::AlignHCenter);
-    title->setFont(QFont("Arial", 8, QFont::Bold));
-
-    k->layout->addWidget(title);
-
-    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    k->settingsLayout->setMargin(0);
-    k->settingsLayout->setSpacing(0);
-
-    setTweenManagerPanel();
-    setButtonsPanel();
-    setTweenerPanel();
-
-    k->layout->addLayout(k->settingsLayout);
-    k->layout->addStretch(2);
-}
-
-Configurator::~Configurator()
-{
-    delete k;
-}
-
-void Configurator::setTweenManagerPanel()
-{
-    k->tweenManager = new TweenManager(this);
-    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
-    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
-
-    k->settingsLayout->addWidget(k->tweenManager);
-
-    k->state = Configurator::Manager;
-}
-
-void Configurator::activeTweenManagerPanel(bool enable)
-{
-    if (enable)
-        k->tweenManager->show();
-    else
-        k->tweenManager->hide();
-
-    if (k->tweenManager->listSize() > 0)
-        activeButtonsPanel(enable);
-}
-
-void Configurator::setTweenerPanel()
-{
-    k->tweenList = new TweenerPanel(this);
-
-    connect(k->tweenList, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
-    connect(k->tweenList, SIGNAL(clickedTweenProperties()), this, SIGNAL(clickedTweenProperties()));
-    connect(k->tweenList, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
-
-    connect(k->tweenList, SIGNAL(tweenPropertiesActivated(TweenerPanel::TweenerType)), 
-            this, SIGNAL(tweenPropertiesActivated(TweenerPanel::TweenerType)));
-
-    connect(k->tweenList, SIGNAL(startingPointChanged(int)), 
-            this, SIGNAL(startingPointChanged(int)));
-
-    connect(k->tweenList, SIGNAL(clickedResetTween()), this, SLOT(closeTweenList()));
-    connect(k->tweenList, SIGNAL(loadPath(bool, bool)), this, SIGNAL(loadPath(bool, bool)));
-
-    k->settingsLayout->addWidget(k->tweenList);
-    activeTweenerPanel(false);
-}
-
-void Configurator::activeTweenerPanel(bool enable)
-{
-    if (enable)
-        k->tweenList->show();
-    else
-        k->tweenList->hide();
-}
-
-void Configurator::setButtonsPanel()
-{
-    k->controlPanel = new ButtonsPanel(this);
-    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
-    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
-
-    k->settingsLayout->addWidget(k->controlPanel);
-
-    activeButtonsPanel(false);
-}
-
-void Configurator::activeButtonsPanel(bool enable)
-{
-    if (enable)
-        k->controlPanel->show();
-    else
-        k->controlPanel->hide();
-}
-
-void Configurator::setCurrentTween(TupItemTweener *currentTween)
-{
-    k->currentTween = currentTween;
-}
-
-void Configurator::loadTweenList(QList<QString> tweenList)
-{
-    k->tweenManager->loadTweenList(tweenList);
-    if (tweenList.count() > 0)
-        activeButtonsPanel(true);
-}
-
-void Configurator::initStartCombo(int framesTotal, int currentFrame)
-{
-    k->framesTotal = framesTotal;
-    k->currentFrame = currentFrame;
-    k->tweenList->initStartCombo(framesTotal, currentFrame);
-}
-
-void Configurator::setStartFrame(int currentIndex)
-{
-    k->currentFrame = currentIndex;
-    k->tweenList->setStartFrame(currentIndex);
-}
-
-int Configurator::startComboSize()
-{
-    return k->tweenList->startComboSize();
-}
-
-void Configurator::updateSteps(const QGraphicsPathItem *path, QPointF offset)
-{
-    k->tweenList->updateSteps(path, offset);
-}
-
-QString Configurator::tweenToXml(int currentFrame, QPointF point)
-{
-    return k->tweenList->tweenToXml(currentFrame, point);
-}
-
-int Configurator::totalSteps()
-{
-    return k->tweenList->totalSteps();
-}
-
-void Configurator::activateMode(TweenerPanel::EditMode mode)
-{
-    k->tweenList->activateMode(mode);
-}
-
-void Configurator::addTween(const QString &name)
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TweenerPanel::Add;
-    k->state = Configurator::TweenSettings;
-
-    tFatal() << "Configurator::addTween() - framesTotal: " << k->framesTotal;
-    tFatal() << "Configurator::addTween() - currentFrame: " << k->currentFrame;
-
-    k->tweenList->setParameters(name, k->framesTotal, k->currentFrame);
-    activeTweenerPanel(true);
-
-    emit setMode(k->mode);
-}
-
-void Configurator::editTween()
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TweenerPanel::Edit;
-    k->state = Configurator::TweenSettings;
-
-    k->tweenList->notifySelection(true);
-    k->tweenList->setParameters(k->currentTween);
-    activeTweenerPanel(true);
-
-    tFatal() << "Configurator::editTween() - Calling for Edition order!!!";
-
-    emit setMode(k->mode);
-}
-
-void Configurator::removeTween()
-{
-    QString name = k->tweenManager->currentTweenName();
-    k->tweenManager->removeItemFromList();
-
-    removeTween(name);
-}
-
-void Configurator::removeTween(const QString &name)
-{
-    if (k->tweenManager->listSize() == 0)
-        activeButtonsPanel(false);
-
-    emit clickedRemoveTween(name);
-}
-
-QString Configurator::currentTweenName() const
-{
-    QString oldName = k->tweenManager->currentTweenName();
-    QString newName = k->tweenList->currentTweenName();
-
-    if (oldName.compare(newName) != 0)
-        k->tweenManager->updateTweenName(newName);
-
-    return newName;
-}
-
-void Configurator::notifySelection(bool flag)
-{
-    k->tweenList->notifySelection(flag);
-}
-
-void Configurator::cleanTweensForms()
-{
-    k->tweenList->cleanTweensForms();
-}
-
-void Configurator::closeTweenList()
-{
-    if (k->mode == TweenerPanel::Add)
-        k->tweenManager->removeItemFromList();
-
-    emit clickedResetInterface();
-
-    closeTweenerPanel();
-}
-
-void Configurator::closeTweenerPanel()
-{
-    if (k->state == Configurator::TweenSettings) {
-        activeTweenManagerPanel(true);
-        activeTweenerPanel(false);
-        k->mode = TweenerPanel::View;
-        k->state = Configurator::Manager;
-    }
-}
-
-TweenerPanel::Mode Configurator::mode()
-{
-    return k->mode;
-}
-
-void Configurator::applyItem()
-{
-     k->mode = TweenerPanel::Edit;
-     emit clickedApplyTween();
-}
-
-void Configurator::resetUI()
-{
-    k->tweenManager->resetUI();
-    closeTweenerPanel();
-    k->tweenList->notifySelection(false);
-    k->tweenList->resetTweener();
-}
-
-void Configurator::updateTweenData(const QString &name)
-{
-    emit getTweenData(name);
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/configurator.h tupi-0.2+git05/src/plugins/tools/compoundtool/configurator.h
--- tupi-0.2+git04/src/plugins/tools/compoundtool/configurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/configurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONFIGURATOR_H
-#define CONFIGURATOR_H
-
-#include <QFrame>
-#include "tweenerpanel.h"
-
-class QGraphicsPathItem;
-class QListWidgetItem;
-class TupItemTweener;
-class TweenerPanel;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Configurator : public QFrame
-{
-    Q_OBJECT
-
-    public:
-        enum GuiState { Manager = 1, TweenSettings };
-
-        Configurator(QWidget *parent = 0);
-        ~Configurator();
-
-        void loadTweenList(QList<QString> tweenList);
-
-        void initStartCombo(int framesTotal, int currentFrame);
-        void setStartFrame(int currentIndex);
-
-        void updateSteps(const QGraphicsPathItem *path, QPointF offset);
-
-        int totalSteps();
-        void activateMode(TweenerPanel::EditMode mode);
-
-        void cleanTweensForms();
-        void setCurrentTween(TupItemTweener *currentTween);
-        QString currentTweenName() const;
-        void notifySelection(bool flag);
-        int startComboSize();
-        void closeTweenerPanel();
-        TweenerPanel::Mode mode();
-        void resetUI();
-        QString tweenToXml(int currentFrame, QPointF point);
-        
-    private slots:
-        void applyItem();
-        void addTween(const QString &name);
-        void editTween();
-        void removeTween();
-        void removeTween(const QString &name);
-        void closeTweenList();
-        void updateTweenData(const QString &name);
-        
-    signals:
-        void clickedSelect();
-        void clickedTweenProperties();
-        void tweenPropertiesActivated(TweenerPanel::TweenerType flag);
-        void setMode(TweenerPanel::Mode mode);
-        void clickedRemoveTween(const QString &name);
-        void clickedApplyTween();
-        void clickedResetInterface();
-        void loadPath(bool enable, bool reset);
-        void getTweenData(const QString &name);
-        void startingPointChanged(int index);
-
-    private:
-        void setTweenerPanel();
-        void activeTweenerPanel(bool enable);
-        void setTweenManagerPanel();
-        void activeTweenManagerPanel(bool enable);
-        void setButtonsPanel();
-        void activeButtonsPanel(bool enable);
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/positionsettings.cpp tupi-0.2+git05/src/plugins/tools/compoundtool/positionsettings.cpp
--- tupi-0.2+git04/src/plugins/tools/compoundtool/positionsettings.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/positionsettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,325 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "positionsettings.h"
-#include "tradiobuttongroup.h"
-#include "tseparator.h"
-#include "timagebutton.h"
-#include "tdebug.h"
-#include "tupitemtweener.h"
-#include "stepsviewer.h"
-#include "tuptweenerstep.h"
-#include "tosd.h"
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QListWidget>
-#include <QComboBox>
-#include <QPushButton>
-#include <QBoxLayout>
-#include <QHeaderView>
-#include <QGraphicsPathItem>
-
-struct PositionSettings::Private
-{
-    QBoxLayout *layout; 
-
-    StepsViewer *stepViewer;
-    QComboBox *comboInit;
-    QLabel *totalLabel;
-    TweenerPanel::Mode mode; 
-
-    const QGraphicsPathItem *path;
-    QPointF offset;
-
-    TImageButton *applyButton;
-    TImageButton *closeButton;
-};
-
-PositionSettings::PositionSettings(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    setFont(QFont("Arial", 8, QFont::Normal, false));
-
-    QLabel *componentLabel = new QLabel(tr("Component") + ": ");
-    componentLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-
-    QLabel *componentName = new QLabel(tr("Position"));
-    componentName->setAlignment(Qt::AlignHCenter);
-    componentName->setFont(QFont("Arial", 8, QFont::Bold));
-
-    QHBoxLayout *labelLayout = new QHBoxLayout;
-    labelLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    labelLayout->setMargin(0);
-    labelLayout->setSpacing(0);
-    labelLayout->addWidget(componentLabel);
-    labelLayout->addWidget(componentName);
-
-    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
-    startingLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    k->comboInit = new QComboBox();
-    k->comboInit->setFixedWidth(60);
-
-    // SQA: Remove this instruction in the right moment
-    // k->comboInit->setEnabled(false);
-
-    connect(k->comboInit, SIGNAL(currentIndexChanged(int)), this, SIGNAL(startingPointChanged(int)));
-
-    QHBoxLayout *startLayout = new QHBoxLayout;
-    startLayout->setAlignment(Qt::AlignHCenter);
-    startLayout->setMargin(0);
-    startLayout->setSpacing(0);
-    startLayout->addWidget(k->comboInit);
-
-    k->layout->addLayout(labelLayout);
-    k->layout->addWidget(new TSeparator(Qt::Horizontal));
-
-    k->layout->addWidget(startingLabel);
-    k->layout->addLayout(startLayout);
-
-    k->stepViewer = new StepsViewer;
-    k->stepViewer->verticalHeader()->hide();
-
-    k->layout->addWidget(k->stepViewer);
-
-    k->totalLabel = new QLabel(tr("Frames Total") + ": 0");
-    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    QHBoxLayout *totalLayout = new QHBoxLayout;
-    totalLayout->setAlignment(Qt::AlignHCenter);
-    totalLayout->setMargin(0);
-    totalLayout->setSpacing(0);
-    totalLayout->addWidget(k->totalLabel);
-
-    k->layout->addLayout(totalLayout);
-
-    k->applyButton = new TImageButton(QPixmap(kAppProp->themeDir() + "/"  + "icons/save.png"), 22);
-    connect(k->applyButton, SIGNAL(clicked()), this, SLOT(applyTween()));
-    k->applyButton->setEnabled(false);
-
-    k->closeButton = new TImageButton(QPixmap(kAppProp->themeDir() + "/"  + "icons/close.png"), 22);
-    connect(k->closeButton, SIGNAL(clicked()), this, SLOT(closeTweenProperties()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    buttonsLayout->setMargin(0);
-    buttonsLayout->setSpacing(10);
-    buttonsLayout->addWidget(k->applyButton);
-    buttonsLayout->addWidget(k->closeButton);
-
-    k->layout->addSpacing(10);
-    k->layout->addLayout(buttonsLayout);
-    k->layout->setSpacing(5);
-}
-
-PositionSettings::~PositionSettings()
-{
-    delete k;
-}
-
-// Adding new Tween
-
-void PositionSettings::setParameters(int framesTotal, int initFrame)
-{
-    k->mode = TweenerPanel::Add;
-
-    k->stepViewer->cleanRows();
-    k->totalLabel->setText(tr("Frames Total") + ": 0");
-
-    k->comboInit->setEnabled(false);
-    k->closeButton->setIcon(QPixmap(kAppProp->themeDir() + "/"  + "icons/close.png"));
-    k->closeButton->setToolTip(tr("Cancel Tween"));
-
-    initStartCombo(framesTotal, initFrame);
-}
-
-// Editing new Tween
-
-void PositionSettings::setParameters(TupItemTweener *currentTween)
-{
-    setEditMode();
-
-    k->comboInit->setEnabled(true);
-
-    initStartCombo(currentTween->frames(), currentTween->initFrame());
-
-    k->stepViewer->setPath(currentTween->graphicsPath());
-    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->stepViewer->totalSteps()));
-}
-
-void PositionSettings::initStartCombo(int framesTotal, int currentIndex)
-{
-    k->comboInit->clear();
-    for (int i=1; i<=framesTotal; i++)
-         k->comboInit->addItem(QString::number(i));
-
-    k->comboInit->setCurrentIndex(currentIndex);
-}
-
-void PositionSettings::setStartFrame(int currentIndex)
-{
-    k->comboInit->setCurrentIndex(currentIndex);
-}
-
-int PositionSettings::initFrame()
-{
-    return k->comboInit->currentIndex();
-}
-
-int PositionSettings::startComboSize()
-{
-    return k->comboInit->count();
-}
-
-void PositionSettings::updateSteps(const QGraphicsPathItem *path, QPointF offset)
-{
-    k->path = path;
-    k->offset = offset;
-    k->stepViewer->setPath(path);
-    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->stepViewer->totalSteps()));
-
-    if (!k->applyButton->isEnabled())
-        k->applyButton->setEnabled(true);
-}
-
-int PositionSettings::totalSteps()
-{
-    return k->stepViewer->totalSteps();
-}
-
-void PositionSettings::applyTween()
-{
-    if (totalSteps() <= 2) {
-        TOsd::self()->display(tr("Info"), tr("You must define a path for this Tween!"), TOsd::Info);
-        return;
-    }
-
-    setEditMode();
-
-    if (!k->comboInit->isEnabled())
-        k->comboInit->setEnabled(true);
-
-    QString text(tr("Position Tween is set!")); 
-
-    emit clickedApplyTween(TweenerPanel::Position, text);
-}
-
-void PositionSettings::resetTween()
-{
-    k->stepViewer->cleanRows();
-    k->totalLabel->setText(tr("Frames Total") + ": 0");
-}
-
-void PositionSettings::closeTweenProperties()
-{
-    if (k->mode == TweenerPanel::Add)
-        resetTween(); 
-
-    tFatal() << "PositionSettings::closeTweenProperties() - Mode: " << k->mode;
-
-    emit clickedCloseTweenProperties(k->mode);
-}
-
-void PositionSettings::setEditMode()
-{
-    k->mode = TweenerPanel::Edit;
-    k->closeButton->setIcon(QPixmap(kAppProp->themeDir() + "/"  + "icons/close_properties.png"));
-    k->closeButton->setToolTip(tr("Close Tween properties"));
-}
-
-/* This method transforms the path created into a QString representation */
-
-QString PositionSettings::pathToCoords(const QGraphicsPathItem *path, QPointF offset)
-{
-    QString strPath = "";
-    QChar t;
-    int offsetX = offset.x();
-    int offsetY = offset.y();
-
-    for (int i=0; i < path->path().elementCount(); i++) {
-         QPainterPath::Element e = path->path().elementAt(i);
-         switch (e.type) {
-            case QPainterPath::MoveToElement:
-            {
-                if (t != 'M') {
-                    t = 'M';
-                    strPath += "M " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                } else {
-                    strPath += QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                }
-            }
-            break;
-            case QPainterPath::LineToElement:
-            {
-                if (t != 'L') {
-                    t = 'L';
-                    strPath += " L " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                } else {
-                    strPath += QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                }
-            }
-            break;
-            case QPainterPath::CurveToElement:
-            {
-                if (t != 'C') {
-                    t = 'C';
-                    strPath += " C " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                } else {
-                    strPath += "  " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                }
-            }
-            break;
-            case QPainterPath::CurveToDataElement:
-            {
-                if (t == 'C')
-                    strPath +=  " " + QString::number(e.x + offsetX) + "  " + QString::number(e.y + offsetY) + " ";
-            }
-            break;
-        }
-    }
-
-    return strPath.trimmed();
-}
-
-QString PositionSettings::pathString()
-{
-    return pathToCoords(k->path, k->offset);
-}
-
-QVector<TupTweenerStep *> PositionSettings::steps()
-{
-    return k->stepViewer->steps();
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/positionsettings.h tupi-0.2+git05/src/plugins/tools/compoundtool/positionsettings.h
--- tupi-0.2+git04/src/plugins/tools/compoundtool/positionsettings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/positionsettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef POSITIONSETTINGS_H
-#define POSITIONSETTINGS_H
-
-#include <QWidget>
-
-#include "tweenerpanel.h"
-#include "tuptweenerstep.h"
-
-class QGraphicsPathItem;
-class TupItemTweener;
-class TweenerPanel;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class PositionSettings : public QWidget 
-{
-    Q_OBJECT
-
-    public:
-
-        PositionSettings(QWidget *parent = 0);
-        ~PositionSettings();
-
-        void setParameters(int framesTotal, int initFrame);
-        void setParameters(TupItemTweener *currentTween);
-        void initStartCombo(int totalFrames, int currentIndex);
-        void setStartFrame(int currentIndex);
-        int initFrame();
-
-        void updateSteps(const QGraphicsPathItem *path, QPointF offset);
-        int totalSteps();
-        int startComboSize();
-        QString pathString();
-        QVector<TupTweenerStep *> steps();
-
-    public slots:
-        void resetTween();
-        
-    private slots:
-        void applyTween();
-        void closeTweenProperties();
-        
-    signals:
-        void clickedCreatePath();
-        void clickedSelect();
-        void clickedCloseTweenProperties(TweenerPanel::Mode mode);
-        void clickedApplyTween(TweenerPanel::TweenerType type, const QString &text);
-        void startingPointChanged(int index);
-        
-    private:
-        QString pathToCoords(const QGraphicsPathItem *path, QPointF offset);
-        void setEditMode();
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/tweener.cpp tupi-0.2+git05/src/plugins/tools/compoundtool/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/compoundtool/tweener.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,948 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tweener.h"
-
-#include "tglobal.h"
-#include "tdebug.h"
-#include "taction.h"
-#include "tnodegroup.h"
-#include "tosd.h"
-#include "tupsvg2qt.h"
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicsscene.h"
-#include "tupgraphicobject.h"
-#include "tuppathitem.h"
-#include "tupellipseitem.h"
-#include "tuprectitem.h"
-#include "tuplineitem.h"
-#include "tupsvgitem.h"
-#include "tupitemtweener.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QGraphicsPathItem>
-#include <QPainterPath>
-#include <QMatrix>
-#include <QGraphicsLineItem>
-#include <QGraphicsView>
-#include <QDomDocument>
-
-struct Tweener::Private
-{
-    QMap<QString, TAction *> actions;
-    Configurator *configurator;
-
-    TupGraphicsScene *scene;
-    QGraphicsPathItem *path;
-    QList<QGraphicsItem *> objects;
-
-    TupItemTweener *currentTween;
-
-    TNodeGroup *group;
-
-    bool pathAdded;
-    int startPoint;
-
-    TweenerPanel::Mode mode;
-    TweenerPanel::TweenerType currentTweenType;
-    TweenerPanel::EditMode editMode;
-
-    QPointF itemObjectReference;
-    QPointF pathOffset;
-    QPointF firstNode;
-
-    int baseZValue;
-};
-
-Tweener::Tweener() : TupToolPlugin(), k(new Private)
-{
-    setupActions();
-
-    k->configurator = 0;
-    k->path = 0;
-    k->group = 0;
-    k->startPoint = 0;
-}
-
-Tweener::~Tweener()
-{
-    delete k;
-}
-
-/* This method initializes the plugin */
-
-void Tweener::init(TupGraphicsScene *scene)
-{
-    delete k->path;
-    k->path = 0;
-    k->pathAdded = false;
-    delete k->group;
-    k->group = 0;
-    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
-
-    k->scene = scene;
-    k->objects.clear();
-
-    k->pathOffset = QPointF(0, 0); 
-    k->firstNode = QPointF(0, 0);
-    k->itemObjectReference = QPointF(0, 0);
-
-    k->mode = TweenerPanel::View;
-    k->editMode = TweenerPanel::None;
-
-    k->configurator->resetUI();
-
-    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Compound);
-    if (tweenList.size() > 0) {
-        k->configurator->loadTweenList(tweenList);
-        setCurrentTween(tweenList.at(0));
-    }
-
-    int total = framesTotal();
-    k->configurator->initStartCombo(total, k->scene->currentFrameIndex());
-}
-
-void Tweener::updateStartPoint(int index)
-{
-    if (k->startPoint != index && index >= 0) {
-        tFatal() << "Tweener::updateStartPoint() - New Start Point: " << k->startPoint;
-        k->startPoint = index;
-    }
-}
-
-/* This method returns the plugin name */
-
-QStringList Tweener::keys() const
-{
-    return QStringList() << tr("Compound Tween");
-}
-
-/* This method makes an action when the mouse is pressed on the workspace 
- * depending on the active mode: Selecting an object or Creating a path  
-*/
-
-void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-
-    if (k->editMode == TweenerPanel::TweenProperties && k->scene->currentFrameIndex() == k->startPoint) {
-        if (k->currentTweenType == TweenerPanel::Position) {
-            if (k->path) {
-                QPointF point = k->path->mapFromParent(input->pos());
-                QPainterPath path = k->path->path();
-                path.cubicTo(point, point, point);
-                k->path->setPath(path);
-            }
-        } else {
-            tFatal() << "Tweener::press() - No position!";
-        }
-    } 
-}
-
-/* This method is executed while the mouse is pressed and on movement */
-
-void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method finishes the action started on the press method depending
- * on the active mode: Selecting an object or Creating a path
-*/
-
-void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (scene->currentFrameIndex() == k->startPoint) {
-
-        if (k->editMode == TweenerPanel::TweenProperties) {
-
-            if (k->currentTweenType == TweenerPanel::Position) {
-
-                if (k->group) {
-                    k->group->createNodes(k->path);
-                    k->group->expandAllNodes();
-                    k->configurator->updateSteps(k->path, k->pathOffset);
-                    QPainterPath::Element e = k->path->path().elementAt(0);
-                    QPointF begin = QPointF(e.x, e.y);
-
-                    if (begin != k->firstNode) {
-                        QPointF oldPos = k->firstNode;
-                        QPointF newPos = begin;
-
-                        int distanceX = newPos.x() - oldPos.x();
-                        int distanceY = newPos.y() - oldPos.y();
-
-                        if (k->objects.size() > 0) {
-                            foreach (QGraphicsItem *item, k->objects)
-                                     item->moveBy(distanceX, distanceY);
-                            QGraphicsItem *item = k->objects.at(0);
-                            QRectF rect = item->sceneBoundingRect();
-                            k->itemObjectReference = rect.center();
-                        }
-
-                        k->firstNode = newPos;
-                    }
-                }
-            } else {
-                tFatal() << "Tweener::release() - No position!";
-            }
-
-        } else {
-
-            // if k->editMode == TweenerPanel::TweenSelection
-
-            if (scene->selectedItems().size() > 0) {
-
-                k->objects = scene->selectedItems();
-                k->configurator->notifySelection(true);
-
-                QGraphicsItem *item = k->objects.at(0);
-                QRectF rect = item->sceneBoundingRect();
-                QPointF newPos = rect.center();
-                QPointF oldPos = k->itemObjectReference;
-                k->itemObjectReference = newPos;
-
-                if (!k->path) {
-                    k->path = new QGraphicsPathItem;
-                    k->path->setZValue(maxZValue());
-
-                    QColor color = Qt::lightGray;
-                    color.setAlpha(200);
-                    QPen pen(QBrush(color), 1, Qt::DotLine);
-                    k->path->setPen(pen);
-
-                    QPainterPath path;
-                    path.moveTo(newPos);
-                    k->firstNode = newPos;
-                    k->path->setPath(path);
-                    scene->addItem(k->path);
-                    k->pathAdded = true;
-
-                    k->pathOffset = QPointF(0, 0);
-                } else {
-                    int distanceX = newPos.x() - oldPos.x();
-                    int distanceY = newPos.y() - oldPos.y();
-                    k->path->moveBy(distanceX, distanceY);
-
-                    k->pathOffset = QPointF(distanceX, distanceY);
-                }
-            } 
-        }
-    } 
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-QMap<QString, TAction *> Tweener::actions() const
-{
-    return k->actions;
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-int Tweener::toolType() const
-{
-    return TupToolInterface::Tweener;
-}
-
-/* This method returns the tool panel associated to this plugin */
-
-QWidget *Tweener::configurator()
-{
-    if (!k->configurator) {
-        k->mode = TweenerPanel::View;
-
-        k->configurator = new Configurator;
-
-        connect(k->configurator, SIGNAL(tweenPropertiesActivated(TweenerPanel::TweenerType)), 
-                this, SLOT(updateCurrentTweenerType(TweenerPanel::TweenerType)));
-
-        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
-
-        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelect()));
-        connect(k->configurator, SIGNAL(clickedTweenProperties()), this, SLOT(tweenListMode()));
-
-        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
-        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
-        connect(k->configurator, SIGNAL(loadPath(bool, bool)), this, SLOT(setPath(bool, bool)));
-
-        connect(k->configurator, SIGNAL(setMode(TweenerPanel::Mode)), this, SLOT(updateMode(TweenerPanel::Mode)));
-        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
-        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
-
-    } else {
-        k->mode = k->configurator->mode();
-    }
-
-    return k->configurator;
-}
-
-/* This method is called when there's a change on/of scene */
-void Tweener::aboutToChangeScene(TupGraphicsScene *)
-{
-}
-
-/* This method is called when this plugin is off */
-void Tweener::aboutToChangeTool()
-{
-    if (k->editMode == TweenerPanel::Selection) {
-        clearSelection();
-        disableSelection();
-    } else if (k->editMode == TweenerPanel::TweenProperties) {
-        if (k->currentTweenType == TweenerPanel::Position) {
-            if (k->path) {
-                tFatal() << "Tweener::aboutToChangeTool() - Removing path!";
-                k->scene->removeItem(k->path);
-                k->pathAdded = false;
-                delete k->group;
-                k->group = 0;
-            }
-        }
-    }
-
-    k->mode = TweenerPanel::View;
-    k->editMode = TweenerPanel::None;
-    k->currentTweenType = TweenerPanel::Undefined;
-}
-
-/* SQA: What is it? 
-bool Tweener::isComplete() const
-{
-    return true;
-}
-*/
-
-/* This method defines the actions contained in this plugin */
-
-void Tweener::setupActions()
-{
-    TAction *translater = new TAction(QPixmap(kAppProp->themeDir() + "icons/compound_tween.png"), 
-                                      tr("Compound Tween"), this);
-    translater->setCursor(QCursor(kAppProp->themeDir() + "cursors/tweener.png"));
-    translater->setShortcut(QKeySequence(tr("Shift+X")));
-
-    k->actions.insert(tr("Compound Tween"), translater);
-}
-
-/* This method initializes the "Create path" mode */
-
-void Tweener::setCreatePath()
-{
-    if (k->path) {
-
-        k->pathOffset = QPointF(0, 0);
-
-        if (!k->pathAdded) {
-            k->scene->addItem(k->path);
-            k->pathAdded = true;
-        } 
-
-        if (k->group) {
-            k->group->createNodes(k->path);
-        } else {
-            k->group = new TNodeGroup(k->path, k->scene, TNodeGroup::CompoundTween, k->baseZValue);
-            connect(k->group, SIGNAL(nodeReleased()), SLOT(updatePath()));
-            k->group->createNodes(k->path);
-        }
-        k->group->expandAllNodes();
-
-    }
-
-    disableSelection();
-}
-
-/* This method initializes the "Select object" mode */
-
-void Tweener::setSelect()
-{
-    if (k->mode == TweenerPanel::Edit) {
-        if (k->startPoint != k->scene->currentFrameIndex()) {
-            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
-                                                                            k->scene->currentLayerIndex(),
-                                                                            k->startPoint, TupProjectRequest::Select, "1");
-            emit requested(&request);
-        }
-    }
-
-    k->editMode = TweenerPanel::Selection;
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             view->setDragMode(QGraphicsView::RubberBandDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      if ((item->zValue() >= 20000) && (item->toolTip().length()==0)) {
-                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                      }
-             }
-    }
-
-    // When Object selection is enabled, previous selection is set
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                 item->setSelected(true);
-        }
-    }
-}
-
-/* This method resets this plugin */
-
-void Tweener::applyReset()
-{
-    tFatal() << "Tweener::applyReset() - Fire in the hole!";
-
-    k->mode = TweenerPanel::View;
-    k->editMode = TweenerPanel::None;
-    k->currentTweenType = TweenerPanel::Undefined;
-
-    clearSelection();
-    disableSelection();
-
-    k->pathAdded = false;
-    k->path = 0;
-
-    k->startPoint = k->scene->currentFrameIndex();
-    k->configurator->cleanTweensForms();
-}
-
-/* This method applies to the project, the Tween created from this plugin */
-
-void Tweener::applyTween()
-{
-    QString name = k->configurator->currentTweenName();
-
-    if (name.length() == 0) {
-        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
-        return;
-    }
-
-    // SQA: Remove this code
-    /*
-    if (k->startPoint != k->scene->currentFrameIndex()) {
-        TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
-                                                                       k->scene->currentLayerIndex(),
-                                                                       k->startPoint, TupProjectRequest::Select, "1");
-        emit requested(&request);
-    }
-    */
-
-    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Compound))
-        tFatal() << "Tweener::applyTween() - Tween " << name << " is NEW!!!"; 
-    else
-        tFatal() << "Tweener::applyTween() - Tween " << name << " is NOT NEW!!!";
-  
-    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Compound)) {
-
-        foreach (QGraphicsItem *item, k->objects) {   
-
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 int objectIndex = k->scene->currentFrame()->indexOf(item); 
-                 QRectF rect = item->sceneBoundingRect();
-                 QPointF point = rect.topLeft();
-
-                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = k->scene->currentFrame()->indexOf(svg);
-                 } else {
-                     if (qgraphicsitem_cast<TupPathItem *>(item) || qgraphicsitem_cast<TupEllipseItem *>(item) 
-                         || qgraphicsitem_cast<TupLineItem *>(item) || qgraphicsitem_cast<TupRectItem *>(item))
-                         point = item->pos();
-                 }
-
-                 tFatal() << "Tweener::applyTween() - Point 1: [" << point.x() << ", " << point.y() << "]";
-                 QDomDocument dom;
-                 dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
-                 tFatal() << "";
-                 tFatal() << "Tweener::applyTween() - " << dom.toString();
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                            k->scene->currentSceneIndex(),
-                                            k->scene->currentLayerIndex(),
-                                            k->startPoint,
-                                            objectIndex,
-                                            QPointF(), k->scene->spaceMode(), 
-                                            type, TupProjectRequest::SetTween, 
-                                            k->configurator->tweenToXml(k->startPoint, point));
-                 emit requested(&request);
-        }
-
-        int framesNumber = framesTotal();
-        int total = k->startPoint + k->configurator->totalSteps() - 1;
-
-        if (total > framesNumber) {
-            for (int i = framesNumber; i <= total; i++) {
-                 TupProjectRequest requestFrame = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
-                                                                                      k->scene->currentLayerIndex(),
-                                                                                      i, TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
-                 emit requested(&requestFrame);
-            }
-        }
-
-        TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(), 
-                                                                        k->scene->currentLayerIndex(),
-                                                                        k->startPoint, TupProjectRequest::Select, "1");
-        emit requested(&request);
-
-    } else {
-
-        removeTweenFromProject(name);
-        QList<QGraphicsItem *> newList;
-
-        foreach (QGraphicsItem *item, k->objects) {
-
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 TupScene *scene = k->scene->scene();
-                 TupLayer *layer = scene->layer(k->scene->currentLayerIndex());
-                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
-                 int objectIndex = frame->indexOf(item);
-
-                 QRectF rect = item->sceneBoundingRect();
-                 QPointF point = rect.topLeft();
-
-                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = frame->indexOf(svg);
-                 } else {
-                     if (qgraphicsitem_cast<TupPathItem *>(item) || qgraphicsitem_cast<TupEllipseItem *>(item) 
-                         || qgraphicsitem_cast<TupLineItem *>(item) || qgraphicsitem_cast<TupRectItem *>(item))
-                         point = item->pos();
-                 }
-
-                 if (k->startPoint != k->currentTween->initFrame()) {
-                     QDomDocument dom;
-                     dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
-
-                     tFatal() << "Tweener::applyTween() - Point 2: [" << point.x() << ", " << point.y() << "]";
-                     tFatal() << "";
-                     tFatal() << "Tweener::applyTween() - " << dom.toString();
-
-                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(), 
-                                                                                    k->scene->currentLayerIndex(), 
-                                                                                    k->startPoint, -1, 
-                                                                                    QPointF(), k->scene->spaceMode(),
-                                                                                    type, TupProjectRequest::Add, 
-                                                                                    dom.toString());
-                     emit requested(&request);
-
-                     request = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(), 
-                                                                   k->scene->currentLayerIndex(),
-                                                                   k->currentTween->initFrame(),
-                                                                   objectIndex, QPointF(), 
-                                                                   k->scene->spaceMode(), type,
-                                                                   TupProjectRequest::Remove);
-                     emit requested(&request);
-
-                     frame = layer->frame(k->startPoint);
-                     if (type == TupLibraryObject::Item)
-                         objectIndex = frame->graphicItemsCount() - 1;
-                     else
-                         objectIndex = frame->svgItemsCount() - 1;
-
-                     newList.append(frame->graphic(objectIndex)->item());
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                            k->scene->currentSceneIndex(),
-                                            k->scene->currentLayerIndex(),
-                                            k->startPoint,
-                                            objectIndex,
-                                            QPointF(), k->scene->spaceMode(), 
-                                            type, TupProjectRequest::SetTween,
-                                            k->configurator->tweenToXml(k->startPoint, point));
-                 emit requested(&request);
-
-                 int total = k->startPoint + k->configurator->totalSteps();
-
-                 int framesNumber = framesTotal();
-
-                 if (framesNumber < total) {
-                     for (int i = framesNumber; i < total; i++) {
-                          TupProjectRequest requestFrame = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
-                                                          k->scene->currentLayerIndex(),
-                                                          i, TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
-                          emit requested(&requestFrame);
-                     }
-                 }
-
-                 request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(), k->scene->currentLayerIndex(),
-                                                                k->startPoint, TupProjectRequest::Select, "1");
-                 emit requested(&request);
-        }
-
-        if (newList.size() > 0)
-            k->objects = newList;
-    }
-
-    setCurrentTween(name);
-
-    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
-}
-
-/* This method updates the data of the path into the tool panel 
- * and disables edition mode for nodes
-*/
-
-void Tweener::updatePath()
-{
-    k->configurator->updateSteps(k->path, k->pathOffset);
-}
-
-/* This method saves the settings of this plugin */
-
-void Tweener::saveConfig()
-{
-}
-
-/* This method updates the workspace when the plugin changes the scene */
-
-void Tweener::updateScene(TupGraphicsScene *scene)
-{
-    k->mode = k->configurator->mode();
-
-    if (k->mode == TweenerPanel::Edit) {
-
-       tFatal() << "Tweener::updateScene() - Mode: TweenerPanel::Edit";
-
-       int total = k->startPoint + k->configurator->totalSteps();
-
-       if (k->editMode == TweenerPanel::TweenProperties) {
-           if (k->currentTweenType == TweenerPanel::Position) {
-               if (scene->currentFrameIndex() >= k->startPoint && scene->currentFrameIndex() < total) {
-                   if (k->path && k->group) {
-                       k->scene->addItem(k->path);            
-                       k->group->createNodes(k->path);
-                       k->group->expandAllNodes();
-                   }
-               }
-           }
-       } 
-
-       int framesNumber = framesTotal();
-
-       if (k->configurator->startComboSize() < framesNumber)
-           k->configurator->initStartCombo(framesNumber, k->startPoint);
-
-    } else if (k->mode == TweenerPanel::Add) {
-
-               tFatal() << "Tweener::updateScene() - Mode: TweenerPanel::Add";
-
-               int total = framesTotal();
-
-               if (k->configurator->startComboSize() < total) {
-                   k->configurator->initStartCombo(total, k->startPoint);
-               } else {
-                   if (scene->currentFrameIndex() != k->startPoint)
-                       k->configurator->setStartFrame(scene->currentFrameIndex());
-               }
-
-               if (k->editMode == TweenerPanel::TweenProperties) {
-
-                   if (k->currentTweenType == TweenerPanel::Position)
-                       k->path = 0;
-
-                   k->configurator->cleanTweensForms();
-
-                   clearSelection();
-                   k->configurator->activateMode(TweenerPanel::Selection);
-
-               } else if (k->editMode == TweenerPanel::Selection) {
-
-                          if (k->currentTweenType == TweenerPanel::Position)                       
-                              k->path = 0;
-
-                          if (scene->currentFrameIndex() != k->startPoint) {
-                              clearSelection();
-                              k->startPoint = scene->currentFrameIndex();
-                              setSelect();
-                          }
-
-               } else if (k->editMode == TweenerPanel::TweenList) {
-
-                          if (scene->currentFrameIndex() != k->startPoint) {
-                              k->startPoint = scene->currentFrameIndex(); 
-                              clearSelection();
-                              k->configurator->activateMode(TweenerPanel::Selection);
-                          }
-               }
-
-    } else {
-             tFatal() << "Tweener::updateScene() - Mode: TweenerPanel::View";
-
-             if (scene->currentFrameIndex() != k->startPoint) {
-                 k->configurator->setStartFrame(scene->currentFrameIndex());
-             }
-    }
-}
-
-void Tweener::updateMode(TweenerPanel::Mode mode)
-{
-    k->mode = mode;
-
-    if (k->mode == TweenerPanel::Edit)
-        setEditEnv();
-}
-
-int Tweener::maxZValue()
-{
-    int max = -1;
-    foreach (QGraphicsView *view, k->scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      if (item->zValue() > max)
-                          max = item->zValue();
-
-             }
-    }
-
-    return max + 1;
-}
-
-void Tweener::removeTweenFromProject(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    scene->removeTween(name, TupItemTweener::Compound);
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      QString tip = item->toolTip();
-                      if (tip.startsWith(tr("Compound Tween") + ": " + name))
-                          item->setToolTip("");
-             }
-    }
-}
-
-void Tweener::removeTween(const QString &name)
-{
-    removeTweenFromProject(name);
-    applyReset();
-}
-
-void Tweener::setCurrentTween(const QString &name)
-{
-    tFatal() << "Tweener::setCurrentTween(Tweener::setCurrentTween() - Updating tweener: " << name;
-
-    TupScene *scene = k->scene->scene();
-    k->currentTween = scene->tween(name, TupItemTweener::Compound);
-    if (k->currentTween) {
-        k->configurator->setCurrentTween(k->currentTween);
-    } 
-}
-
-void Tweener::setEditEnv()
-{
-    tFatal() << "void Tweener::setEditEnv() - Just tracing!!!";
-
-    k->startPoint = k->currentTween->initFrame();
-    if (k->startPoint != k->scene->currentFrameIndex()) {
-        TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->scene->currentSceneIndex(),
-                                                                       k->scene->currentLayerIndex(),
-                                                                       k->startPoint, TupProjectRequest::Select, "1");
-        emit requested(&request);
-    }
-
-    k->mode = TweenerPanel::Edit;
-
-    TupScene *scene = k->scene->scene();
-    k->objects = scene->getItemsFromTween(k->currentTween->name(), TupItemTweener::Compound);
-    QGraphicsItem *item = k->objects.at(0);
-    QRectF rect = item->sceneBoundingRect();
-    k->itemObjectReference = rect.center();
-
-    if (k->currentTween->contains(TupItemTweener::Position)) {
-
-        tFatal() << "void Tweener::setEditEnv() - Adding path!";
-
-        k->path = k->currentTween->graphicsPath();
-        k->path->setZValue(maxZValue());
-
-        QPainterPath::Element e  = k->path->path().elementAt(0);
-        k->firstNode = QPointF(e.x, e.y);
-
-        QPointF oldPos = QPointF(e.x, e.y);
-        QPointF newPos = rect.center();
-
-        int distanceX = newPos.x() - oldPos.x();
-        int distanceY = newPos.y() - oldPos.y();
-        k->path->moveBy(distanceX, distanceY);
-        k->pathOffset = QPointF(distanceX, distanceY);
-
-        QColor color = Qt::lightGray;
-        color.setAlpha(200);
-        QPen pen(QBrush(color), 1, Qt::DotLine);
-        k->path->setPen(pen);
-
-        // setCreatePath();
-    }
-}
-
-int Tweener::framesTotal()
-{
-    int total = 1;
-    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
-    if (layer)
-        total = layer->framesTotal();
-
-    return total;
-}
-
-/* This method clear selection */
-
-void Tweener::clearSelection()
-{
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 if (item->isSelected())
-                     item->setSelected(false);
-        }
-        k->objects.clear();
-        k->configurator->notifySelection(false);
-    }
-}
-
-/* This method disables object selection */
-
-void Tweener::disableSelection()
-{
-    foreach (QGraphicsView *view, k->scene->views()) {
-             view->setDragMode (QGraphicsView::NoDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-void Tweener::updateCurrentTweenerType(TweenerPanel::TweenerType type)
-{
-    tFatal() << "updateCurrentTweenerType() - Just following type: " << type;
-    k->currentTweenType = type;
-    k->editMode = TweenerPanel::TweenProperties;
-
-    if (k->currentTweenType == TweenerPanel::Position) {
-        tFatal() << "Tweener::updateCurrentTweenerType() - Setting path!";
-        setCreatePath();
-    } else  {
-        tFatal() << "Tweener::updateCurrentTweenerType() - Type is not Position!";
-    }
-}
-
-void Tweener::setPath(bool isEnabled, bool reset)
-{
-    if (isEnabled) {
-        k->editMode = TweenerPanel::TweenProperties;
-        setCreatePath();
-    } else {
-        if (k->group) {
-            k->group->clear();
-            k->group = 0;
-        }
-
-        if (k->path) {
-
-            if (k->startPoint == k->scene->currentFrameIndex())
-                k->scene->removeItem(k->path);
-
-            k->pathAdded = false;
-
-            if (reset) {
-                QPainterPath::Element e  = k->path->path().elementAt(0);
-                QPointF newPos = QPointF(e.x, e.y);
-
-                k->path = new QGraphicsPathItem;
-                k->path->setZValue(maxZValue());
-
-                QColor color = Qt::lightGray;
-                color.setAlpha(200);
-                QPen pen(QBrush(color), 1, Qt::DotLine);
-                k->path->setPen(pen);
-
-                QPainterPath path;
-                path.moveTo(newPos);
-                k->firstNode = newPos;
-                k->path->setPath(path);
-            }
-        }
-    }
-}
-
-void Tweener::tweenListMode()
-{
-   k->editMode = TweenerPanel::TweenList;
-   disableSelection();
-}
-
-void Tweener::sceneResponse(const TupSceneResponse *event)
-{
-    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
-        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
-        init(k->scene);
-    }
-
-    if (event->action() == TupProjectRequest::Select)
-        init(k->scene);
-}
-
-void Tweener::layerResponse(const TupLayerResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove)
-        init(k->scene);
-}
-
-void Tweener::frameResponse(const TupFrameResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
-        init(k->scene);
-}
-
-Q_EXPORT_PLUGIN2(tup_tweener, Tweener);
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/tweener.h tupi-0.2+git05/src/plugins/tools/compoundtool/tweener.h
--- tupi-0.2+git04/src/plugins/tools/compoundtool/tweener.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/tweener.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef POSITIONTWEENER_H
-#define POSITIONTWEENER_H
-
-#include "tuptoolplugin.h"
-#include "configurator.h"
-#include "tweenerpanel.h"
-#include "tupprojectresponse.h"
-
-/**
- * @author Gustav Gonzalez 
- *
-*/
-
-class Tweener : public TupToolPlugin
-{
-    Q_OBJECT
-
-    public:
-        Tweener();
-        virtual ~Tweener();
-        virtual void init(TupGraphicsScene *scene);
-
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void updateScene(TupGraphicsScene *scene);
-        virtual QMap<QString, TAction *>actions() const;
-        virtual QWidget *configurator();
-        virtual void aboutToChangeTool();
-        virtual void saveConfig();
-
-        int toolType() const;
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        // bool isComplete() const;
-
-        virtual void sceneResponse(const TupSceneResponse *event);
-        virtual void layerResponse(const TupLayerResponse *event);
-        virtual void frameResponse(const TupFrameResponse *event);
-
-    private:
-        int framesTotal();
-        void setupActions();
-        int maxZValue();
-        void clearSelection();
-        void removeTweenFromProject(const QString &name);
-        void disableSelection();
-
-    private:
-        struct Private;
-        Private *const k;
-
-    private slots:
-        void updateCurrentTweenerType(TweenerPanel::TweenerType type);
-        void applyReset();
-        void applyTween();
-        void removeTween(const QString &name);
-        void setCreatePath();
-        void setSelect();
-        void setEditEnv();
-        void updateMode(TweenerPanel::Mode mode);
-        void updateStartPoint(int index);
-        void setCurrentTween(const QString &name);
-        void setPath(bool isEnabled, bool reset);
-        void tweenListMode();
-
-    public slots:
-        void updatePath();
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/tweenerpanel.cpp tupi-0.2+git05/src/plugins/tools/compoundtool/tweenerpanel.cpp
--- tupi-0.2+git04/src/plugins/tools/compoundtool/tweenerpanel.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/tweenerpanel.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,556 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tweenerpanel.h"
-#include "positionsettings.h"
-#include "tdebug.h"
-#include "tradiobuttongroup.h"
-#include "timagebutton.h"
-#include "tseparator.h"
-#include "tweenertable.h"
-#include "tosd.h"
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QBoxLayout>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QHeaderView>
-
-struct TweenerPanel::Private
-{
-    QWidget *optionsPanel;
-    QWidget *tweenerTablePanel; QWidget *buttonsPanel;
-    QBoxLayout *layout;
-
-    QList<QWidget*> *panelList;
-
-    TweenerPanel::Mode mode;
-    EditMode editMode;
-
-    QLineEdit *input;
-    TRadioButtonGroup *options;
-
-    TweenerTable *tweenerTable;
-    int currentTweenIndex;
-    QList<TweenerPanel::TweenerType> tweenerList;
-
-    PositionSettings *positionPanel;
-
-    QLabel *totalLabel;
-    int totalSteps;
-
-    bool selectionDone;
-
-    TImageButton *applyButton;
-    TImageButton *closeButton;
-};
-
-TweenerPanel::TweenerPanel(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    k->selectionDone = false;
-    k->editMode = TweenerPanel::None;
-    k->totalSteps = 0;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    setFont(QFont("Arial", 8, QFont::Normal, false));
-
-    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
-    k->input = new QLineEdit;
-
-    QHBoxLayout *nameLayout = new QHBoxLayout;
-    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    nameLayout->setMargin(0);
-    nameLayout->setSpacing(0);
-    nameLayout->addWidget(nameLabel);
-    nameLayout->addWidget(k->input);
-
-    k->layout->addLayout(nameLayout);
-
-    setOptionsPanel();
-    setTweenerTableForm();
-    loadTweenComponents();
-    setButtonsPanel();
-
-    k->layout->setSpacing(0);
-
-    activateMode(TweenerPanel::Selection);
-}
-
-TweenerPanel::~TweenerPanel()
-{
-    delete k;
-}
-
-void TweenerPanel::setOptionsPanel()
-{
-    k->optionsPanel = new QWidget;
-
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->optionsPanel);
-    innerLayout->setMargin(0);
-    innerLayout->setSpacing(0);
-
-    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
-    k->options->addItem(tr("Select object"), 0);
-    k->options->addItem(tr("Set Tweeners"), 1);
-    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
-
-    innerLayout->addWidget(k->options);
-
-    k->layout->addWidget(k->optionsPanel);
-    activeOptionsPanel(true);
-}
-
-void TweenerPanel::activeOptionsPanel(bool enable)
-{
-    if (enable && !k->optionsPanel->isVisible())
-        k->optionsPanel->show();
-    else
-        k->optionsPanel->hide();
-}
-
-void TweenerPanel::setTweenerTableForm()
-{
-    k->tweenerTablePanel = new QWidget;
-
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->tweenerTablePanel);
-    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QLabel *startingLabel = new QLabel(tr("Tweeners") + ": ");
-
-    QHBoxLayout *startLayout = new QHBoxLayout;
-    startLayout->setAlignment(Qt::AlignHCenter);
-    startLayout->setMargin(0);
-    startLayout->setSpacing(0);
-    startLayout->addWidget(startingLabel);
-
-    k->tweenerTable = new TweenerTable;
-    connect(k->tweenerTable, SIGNAL(callTweenerSettings(int)), this, SLOT(showTweenSettings(int)));
-    connect(k->tweenerTable, SIGNAL(enableSaveTween(bool)), this, SLOT(enableApplyButton(bool)));
-
-    innerLayout->addLayout(startLayout);
-    innerLayout->addWidget(k->tweenerTable);
-
-    k->layout->addWidget(k->tweenerTablePanel);
-    activeTweenerTableForm(false);
-}
-
-void TweenerPanel::activeTweenerTableForm(bool enable)
-{
-    if (enable && !k->tweenerTablePanel->isVisible())
-        k->tweenerTablePanel->show();
-    else
-        k->tweenerTablePanel->hide();
-}
-
-void TweenerPanel::setButtonsPanel()
-{
-    k->buttonsPanel = new QWidget;
-
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->buttonsPanel);
-    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    k->applyButton = new TImageButton(QPixmap(kAppProp->themeDir() + "/"  + "icons/save.png"), 22);
-    k->applyButton->setDisabled(true);
-    connect(k->applyButton, SIGNAL(clicked()), this, SLOT(applyTween()));
-
-    k->closeButton = new TImageButton(QPixmap(kAppProp->themeDir() + "/"  + "icons/close.png"), 22);
-    connect(k->closeButton, SIGNAL(clicked()), this, SLOT(closePanel()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    buttonsLayout->setMargin(0);
-    buttonsLayout->setSpacing(10);
-    buttonsLayout->addWidget(k->applyButton);
-    buttonsLayout->addWidget(k->closeButton);
-
-    innerLayout->addLayout(buttonsLayout);
-
-    k->layout->addWidget(k->buttonsPanel);
-    activeButtonsPanel(true);
-}
-
-void TweenerPanel::activeButtonsPanel(bool enable)
-{
-    if (enable && !k->buttonsPanel->isVisible())
-        k->buttonsPanel->show();
-    else
-        k->buttonsPanel->hide();
-}
-
-void TweenerPanel::loadTweenComponents()
-{
-    QStringList labels;
-    labels << tr("Position") << tr("Rotation") << tr("Scale") << tr("Shear") << tr("Opacity") << tr("Coloring");
-    k->panelList = new QList<QWidget*>();
-
-    for (int i = 0; i < labels.size(); ++i) {
-
-         switch(i)  {
-                case TweenerPanel::Position:
-                     tFatal() << "TweenerPanel::loadTweenComponents() - Opening Position gui";
-                     k->positionPanel = new PositionSettings;
-                     connect(k->positionPanel, SIGNAL(clickedApplyTween(TweenerPanel::TweenerType, const QString &)), 
-                             this, SLOT(activateTweenersTable(TweenerPanel::TweenerType, const QString &)));  
-                     connect(k->positionPanel, SIGNAL(clickedCloseTweenProperties(TweenerPanel::Mode)), 
-                             this, SLOT(updateTweenersTable(TweenerPanel::Mode)));
-                     connect(k->positionPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int))); 
-
-                     k->positionPanel->setParameters(k->totalSteps, 0);
-                     k->panelList->append(k->positionPanel);
-                break;
-                case TweenerPanel::Rotation:
-                     k->panelList->append(new QWidget);
-                break;
-                case TweenerPanel::Scale:
-                     k->panelList->append(new QWidget);
-                break;
-                case TweenerPanel::Shear:
-                     k->panelList->append(new QWidget);
-                break;
-                case TweenerPanel::Opacity:
-                     k->panelList->append(new QWidget); 
-                break;
-                case TweenerPanel::Coloring:
-                     k->panelList->append(new QWidget);
-                break;
-         }
-
-         k->layout->addWidget(k->panelList->at(i));
-         activeTweenComponent(i, false);
-    }
-}
-
-void TweenerPanel::activeTweenComponent(int index, bool enable)
-{
-    if (enable && !k->panelList->at(index)->isVisible()) {
-        k->panelList->at(index)->show();
-    } else {
-        k->currentTweenIndex = -1;
-        k->panelList->at(index)->hide();
-    }
-}
-
-// Adding new Tween
-
-void TweenerPanel::setParameters(const QString &name, int framesTotal, int startFrame)
-{
-    // k->tweenerTable->resetTable();
-
-    k->currentTweenIndex = -1;
-
-    k->positionPanel->setParameters(framesTotal, startFrame);
-
-    k->mode = TweenerPanel::Add;
-    k->input->setText(name);
-
-    activateMode(TweenerPanel::Selection);
-
-    k->applyButton->setToolTip(tr("Save Tween"));
-    k->closeButton->setIcon(QPixmap(kAppProp->themeDir() + "/"  + "icons/close.png"));
-    k->closeButton->setToolTip(tr("Cancel Tween"));
-}
-
-// Editing Tween
-
-void TweenerPanel::setParameters(TupItemTweener *currentTween)
-{
-    tFatal() << "TweenerPanel::setParameters() - Loading Tween: " << currentTween->name();
-
-    k->currentTweenIndex = -1;
-
-    setEditMode();
-
-    k->input->setText(currentTween->name());
-    activateMode(TweenerPanel::TweenList);
-
-    for (int i=0; i < 6; i++) {
-         if (currentTween->contains(TupItemTweener::Type(i))) {
-             tFatal() << "TweenerPanel::setParameters() - Tween contains: " << i;
-             k->tweenerTable->checkTween(i, true);
-             switch(i) {
-                    case 0:
-                         k->tweenerList.append(TweenerPanel::TweenerType(i));
-                         k->positionPanel->setParameters(currentTween);
-                         // emit loadPath(true, false);
-                    break;
-             }
-         }
-    }
-}
-
-void TweenerPanel::emitOptionChanged(int option)
-{
-    switch (option) {
-            case 0:
-             {
-                 k->editMode = TweenerPanel::Selection;
-                 emit clickedSelect();
-                 activeTweenerTableForm(false);
-             }
-            break;
-            case 1:
-             {
-                 if (k->selectionDone) {
-                     activeTweenerTableForm(true);
-
-                     k->editMode = TweenerPanel::TweenList;
-                     emit clickedTweenProperties();
-                 } else {
-                     k->options->setCurrentIndex(0);
-                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
-                 }
-             }
-    }
-}
-
-void TweenerPanel::activateMode(TweenerPanel::EditMode mode)
-{
-    k->options->setCurrentIndex(mode);
-}
-
-void TweenerPanel::notifySelection(bool flag)
-{
-    k->selectionDone = flag;
-}
-
-void TweenerPanel::showTweenSettings(int tweenType)
-{
-    k->currentTweenIndex = tweenType;
-    k->editMode = TweenerPanel::TweenProperties;
-
-    activeOptionsPanel(false);
-    activeTweenerTableForm(false);
-    activeButtonsPanel(false);
-    activeTweenComponent(tweenType, true);
-
-    tFatal() << "TweenerPanel::showTweenSettings() - Opening tween: " << tweenType;
-    emit tweenPropertiesActivated(TweenerPanel::TweenerType(tweenType));
-}
-
-void TweenerPanel::activateTweenersTable(TweenerPanel::TweenerType type, const QString &message)
-{
-    if (!k->tweenerList.contains(type))
-        k->tweenerList.append(type);
-
-    emit clickedApplyTween();
-
-    setEditMode();
-
-    if (!k->applyButton->isEnabled())
-        k->applyButton->setEnabled(true);
-
-    TOsd::self()->display(tr("Info"), message, TOsd::Info);
-}
-
-void TweenerPanel::updateTweenersTable(TweenerPanel::Mode mode)
-{
-    tFatal() << "TweenerPanel::updateTweenersTable() - Just tracing!"; 
-
-    k->editMode = TweenerPanel::TweenList;
-
-    activeTweenComponent(k->currentTweenIndex, false);
-    activeOptionsPanel(true);
-    activeTweenerTableForm(true);
-    activeButtonsPanel(true);
-
-    bool reset = false;
-
-    if (mode == TweenerPanel::Add) {
-        // k->tweenerTable->checkTween(k->currentTweenIndex, false);
-        reset = true;
-    }
-
-    if (TweenerPanel::TweenerType(k->currentTweenIndex) == TweenerPanel::Position)
-        emit loadPath(false, reset);
-}
-
-void TweenerPanel::updateSteps(const QGraphicsPathItem *path, QPointF offset)
-{
-    k->positionPanel->updateSteps(path, offset);
-}
-
-void TweenerPanel::initStartCombo(int framesTotal, int currentFrame)
-{
-    k->positionPanel->initStartCombo(framesTotal, currentFrame);
-}
-
-int TweenerPanel::startComboSize()
-{
-    return k->positionPanel->startComboSize();
-}
-
-void TweenerPanel::applyTween()
-{
-    tFatal() << "TweenerPanel::applyTween() - Just tracing!";
-    setEditMode();
-
-    emit clickedApplyTween();
-}
-
-void TweenerPanel::setEditMode()
-{
-    k->mode = TweenerPanel::Edit;
-
-    k->applyButton->setToolTip(tr("Update Tween"));
-    k->closeButton->setIcon(QPixmap(kAppProp->themeDir() + "/"  + "icons/close_properties.png"));
-    k->closeButton->setToolTip(tr("Close Tween properties"));
-}
-
-QString TweenerPanel::tweenToXml(int currentFrame, QPointF point)
-{
-   QString name = k->input->text();
-
-   if (name.length() <= 0) {
-       // print error message here
-       return 0;
-   }
-
-   QDomDocument doc;
-
-   QDomElement tweening = doc.createElement("tweening");
-   tweening.setAttribute("name", name);
-   tweening.setAttribute("type", TweenerPanel::Compound);
-   tweening.setAttribute("init", currentFrame);
-   tweening.setAttribute("frames", k->positionPanel->totalSteps());
-   tweening.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
-
-   QDomElement settings = doc.createElement("settings");
-
-   tFatal() << "TweenerPanel::tweenToXml() - Tweener List Size: " << k->tweenerList.size();
-
-   for (int i=0; i < k->tweenerList.size(); i++) {
-
-        tFatal() << "TweenerPanel::tweenToXml() - tweenerList: " << k->tweenerList.at(i);
-
-        if (k->tweenerList.at(i) == TweenerPanel::Position) {
-            QDomElement position = doc.createElement("position");
-            position.setAttribute("init", currentFrame);
-            position.setAttribute("frames", k->positionPanel->totalSteps());
-            position.setAttribute("coords", k->positionPanel->pathString()); 
-            settings.appendChild(position);
-        }
-   }
-
-   tweening.appendChild(settings);
-
-   foreach (TupTweenerStep *step, k->positionPanel->steps())
-            tweening.appendChild(step->toXml(doc));
-
-   doc.appendChild(tweening);
-
-   tFatal() << "LOOK THIS";
-   tFatal() << doc.toString();
-
-   return doc.toString();
-
-   /*
-   QString text;
-
-   text = "<tweening name=\"test\" type=\"7\" init=\"0\" frames=\"3\" origin=\"22,26\">";
-   text += "<settings>";
-   text += " <position init=\"0\" frames=\"3\" coords=\"M 53.5 53.5  C 245 140  229  333  229  333   392 2 4  387  331  387  331   522 47  587  137  587  137\" />";
-   text += "  <rotation init=\"0\" frames=\"3\" rotateDirection=\"0\" rotateSpeed=\"5\" rotationType=\"0\" />";
-   text += "</settings>";
-   text += "<step value=\"0\">";
-   text += "  <position x=\"0\" y=\"0\"/>";
-   text += "  <rotation angle=\"0\"/>";
-   text += "</step>";
-   text += " <step value=\"1\">";
-   text += "  <position x=\"20\" y=\"20\"/>";
-   text += "  <rotation angle=\"45\"/>";
-   text += " </step>";
-   text += " <step value=\"2\">";
-   text += "  <position x=\"40\" y=\"40\"/>";
-   text += "  <rotation angle=\"90\"/>";
-   text += " </step>";
-   text += "</tweening>";
-
-   return text;
-   */
-}
-
-int TweenerPanel::totalSteps()
-{
-    return k->positionPanel->totalSteps();
-}
-
-QString TweenerPanel::currentTweenName() const
-{
-    QString tweenName = k->input->text();
-    if (tweenName.length() > 0)
-        k->input->setFocus();
-
-    return tweenName;
-}
-
-void TweenerPanel::enableApplyButton(bool flag)
-{
-    k->applyButton->setEnabled(flag);
-}
-
-void TweenerPanel::cleanTweensForms()
-{
-    k->positionPanel->resetTween();
-    // Add another cleaning methods here 
-}
-
-void TweenerPanel::setStartFrame(int currentIndex)
-{
-    // k->currentFrame = currentIndex;
-    k->positionPanel->setStartFrame(currentIndex);
-}
-
-void TweenerPanel::closePanel()
-{
-    k->tweenerTable->resetTable();
-    emit clickedResetTween(); 
-}
-
-void TweenerPanel::resetTweener()
-{
-    if (k->currentTweenIndex != -1) {
-        activeTweenComponent(k->currentTweenIndex, false);
-        k->currentTweenIndex = -1;
-    }
-
-    k->tweenerTable->resetTable();
-
-    activeOptionsPanel(true);
-    activeTweenerTableForm(true);
-    activeButtonsPanel(true);
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/tweenerpanel.h tupi-0.2+git05/src/plugins/tools/compoundtool/tweenerpanel.h
--- tupi-0.2+git04/src/plugins/tools/compoundtool/tweenerpanel.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/tweenerpanel.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TWEENERPANEL_H
-#define TWEENERPANEL_H
-
-#include <QWidget>
-#include <QGraphicsPathItem>
-
-#include "tupitemtweener.h"
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Configurator;
-
-class TweenerPanel : public QWidget 
-{
-    Q_OBJECT
-
-    public:
-
-        enum TweenerType { 
-             Position = 0,
-             Rotation = 1,
-             Scale = 2,
-             Shear = 3,
-             Opacity = 4,
-             Coloring = 5,
-             Compound = 6,
-             Undefined = 7
-        };
-
-        enum Mode { Add = 1, Edit, View };
-        enum EditMode { Selection = 0, TweenList, TweenProperties, None };
-
-        TweenerPanel(QWidget *parent = 0);
-        ~TweenerPanel();
-
-        void setParameters(const QString &name, int framesTotal, int startFrame);
-        void setParameters(TupItemTweener *currentTween);
-        void activateMode(TweenerPanel::EditMode mode);
-        void notifySelection(bool flag);
-        void updateSteps(const QGraphicsPathItem *path, QPointF offset);
-        void initStartCombo(int framesTotal, int currentFrame);
-        int startComboSize();
-        QString tweenToXml(int currentFrame, QPointF point);
-        int totalSteps();
-        QString currentTweenName() const;
-        void cleanTweensForms();
-        void setStartFrame(int currentIndex);
-        void resetTweener();
-
-    private slots:
-        void emitOptionChanged(int option);
-        void showTweenSettings(int tweenType);
-        void activateTweenersTable(TweenerPanel::TweenerType type, const QString &message);
-        void updateTweenersTable(TweenerPanel::Mode mode);
-        void applyTween();
-        void closePanel();
-        void enableApplyButton(bool flag);
-        
-    signals:
-        void clickedSelect();
-        void clickedTweenProperties();
-        void clickedApplyTween();
-        void clickedResetTween();
-        void tweenPropertiesActivated(TweenerPanel::TweenerType flag);
-        void startingPointChanged(int index);
-        void loadPath(bool enable, bool reset);
-        
-    private:
-        void setOptionsPanel();
-        void activeOptionsPanel(bool enable);
-        void setTweenerTableForm();
-        void activeTweenerTableForm(bool enable);
-        void setButtonsPanel();
-        void activeButtonsPanel(bool enable);
-        void loadTweenComponents();
-        void activeTweenComponent(int index, bool enable);
-        void setEditMode();
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/tweenertable.cpp tupi-0.2+git05/src/plugins/tools/compoundtool/tweenertable.cpp
--- tupi-0.2+git04/src/plugins/tools/compoundtool/tweenertable.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/tweenertable.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tweenertable.h"
-#include "tpushbutton.h"
-#include "tseparator.h"
-#include "tdebug.h"
-
-#include <QBoxLayout>
-#include <QCheckBox>
-#include <QPushButton>
-
-struct TweenerTable::Private
-{
-    QList<QCheckBox*> *checkList;
-    QList<TPushButton*> *buttonList;
-};
-
-TweenerTable::TweenerTable(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QStringList labels;
-    labels << tr("Position") << tr("Rotation") << tr("Scale") << tr("Shear") << tr("Opacity") << tr("Coloring"); 
-
-    k->checkList = new QList<QCheckBox*>();
-    k->buttonList = new QList<TPushButton*>();
-
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    for (int i = 0; i < labels.size(); ++i) {
-         QHBoxLayout *itemLayout = new QHBoxLayout;
-         itemLayout->setAlignment(Qt::AlignHCenter);
-         itemLayout->setMargin(0);
-         itemLayout->setSpacing(5);
-
-         k->checkList->append(new QCheckBox(this));
-         k->buttonList->append(new TPushButton(this, labels.at(i), 1, i));
-
-         itemLayout->addWidget(k->checkList->at(i));
-         connect(k->checkList->at(i), SIGNAL(stateChanged(int)), this, SLOT(enableTween(int)));
-
-         itemLayout->addWidget(k->buttonList->at(i));
-         connect(k->buttonList->at(i), SIGNAL(clicked(int, int)), this, SLOT(showTweenSettings(int, int)));
-
-         k->buttonList->at(i)->setDisabled(true);
-         innerLayout->addLayout(itemLayout);
-    }
-
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-}
-
-TweenerTable::~TweenerTable()
-{
-    delete k;
-}
-
-void TweenerTable::showTweenSettings(int column, int row)
-{
-    Q_UNUSED(column);
-
-    tFatal() << "TweenerTable::updatePath() - Row: " << row;
-    emit callTweenerSettings(row);
-}
-
-void TweenerTable::enableTween(int state)
-{
-    Q_UNUSED(state);
-
-    int counter = 0;
-
-    for (int i=0; i < k->checkList->size(); i++) {
-         if (k->checkList->at(i)->isChecked()) {
-             counter++;
-             if (!k->buttonList->at(i)->isEnabled())
-                 k->buttonList->at(i)->setEnabled(true);
-         } else {
-             if (k->buttonList->at(i)->isEnabled())
-                 k->buttonList->at(i)->setEnabled(false);
-         }
-    }
-
-    if (counter == 0)
-        emit enableSaveTween(false);
-    else
-        emit enableSaveTween(true);
-}
-
-void TweenerTable::checkTween(int index, bool flag)
-{
-    k->checkList->at(index)->setChecked(flag);    
-}
-
-void TweenerTable::resetTable()
-{
-    for (int i=0; i < k->checkList->size(); i++) {
-         if (k->checkList->at(i)->isChecked()) 
-             k->checkList->at(i)->setChecked(false);
-    }
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/compoundtool/tweenertable.h tupi-0.2+git05/src/plugins/tools/compoundtool/tweenertable.h
--- tupi-0.2+git04/src/plugins/tools/compoundtool/tweenertable.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/compoundtool/tweenertable.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TWEENERTABLE_H
-#define TWEENERTABLE_H
-
-/**
- * @author Gustav Gonzalez
-*/
-
-#include <QWidget>
-
-class TweenerTable : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        TweenerTable(QWidget *parent = 0);
-        ~TweenerTable();
-        void checkTween(int index, bool flag);
-        void resetTable();
-
-    private slots:
-        void showTweenSettings(int column, int row);
-        void enableTween(int state); 
-
-    signals:
-        void callTweenerSettings(int row);
-        void enableSaveTween(bool flag);
-        
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/contourselectiontool/contourselection.cpp tupi-0.2+git05/src/plugins/tools/contourselectiontool/contourselection.cpp
--- tupi-0.2+git04/src/plugins/tools/contourselectiontool/contourselection.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/contourselectiontool/contourselection.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,351 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "contourselection.h"
-#include "taction.h"
-#include "tdebug.h"
-#include "tglobal.h"
-#include "talgorithm.h"
-#include "tnodegroup.h"
-
-#include "tupgraphicalgorithm.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-#include "tupserializer.h"
-#include "tupinputdeviceinformation.h"
-#include "tupgraphicsscene.h"
-#include "tupprojectrequest.h"
-#include "tupprojectresponse.h"
-#include "tuprequestbuilder.h"
-#include "tupproxyitem.h"
-#include "tuplibraryobject.h"
-
-#include <QGraphicsView>
-#include <QPointF>
-#include <QKeySequence>
-#include <QList>
-#include <QDebug>
-#include <QTimer>
-#include <QDir>
-
-struct ContourSelection::Private
-{
-    QMap<QString, TAction *> actions;
-    TNodeGroup *nodeGroup;
-    TupGraphicsScene *scene;
-    int baseZValue;
-};
-
-ContourSelection::ContourSelection(): k(new Private)
-{
-    setupActions();
-}
-
-ContourSelection::~ContourSelection()
-{
-    delete k;
-}
-
-void ContourSelection::init(TupGraphicsScene *scene)
-{
-    k->scene = scene;
-    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
-    k->nodeGroup = 0;
-
-    foreach (QGraphicsView * view, scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      if (!qgraphicsitem_cast<TControlNode *>(item)) {
-                          if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                              if (item->zValue() >= 20000 && qgraphicsitem_cast<TupPathItem *>(item)) {
-                                  item->setFlags(QGraphicsItem::ItemIsSelectable);
-                              } else {
-                                  item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                              }
-                          } else {
-                              item->setFlags(QGraphicsItem::ItemIsSelectable);
-                          }
-                      }
-
-             }
-    }
-}
-
-QStringList ContourSelection::keys() const
-{
-    return QStringList() << tr("Line Selection") ;
-}
-
-void ContourSelection::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-void ContourSelection::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-void ContourSelection::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (scene->selectedItems().count() > 0) {
-        QList<QGraphicsItem *> currentSelection = scene->selectedItems();
-        QGraphicsItem *item = currentSelection.at(0);
-
-        if (k->nodeGroup) {
-            int index1 = scene->currentFrame()->indexOf(k->nodeGroup->parentItem());
-            int index2 = scene->currentFrame()->indexOf(item);
-            if (index1 == index2 || index2 < 0) {
-                return;
-            } else {
-                k->nodeGroup->clear();
-            }
-        }
-
-        k->nodeGroup = new TNodeGroup(item, scene, TNodeGroup::LineSelection, k->baseZValue);
-
-        if (!k->nodeGroup->changedNodes().isEmpty()) {
-            int position = scene->currentFrame()->indexOf(k->nodeGroup->parentItem());
-            if (position >= 0 && qgraphicsitem_cast<QGraphicsPathItem *>(k->nodeGroup->parentItem())) {
-                QDomDocument doc;
-                doc.appendChild(qgraphicsitem_cast<TupPathItem *>(k->nodeGroup->parentItem())->toXml(doc));
-                    
-                TupProjectRequest event = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), 
-                                            scene->currentLayerIndex(), scene->currentFrameIndex(), position, 
-                                            QPointF(), scene->spaceMode(), TupLibraryObject::Item, 
-                                            TupProjectRequest::EditNodes, doc.toString());
-                emit requested(&event);
-            } else {
-                #ifdef K_DEBUG
-                       tError() << "ContourSelection::release() - Fatal Error: Invalid position [ " << position << " ]";
-                #endif
-                return;
-            }
-            k->nodeGroup->clearChangesNodes();
-        }
-    } else {
-        if (k->nodeGroup) {
-            k->nodeGroup->clear();
-            k->nodeGroup = 0;
-        }
-    } 
-}
-
-void ContourSelection::itemResponse(const TupItemResponse *response)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFOX("selection");
-    #endif
-
-    TupProject *project = k->scene->scene()->project();
-    QGraphicsItem *item = 0;
-    TupScene *scene = 0;
-    TupLayer *layer = 0;
-    TupFrame *frame = 0;
-
-    if (project) {
-        scene = project->scene(response->sceneIndex());
-        if (scene) {
-            if (project->spaceContext() == TupProject::FRAMES_EDITION) {
-                layer = scene->layer(response->layerIndex());
-                if (layer) {
-                    frame = layer->frame(response->frameIndex());
-                    if (frame) {
-                        item = frame->item(response->itemIndex());
-                    } else {
-                        #ifdef K_DEBUG
-                               tError() << "ContourSelection::itemResponse() - Fatal Error: Frame variable is NULL!";
-                        #endif
-                    }
-                } else {
-                    #ifdef K_DEBUG
-                           tError() << "ContourSelection::itemResponse() - Fatal Error: Layer variable is NULL!";
-                    #endif
-                }
-            } else {
-                TupBackground *bg = scene->background();
-                if (bg) {
-                    if (project->spaceContext() == TupProject::STATIC_BACKGROUND_EDITION) {
-                        TupFrame *frame = bg->staticFrame();
-                        if (frame) {
-                            item = frame->item(response->itemIndex());
-                        } else {
-                            #ifdef K_DEBUG
-                                   tError() << "ContourSelection::itemResponse() - Fatal Error: Static frame variable is NULL!";
-                                   #endif
-                        }
-                    } else if (project->spaceContext() == TupProject::DYNAMIC_BACKGROUND_EDITION) { 
-                               TupFrame *frame = bg->dynamicFrame();
-                               if (frame) {
-                                   item = frame->item(response->itemIndex());
-                               } else {
-                                   #ifdef K_DEBUG
-                                          tError() << "ContourSelection::itemResponse() - Fatal Error: Dynamic frame variable is NULL!";
-                                   #endif
-                               }
-                    } else {
-                        #ifdef K_DEBUG
-                               tError() << "ContourSelection::itemResponse() - Fatal Error: Invalid spaceMode!";
-                        #endif
-                    }
-                } else {
-                    #ifdef K_DEBUG
-                           tError() << "ContourSelection::itemResponse() - Fatal Error: Scene background is NULL!";
-                    #endif
-                }
-            }
-        } else {
-            #ifdef K_DEBUG
-                   tError() << "ContourSelection::itemResponse() - Fatal Error: Scene variable is NULL";
-            #endif
-        }
-    } else {
-        #ifdef K_DEBUG
-               tError() << "ContourSelection::itemResponse() - Fatal Error: Project variable is NULL";
-        #endif
-    }
-    
-    switch (response->action()) {
-            case TupProjectRequest::Convert:
-            {
-                 if (item) {
-                      k->nodeGroup = new TNodeGroup(item, k->scene, TNodeGroup::LineSelection, k->baseZValue);
-                 } else {
-                     #ifdef K_DEBUG
-                            tError() << "ContourSelection::itemResponse() - Fatal Error: No item was found";
-                     #endif
-                 }
-            }
-            break;
-            case TupProjectRequest::EditNodes:
-            {
-                 if (item) {
-                     if (qgraphicsitem_cast<QGraphicsPathItem *>(k->nodeGroup->parentItem()) == item) {
-                         k->nodeGroup->show();
-                         k->nodeGroup->syncNodesFromParent();
-                         k->nodeGroup->saveParentProperties();
-                         break;
-                     }
-                 } else {
-                     #ifdef K_DEBUG
-                            tError() << "ContourSelection::itemResponse() - Fatal Error: No item was found";
-                     #endif
-                 }
-            }
-            break;
-            case TupProjectRequest::Remove:
-            {
-                 return;
-            }
-            break;
-            default:
-            {
-                 if (k->nodeGroup) {
-                     k->nodeGroup->show();
-                     if (k->nodeGroup->parentItem()) {
-                         k->nodeGroup->parentItem()->setSelected(true);
-                         k->nodeGroup->syncNodesFromParent();
-                     }
-                 }
-            }
-            break;
-    }
-}
-
-void ContourSelection::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
-        emit closeHugeCanvas();
-    } else {
-        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-        if (flags.first != -1 && flags.second != -1)
-            emit callForPlugin(flags.first, flags.second);
-    }
-}
-
-void ContourSelection::setupActions()
-{
-    TAction *select = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "nodes.png"), tr("Line Selection"), this);
-    select->setShortcut(QKeySequence(tr("N")));
-
-    k->actions.insert(tr("Line Selection"), select);
-}
-
-QMap<QString, TAction *> ContourSelection::actions() const
-{
-    return k->actions;
-}
-
-int ContourSelection::toolType() const
-{
-    return TupToolInterface::Selection;
-}
-
-QWidget *ContourSelection::configurator() 
-{
-    return 0;
-}
-
-void ContourSelection::aboutToChangeScene(TupGraphicsScene *scene)
-{
-    init(scene);
-}
-
-void ContourSelection::aboutToChangeTool()
-{
-    foreach (QGraphicsView *view, k->scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-void ContourSelection::saveConfig()
-{
-}
-
-QCursor ContourSelection::cursor() const
-{
-    return QCursor(Qt::ArrowCursor);
-}
-
-Q_EXPORT_PLUGIN2(tup_editNodes, ContourSelection)
diff -Nru tupi-0.2+git04/src/plugins/tools/contourselectiontool/contourselection.h tupi-0.2+git05/src/plugins/tools/contourselectiontool/contourselection.h
--- tupi-0.2+git04/src/plugins/tools/contourselectiontool/contourselection.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/contourselectiontool/contourselection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONTOURSELECTION_H
-#define CONTOURSELECTION_H
-
-#include "tuppathitem.h"
-#include "tcontrolnode.h"
-#include "tnodegroup.h"
-#include "tuptoolplugin.h"
-
-#include <QObject>
-#include <QSpinBox>
-
-class TControlNode;
-class TupItemResponse;
-class TupGraphicsScene;
-
-/**
- * @author Jorge Cuadrado
- */
-
-class ContourSelection : public TupToolPlugin
-{
-    Q_OBJECT
-    
-    public:
-        ContourSelection();
-        virtual ~ContourSelection();
-        
-        virtual void init(TupGraphicsScene *scene);
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        
-        virtual QMap<QString, TAction *>actions() const;
-        
-        int toolType() const;
-        
-        virtual QWidget *configurator();
-        
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-        
-        virtual void itemResponse(const TupItemResponse *event);
-        virtual void keyPressEvent(QKeyEvent *event);
-        virtual void saveConfig();
-        virtual QCursor cursor() const;
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
- 
-    private:
-        void setupActions();
-        
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
-
diff -Nru tupi-0.2+git04/src/plugins/tools/contourselectiontool/contourselectiontool.json tupi-0.2+git05/src/plugins/tools/contourselectiontool/contourselectiontool.json
--- tupi-0.2+git04/src/plugins/tools/contourselectiontool/contourselectiontool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/contourselectiontool/contourselectiontool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "ContourSelectionTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/contourselectiontool/contourselectiontool.pro tupi-0.2+git05/src/plugins/tools/contourselectiontool/contourselectiontool.pro
--- tupi-0.2+git04/src/plugins/tools/contourselectiontool/contourselectiontool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/contourselectiontool/contourselectiontool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/contourselectiontool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += contourselection.h
-SOURCES += contourselection.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupicontourselectiontool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
-
diff -Nru tupi-0.2+git04/src/plugins/tools/eraser/eraser.pro tupi-0.2+git05/src/plugins/tools/eraser/eraser.pro
--- tupi-0.2+git04/src/plugins/tools/eraser/eraser.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/eraser/eraser.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,34 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/ 
+
+HEADERS += erasertool.h
+SOURCES += erasertool.cpp
+
+CONFIG += plugin warn_on 
+TEMPLATE = lib 
+TARGET = tupierasertool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/eraser/erasertool.cpp tupi-0.2+git05/src/plugins/tools/eraser/erasertool.cpp
--- tupi-0.2+git04/src/plugins/tools/eraser/erasertool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/eraser/erasertool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,162 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "erasertool.h"
+
+EraserTool::EraserTool()
+{
+    setupActions();
+}
+
+EraserTool::~EraserTool()
+{
+}
+
+QStringList EraserTool::keys() const
+{
+    return QStringList() << tr("Eraser");
+}
+
+void EraserTool::setupActions()
+{
+    TAction *action1 = new TAction(QIcon(kAppProp->themeDir() + "icons/eraser.png"), tr("Eraser"), this);
+    action1->setShortcut(QKeySequence(tr("E")));
+    action1->setCursor(QCursor(kAppProp->themeDir() + "cursors/eraser.png"));
+    
+    m_actions.insert(tr("Eraser"), action1);
+   
+    /* 
+     TAction *action2 = new TAction(QIcon(kAppProp->themeDir() + "icons/ellipse.png"), tr("Ellipse"), this);
+     action2->setShortcut(QKeySequence(tr("Ctrl+E")));
+     action2->setCursor(QCursor(kAppProp->themeDir() + "cursors/circle.png"));
+         
+     m_actions.insert(tr("Ellipse"), action2);
+         
+         
+     TAction *action3 = new TAction( QIcon(kAppProp->themeDir() + "icons/line.png"), tr("Line"), this);
+     action3->setShortcut( QKeySequence(tr("Ctrl+L")) );
+     m_actions.insert(tr("Line"), action3);
+    */
+}
+
+void EraserTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    if (input->buttons() == Qt::LeftButton) {
+        QPointF pos = input->pos();
+        
+        if (name() == tr("Eraser")) {
+            QList<QGraphicsItem *> items = scene->items(input->pos());
+    
+            if (items.count() > 0) {
+                QGraphicsItem *itemPress = items[0];
+                itemPressed(itemPress, brushManager, pos);
+            }
+        }
+    }
+}
+
+void EraserTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+void EraserTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+QMap<QString, TAction *> EraserTool::actions() const
+{
+    return m_actions;
+}
+
+int EraserTool::toolType() const
+{
+    return Brush;
+}
+        
+QWidget  *EraserTool::configurator()
+{
+    return  0;
+}
+
+void EraserTool::aboutToChangeScene(TupGraphicsScene *scene)
+{
+    Q_UNUSED(scene);
+}
+
+void EraserTool::aboutToChangeTool() 
+{
+}
+
+void EraserTool::itemPressed(QGraphicsItem *item, const TupBrushManager *brush, const QPointF &pos)
+{
+    QList<QGraphicsItem *> collides = item->collidingItems();
+    
+    if (collides.count() == 0) {
+        QRect intersectRect(pos.x() - (brush->pen().width()/2), pos.y() - (brush->pen().width())/2, 
+                    brush->pen().width(), brush->pen().width());
+        
+        TupPathItem *path = qgraphicsitem_cast<TupPathItem*>(item);
+        
+        if (!path) {
+            /*
+             QString conv = "<convert type=\"2\" />"; // to path type
+             TupProjectRequest *event = new TupProjectRequest(TupProjectRequest::Convert, 
+             scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(), 
+             scene->currentFrame()->graphics().indexOf(item), conv);
+             addProjectRequest(event);
+            */
+        } else {
+            QPainterPath ppath = path->path();
+        }
+    }
+}
+
+void EraserTool::saveConfig()
+{
+}
+
+void EraserTool::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape)
+        emit closeHugeCanvas();
+}
+
+// Q_EXPORT_PLUGIN2(tup_eraser, EraserTool)
diff -Nru tupi-0.2+git04/src/plugins/tools/eraser/erasertool.h tupi-0.2+git05/src/plugins/tools/eraser/erasertool.h
--- tupi-0.2+git04/src/plugins/tools/eraser/erasertool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/eraser/erasertool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,106 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef ERASERTOOLPLUGIN_H
+#define ERASERTOOLPLUGIN_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+
+#include "tuprectitem.h"
+#include "tupellipseitem.h"
+#include "tuplineitem.h"
+#include "tuppathitem.h"
+#include "tupitemconverter.h"
+#include "tupscene.h"
+#include "tupinputdeviceinformation.h"
+#include "tupgraphicsscene.h"
+#include "tupprojectrequest.h"
+#include "tupbrushmanager.h"
+
+#include <QObject>
+#include <QLabel>
+#include <QGraphicsView>
+#include <QKeySequence>
+#include <QDebug>
+#include <QImage>
+#include <QPaintDevice>
+
+class TupPathItem;
+
+/**
+ * @author David Cuadrado
+*/
+
+class TUPI_PLUGIN EraserTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "erasertool.json")
+
+    public:
+        EraserTool();
+        ~EraserTool();
+        
+        virtual QStringList keys() const;
+        
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        
+        void itemPressed(QGraphicsItem *item, const TupBrushManager *brush, const QPointF &pos);
+        
+        virtual QMap<QString, TAction *> actions() const;
+        
+        int toolType() const;
+        
+        virtual QWidget *configurator();
+        
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+        virtual void saveConfig();
+        virtual void keyPressEvent(QKeyEvent *event);
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+
+    private:
+        void setupActions();
+        
+    private:
+        QMap<QString, TAction *> m_actions;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/eraser/erasertool.json tupi-0.2+git05/src/plugins/tools/eraser/erasertool.json
--- tupi-0.2+git04/src/plugins/tools/eraser/erasertool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/eraser/erasertool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "EraserTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/erasertool/erasertool.cpp tupi-0.2+git05/src/plugins/tools/erasertool/erasertool.cpp
--- tupi-0.2+git04/src/plugins/tools/erasertool/erasertool.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/erasertool/erasertool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,181 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "erasertool.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "tuprectitem.h"
-#include "tupellipseitem.h"
-#include "tuplineitem.h"
-#include "tuppathitem.h"
-#include "tupitemconverter.h"
-#include "tupscene.h"
-#include "tupinputdeviceinformation.h"
-#include "tupgraphicsscene.h"
-#include "tupprojectrequest.h"
-#include "tupbrushmanager.h"
-
-#include <QGraphicsView>
-#include <QKeySequence>
-#include <QDebug>
-#include <QImage>
-#include <QPaintDevice>
-
-EraserTool::EraserTool()
-{
-    setupActions();
-}
-
-EraserTool::~EraserTool()
-{
-}
-
-QStringList EraserTool::keys() const
-{
-    return QStringList() << tr("Eraser");
-}
-
-void EraserTool::setupActions()
-{
-    TAction *action1 = new TAction(QIcon(kAppProp->themeDir() + "icons/eraser.png"), tr("Eraser"), this);
-    action1->setShortcut(QKeySequence(tr("E")));
-    action1->setCursor(QCursor(kAppProp->themeDir() + "cursors/eraser.png"));
-    
-    m_actions.insert(tr("Eraser"), action1);
-   
-    /* 
-     TAction *action2 = new TAction(QIcon(kAppProp->themeDir() + "icons/ellipse.png"), tr("Ellipse"), this);
-     action2->setShortcut(QKeySequence(tr("Ctrl+E")));
-     action2->setCursor(QCursor(kAppProp->themeDir() + "cursors/circle.png"));
-         
-     m_actions.insert(tr("Ellipse"), action2);
-         
-         
-     TAction *action3 = new TAction( QIcon(kAppProp->themeDir() + "icons/line.png"), tr("Line"), this);
-     action3->setShortcut( QKeySequence(tr("Ctrl+L")) );
-     m_actions.insert(tr("Line"), action3);
-    */
-}
-
-void EraserTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    if (input->buttons() == Qt::LeftButton) {
-        QPointF pos = input->pos();
-        
-        if (name() == tr("Eraser")) {
-            QList<QGraphicsItem *> items = scene->items(input->pos());
-    
-            if (items.count() > 0) {
-                QGraphicsItem *itemPress = items[0];
-                itemPressed(itemPress, brushManager, pos);
-            }
-        }
-    }
-}
-
-void EraserTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-void EraserTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-QMap<QString, TAction *> EraserTool::actions() const
-{
-    return m_actions;
-}
-
-int EraserTool::toolType() const
-{
-    return Brush;
-}
-        
-QWidget  *EraserTool::configurator()
-{
-    return  0;
-}
-
-void EraserTool::aboutToChangeScene(TupGraphicsScene *scene)
-{
-    Q_UNUSED(scene);
-}
-
-void EraserTool::aboutToChangeTool() 
-{
-}
-
-void EraserTool::itemPressed(QGraphicsItem *item, const TupBrushManager *brush, const QPointF &pos)
-{
-    QList<QGraphicsItem *> collides = item->collidingItems();
-    
-    if (collides.count() == 0) {
-        QRect intersectRect(pos.x() - (brush->pen().width()/2), pos.y() - (brush->pen().width())/2, 
-                    brush->pen().width(), brush->pen().width());
-        
-        TupPathItem *path = qgraphicsitem_cast<TupPathItem*>(item);
-        
-        if (!path) {
-            /*
-             QString conv = "<convert type=\"2\" />"; // to path type
-             TupProjectRequest *event = new TupProjectRequest(TupProjectRequest::Convert, 
-             scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(), 
-             scene->currentFrame()->graphics().indexOf(item), conv);
-             addProjectRequest(event);
-            */
-        } else {
-            QPainterPath ppath = path->path();
-        }
-    }
-}
-
-void EraserTool::saveConfig()
-{
-}
-
-void EraserTool::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape)
-        emit closeHugeCanvas();
-}
-
-Q_EXPORT_PLUGIN2(tup_eraser, EraserTool)
-
diff -Nru tupi-0.2+git04/src/plugins/tools/erasertool/erasertool.h tupi-0.2+git05/src/plugins/tools/erasertool/erasertool.h
--- tupi-0.2+git04/src/plugins/tools/erasertool/erasertool.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/erasertool/erasertool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef ERASERTOOLPLUGIN_H
-#define ERASERTOOLPLUGIN_H
-
-#include "tuptoolplugin.h"
-
-#include <QObject>
-#include <QLabel>
-
-class TupPathItem;
-
-/**
- * @author David Cuadrado
-*/
-
-class EraserTool : public TupToolPlugin
-{
-    Q_OBJECT
-    
-    public:
-        EraserTool();
-        ~EraserTool();
-        
-        virtual QStringList keys() const;
-        
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        
-        void itemPressed(QGraphicsItem *item, const TupBrushManager *brush, const QPointF &pos);
-        
-        virtual QMap<QString, TAction *> actions() const;
-        
-        int toolType() const;
-        
-        virtual QWidget *configurator();
-        
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-        virtual void saveConfig();
-        virtual void keyPressEvent(QKeyEvent *event);
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
-
-    private:
-        void setupActions();
-        
-    private:
-        QMap<QString, TAction *> m_actions;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/erasertool/erasertool.pro tupi-0.2+git05/src/plugins/tools/erasertool/erasertool.pro
--- tupi-0.2+git04/src/plugins/tools/erasertool/erasertool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/erasertool/erasertool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/erasertool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/ 
-
-HEADERS += erasertool.h
-SOURCES += erasertool.cpp
-
-CONFIG += plugin warn_on 
-TEMPLATE = lib 
-TARGET = tupierasertool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
-
diff -Nru tupi-0.2+git04/src/plugins/tools/fill/fill.pro tupi-0.2+git05/src/plugins/tools/fill/fill.pro
--- tupi-0.2+git04/src/plugins/tools/fill/fill.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/fill/fill.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,34 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += filltool.h 
+SOURCES += filltool.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupifilltool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/fill/filltool.cpp tupi-0.2+git05/src/plugins/tools/fill/filltool.cpp
--- tupi-0.2+git04/src/plugins/tools/fill/filltool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/fill/filltool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,305 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "filltool.h"
+
+struct FillTool::Private
+{
+    QMap<QString, TAction *> actions;
+    TupGraphicsScene *scene;
+    QCursor insideCursor;
+    QCursor contourCursor;
+};
+
+FillTool::FillTool() : k(new Private)
+{
+    setupActions();
+}
+
+FillTool::~FillTool()
+{
+}
+
+void FillTool::init(TupGraphicsScene *scene)
+{
+    /*
+    foreach (QGraphicsItem *item, scene->items()) {
+             if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                 if (item->zValue() >= 20000 && item->toolTip().length()==0) {
+                     // item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsFocusable);
+                 } else {
+                     item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                     item->setFlag(QGraphicsItem::ItemIsFocusable, false);
+                 }
+             } else {
+                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsFocusable);
+             }
+    }
+    */
+
+    k->scene = scene;
+}
+
+QStringList FillTool::keys() const
+{
+    return QStringList() << tr("Internal fill") << tr("Line fill");
+}
+
+void FillTool::setupActions()
+{
+    TAction *action1 = new TAction(QIcon(kAppProp->themeDir() + "icons/inside.png"), tr("Internal fill"), this);
+    action1->setShortcut(QKeySequence(tr("I")));
+    action1->setToolTip(tr("Internal fill") + " - " + "I");
+    k->insideCursor = QCursor(kAppProp->themeDir() + "cursors/paint.png");
+    action1->setCursor(k->insideCursor);
+    k->actions.insert(tr("Internal fill"), action1);
+    
+    TAction *action2 = new TAction(QIcon(kAppProp->themeDir() + "icons/contour.png"), tr("Line fill"), this);
+    action2->setShortcut(QKeySequence(tr("B")));
+    action2->setToolTip(tr("Line fill") + " - " + "B");
+    k->contourCursor = QCursor(kAppProp->themeDir() + "cursors/contour_fill.png");
+    action2->setCursor(k->contourCursor);
+    k->actions.insert(tr("Line fill"), action2);
+}
+
+void FillTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    if (input->buttons() == Qt::LeftButton) {
+        // SQA: Enhance this plugin to support several items with one click 
+        // QList<QGraphicsItem *> list = scene->items(input->pos(), Qt::IntersectsItemShape, Qt::DescendingOrder, QTransform());
+
+        QGraphicsItem *item = scene->itemAt(input->pos(), QTransform());
+
+        if (!item) {
+            #ifdef K_DEBUG
+                QString msg = "FillTool::press() - No item found";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+            return;
+        } else {
+            if (TupGraphicLibraryItem *libraryItem = qgraphicsitem_cast<TupGraphicLibraryItem *>(item)) {
+                if (libraryItem->type() == TupLibraryObject::Image) {
+                    #ifdef K_DEBUG
+                        QString msg = "FillTool::press() - Warning: item is a RASTER object!";
+                        #ifdef Q_OS_WIN32
+                            qWarning() << msg;
+                        #else
+                            tWarning() << msg;
+                        #endif
+                    #endif
+                    return;
+                }
+            } else {
+                TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
+                if (svg) {
+                    #ifdef K_DEBUG
+                        QString msg = "FillTool::press() - Warning: item is a SVG object!";
+                        #ifdef Q_OS_WIN32
+                            qWarning() << msg;
+                        #else
+                            tWarning() << msg;
+                        #endif
+                    #endif
+                    return;
+                }
+
+                if (item->zValue() < 20000 && scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                    #ifdef K_DEBUG
+                        QString msg = "FillTool::press() - Warning: Object belongs to the background frames";
+                        #ifdef Q_OS_WIN32
+                            qWarning() << msg;
+                        #else
+                            tWarning() << msg;
+                        #endif
+                    #endif
+                    return;
+                }
+            }
+        }
+
+        if (qgraphicsitem_cast<TupItemGroup *>(item)) {
+            TOsd::self()->display(tr("Error"), tr("Sorry, Groups can't be filled yet"), TOsd::Error);
+            return;
+        }
+        
+        if (QAbstractGraphicsShapeItem *shape = qgraphicsitem_cast<QAbstractGraphicsShapeItem *>(item)) {
+            int position = -1;
+
+            if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                position = scene->currentFrame()->indexOf(shape);
+            } else {
+                TupBackground *bg = scene->scene()->background();
+                if (scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
+                    TupFrame *frame = bg->staticFrame();
+                    position = frame->indexOf(shape);
+                } else if (scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                           TupFrame *frame = bg->dynamicFrame();
+                           position = frame->indexOf(shape);
+                } else {
+                    #ifdef K_DEBUG
+                        QString msg = "FillTool::press() - Fatal Error: Invalid spaceMode!"; 
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif 
+                    return;
+                }
+            }
+                
+            if (position >= 0) {
+                if (name() == tr("Internal fill")) {
+                    shape->setBrush(brushManager->pen().brush());
+                } else if (name() == tr("Line fill")) {
+                           QPen pen = shape->pen();
+                           pen.setBrush(brushManager->pen().brush());
+                           shape->setPen(pen);
+                }
+                    
+                QDomDocument doc;
+                doc.appendChild(TupSerializer::properties(shape, doc));
+                    
+                TupProjectRequest event = TupRequestBuilder::createItemRequest( 
+                          scene->currentSceneIndex(), scene->currentLayerIndex(),
+                          scene->currentFrameIndex(), position, QPointF(), 
+                          scene->spaceMode(), TupLibraryObject::Item, 
+                          TupProjectRequest::Transform, doc.toString());
+
+                emit requested(&event);
+            } else {
+                #ifdef K_DEBUG
+                    QString msg = "FillTool::press() - Fatal Error: Invalid object index [ " + QString::number(position) + " ]";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
+                #endif
+            }
+        } else {
+            #ifdef K_DEBUG
+                QString msg = "FillTool::press() - Fatal Error: QAbstractGraphicsShapeItem cast has failed!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+        }
+    }
+}
+
+void FillTool::move(const TupInputDeviceInformation *, TupBrushManager *, TupGraphicsScene *)
+{
+}
+
+void FillTool::release(const TupInputDeviceInformation *, TupBrushManager *, TupGraphicsScene *)
+{
+}
+
+QMap<QString, TAction *> FillTool::actions() const
+{
+    return k->actions;
+}
+
+int FillTool::toolType() const
+{
+    return TupToolInterface::Fill;
+}
+        
+QWidget *FillTool::configurator()
+{
+    return 0;
+}
+
+void FillTool::aboutToChangeScene(TupGraphicsScene *)
+{
+}
+
+void FillTool::aboutToChangeTool() 
+{
+    foreach (QGraphicsItem *item, k->scene->items()) {
+             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+             item->setFlag(QGraphicsItem::ItemIsFocusable, false);
+    }
+}
+
+QPainterPath FillTool::mapPath(const QPainterPath &path, const QPointF &pos)
+{
+    QMatrix transform;
+    transform.translate(pos.x(), pos.y());
+    
+    QPainterPath painter = transform.map(path);
+    painter.closeSubpath();
+    
+    return painter;
+}
+
+QPainterPath FillTool::mapPath(const QGraphicsPathItem *item)
+{
+    return mapPath(item->path(), item->pos());
+}
+
+void FillTool::saveConfig()
+{
+}
+
+void FillTool::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
+        emit closeHugeCanvas();
+    // } else if (event->modifiers() != Qt::ShiftModifier && event->modifiers() != Qt::ControlModifier) {
+    } else {
+        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+        if (flags.first != -1 && flags.second != -1)
+            emit callForPlugin(flags.first, flags.second);
+    }
+}
+
+QCursor FillTool::cursor() const
+{
+    if (name() == tr("Internal fill")) {
+        return k->insideCursor;
+    } else if (name() == tr("Line fill")) {
+               return k->contourCursor;
+    }
+
+    return QCursor(Qt::ArrowCursor);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/fill/filltool.h tupi-0.2+git05/src/plugins/tools/fill/filltool.h
--- tupi-0.2+git04/src/plugins/tools/fill/filltool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/fill/filltool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,124 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef FILLTOOLPLUGIN_H
+#define FILLTOOLPLUGIN_H
+
+#include "tglobal.h"
+#include "tupsvgitem.h"
+#include "tupserializer.h"
+#include "tupitemconverter.h"
+#include "tuprequestbuilder.h"
+#include "tupscene.h"
+#include "tupinputdeviceinformation.h"
+#include "tupgraphicsscene.h"
+#include "tupprojectrequest.h"
+#include "tupbrushmanager.h"
+#include "tupgraphiclibraryitem.h"
+#include "tuptoolplugin.h"
+#include "tupitemgroup.h"
+#include "tosd.h"
+
+#include <QObject>
+#include <QLabel>
+#include <QKeySequence>
+#include <QImage>
+#include <QPaintDevice>
+#include <QGraphicsView>
+
+// class TupPathItem;
+
+/**
+ * @author David Cuadrado
+*/
+
+class TUPI_PLUGIN FillTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "filltool.json")
+    
+    public:
+        FillTool();
+        ~FillTool();
+        
+        virtual QStringList keys() const;
+
+        void init(TupGraphicsScene *scene);
+        
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, 
+                    TupGraphicsScene *scene);
+
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, 
+                    TupGraphicsScene *scene);
+
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, 
+                    TupGraphicsScene *scene);
+        
+        TupPathItem *itemPressed(QGraphicsItem *item, const TupBrushManager *brush);
+        
+        virtual QMap<QString, TAction *> actions() const;
+        
+        int toolType() const;
+        
+        virtual QWidget *configurator();
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+        
+        QPainterPath mapPath(const QPainterPath &path, const QPointF &pos);
+        QPainterPath mapPath(const QGraphicsPathItem *item);
+
+        virtual void saveConfig();
+        virtual void keyPressEvent(QKeyEvent *event);
+        virtual QCursor cursor() const;
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+ 
+    private:
+        void setupActions();
+
+    private:
+        struct Private;
+        Private *const k;
+ 
+    /*       
+    private:
+        QMap<QString, TAction *> m_actions;
+        TupGraphicsScene *m_scene;
+    */
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/fill/filltool.json tupi-0.2+git05/src/plugins/tools/fill/filltool.json
--- tupi-0.2+git04/src/plugins/tools/fill/filltool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/fill/filltool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "FillTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/filltool/filltool.cpp tupi-0.2+git05/src/plugins/tools/filltool/filltool.cpp
--- tupi-0.2+git04/src/plugins/tools/filltool/filltool.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/filltool/filltool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,274 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "filltool.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "tupsvgitem.h"
-#include "tupserializer.h"
-#include "tupitemconverter.h"
-#include "tuprequestbuilder.h"
-#include "tupscene.h"
-#include "tupinputdeviceinformation.h"
-#include "tupgraphicsscene.h"
-#include "tupprojectrequest.h"
-#include "tupbrushmanager.h"
-#include "tupgraphiclibraryitem.h"
-
-#include <QKeySequence>
-#include <QDebug>
-#include <QImage>
-#include <QPaintDevice>
-#include <QGraphicsView>
-
-struct FillTool::Private
-{
-    QMap<QString, TAction *> actions;
-    TupGraphicsScene *scene;
-    QCursor insideCursor;
-    QCursor contourCursor;
-};
-
-FillTool::FillTool() : k(new Private)
-{
-    setupActions();
-}
-
-FillTool::~FillTool()
-{
-}
-
-void FillTool::init(TupGraphicsScene *scene)
-{
-    foreach (QGraphicsItem *item, scene->items()) {
-             if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                 if (item->zValue() >= 20000 && item->toolTip().length()==0) {
-                     item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsFocusable);
-                 } else {
-                     item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                     item->setFlag(QGraphicsItem::ItemIsFocusable, false);
-                 }
-             } else {
-                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsFocusable);
-             }
-    }
-
-    k->scene = scene;
-}
-
-QStringList FillTool::keys() const
-{
-    return QStringList() << tr("Internal fill") << tr("Line fill");
-}
-
-void FillTool::setupActions()
-{
-    TAction *action1 = new TAction(QIcon(kAppProp->themeDir() + "icons/inside.png"), tr("Internal fill"), this);
-    action1->setShortcut(QKeySequence(tr("I")));
-    k->insideCursor = QCursor(kAppProp->themeDir() + "cursors/paint.png");
-    action1->setCursor(k->insideCursor);
-    k->actions.insert(tr("Internal fill"), action1);
-    
-    TAction *action2 = new TAction(QIcon(kAppProp->themeDir() + "icons/contour.png"), tr("Line fill"), this);
-    action2->setShortcut(QKeySequence(tr("B")));
-    k->contourCursor = QCursor(kAppProp->themeDir() + "cursors/contour_fill.png");
-    action2->setCursor(k->contourCursor);
-    k->actions.insert(tr("Line fill"), action2);
-}
-
-void FillTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    if (input->buttons() == Qt::LeftButton) {
-        QGraphicsItem *item = scene->itemAt(input->pos());
-
-        if (!item) {
-            #ifdef K_DEBUG
-                   tWarning() << "FillTool::press() - No item found";
-            #endif
-            return;
-        } else {
-            if (TupGraphicLibraryItem *libraryItem = qgraphicsitem_cast<TupGraphicLibraryItem *>(item)) {
-                if (libraryItem->type() == TupLibraryObject::Image) {
-                    #ifdef K_DEBUG
-                           tWarning() << "FillTool::press() - Warning: is a RASTER object!"; 
-                    #endif
-                    return;
-                }
-            } else {
-                TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
-                if (svg) {
-                    #ifdef K_DEBUG
-                           tWarning() << "FillTool::press() - Warning: is a SVG object!";                         
-                    #endif
-                    return;
-                }
-
-                if (item->zValue() < 20000 && scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                    #ifdef K_DEBUG
-                           tWarning() << "FillTool::press() - Warning: Object belongs to the background frames";
-                    #endif
-                    return;
-                }
-            }
-        }
-        
-        if (QAbstractGraphicsShapeItem *shape = qgraphicsitem_cast<QAbstractGraphicsShapeItem *>(item)) {
-            int position = -1;
-
-            if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                position = scene->currentFrame()->indexOf(shape);
-            } else {
-                TupBackground *bg = scene->scene()->background();
-                if (scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
-                    TupFrame *frame = bg->staticFrame();
-                    position = frame->indexOf(shape);
-                } else if (scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                           TupFrame *frame = bg->dynamicFrame();
-                           position = frame->indexOf(shape);
-                } else {
-                    #ifdef K_DEBUG
-                           tError() << "FillTool::press() - Fatal Error: Invalid spaceMode!";
-                    #endif
-                    return;
-                }
-            }
-                
-            if (position >= 0) {
-                if (name() == tr("Internal fill")) {
-                    shape->setBrush(brushManager->pen().brush());
-                } else if (name() == tr("Line fill")) {
-                           QPen pen = shape->pen();
-                           pen.setBrush(brushManager->pen().brush());
-                           shape->setPen(pen);
-                }
-                    
-                QDomDocument doc;
-                doc.appendChild(TupSerializer::properties(shape, doc));
-                    
-                TupProjectRequest event = TupRequestBuilder::createItemRequest( 
-                          scene->currentSceneIndex(), scene->currentLayerIndex(),
-                          scene->currentFrameIndex(), position, QPointF(), 
-                          scene->spaceMode(), TupLibraryObject::Item, 
-                          TupProjectRequest::Transform, doc.toString());
-
-                emit requested(&event);
-            } else {
-                #ifdef K_DEBUG
-                       tError() << "FillTool::press() - Fatal Error: Invalid object index [ " << position << " ]";
-                #endif
-            }
-        }
-    }
-}
-
-void FillTool::move(const TupInputDeviceInformation *, TupBrushManager *, TupGraphicsScene *)
-{
-}
-
-void FillTool::release(const TupInputDeviceInformation *, TupBrushManager *, TupGraphicsScene *)
-{
-}
-
-QMap<QString, TAction *> FillTool::actions() const
-{
-    return k->actions;
-}
-
-int FillTool::toolType() const
-{
-    return TupToolInterface::Fill;
-}
-        
-QWidget *FillTool::configurator()
-{
-    return 0;
-}
-
-void FillTool::aboutToChangeScene(TupGraphicsScene *)
-{
-}
-
-void FillTool::aboutToChangeTool() 
-{
-    foreach (QGraphicsItem *item, k->scene->items()) {
-             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-             item->setFlag(QGraphicsItem::ItemIsFocusable, false);
-    }
-}
-
-QPainterPath FillTool::mapPath(const QPainterPath &path, const QPointF &pos)
-{
-    QMatrix transform;
-    transform.translate(pos.x(), pos.y());
-    
-    QPainterPath painter = transform.map(path);
-    painter.closeSubpath();
-    
-    return painter;
-}
-
-QPainterPath FillTool::mapPath(const QGraphicsPathItem *item)
-{
-    return mapPath(item->path(), item->pos());
-}
-
-void FillTool::saveConfig()
-{
-}
-
-void FillTool::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
-        emit closeHugeCanvas();
-    // } else if (event->modifiers() != Qt::ShiftModifier && event->modifiers() != Qt::ControlModifier) {
-    } else {
-        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-        if (flags.first != -1 && flags.second != -1)
-            emit callForPlugin(flags.first, flags.second);
-    }
-}
-
-QCursor FillTool::cursor() const
-{
-    if (name() == tr("Internal fill")) {
-        return k->insideCursor;
-    } else if (name() == tr("Line fill")) {
-               return k->contourCursor;
-    }
-
-    return QCursor(Qt::ArrowCursor);
-}
-
-Q_EXPORT_PLUGIN2(tup_fill, FillTool)
diff -Nru tupi-0.2+git04/src/plugins/tools/filltool/filltool.h tupi-0.2+git05/src/plugins/tools/filltool/filltool.h
--- tupi-0.2+git04/src/plugins/tools/filltool/filltool.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/filltool/filltool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef FILLTOOLPLUGIN_H
-#define FILLTOOLPLUGIN_H
-
-#include "tuptoolplugin.h"
-#include "tupgraphicsscene.h"
-
-#include <QObject>
-#include <QLabel>
-
-class TupPathItem;
-
-/**
- * @author David Cuadrado
-*/
-
-class FillTool : public TupToolPlugin
-{
-    Q_OBJECT
-    
-    public:
-        FillTool();
-        ~FillTool();
-        
-        virtual QStringList keys() const;
-
-        void init(TupGraphicsScene *scene);
-        
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, 
-                    TupGraphicsScene *scene);
-
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, 
-                    TupGraphicsScene *scene);
-
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, 
-                    TupGraphicsScene *scene);
-        
-        TupPathItem *itemPressed(QGraphicsItem *item, const TupBrushManager *brush);
-        
-        virtual QMap<QString, TAction *> actions() const;
-        
-        int toolType() const;
-        
-        virtual QWidget *configurator();
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-        
-        QPainterPath mapPath(const QPainterPath &path, const QPointF &pos);
-        QPainterPath mapPath(const QGraphicsPathItem *item);
-
-        virtual void saveConfig();
-        virtual void keyPressEvent(QKeyEvent *event);
-        virtual QCursor cursor() const;
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
- 
-    private:
-        void setupActions();
-
-    private:
-        struct Private;
-        Private *const k;
- 
-    /*       
-    private:
-        QMap<QString, TAction *> m_actions;
-        TupGraphicsScene *m_scene;
-    */
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/filltool/filltool.json tupi-0.2+git05/src/plugins/tools/filltool/filltool.json
--- tupi-0.2+git04/src/plugins/tools/filltool/filltool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/filltool/filltool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "FillTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/filltool/filltool.pro tupi-0.2+git05/src/plugins/tools/filltool/filltool.pro
--- tupi-0.2+git04/src/plugins/tools/filltool/filltool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/filltool/filltool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/filltool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += filltool.h 
-SOURCES += filltool.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupifilltool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/geometric/geometric.pro tupi-0.2+git05/src/plugins/tools/geometric/geometric.pro
--- tupi-0.2+git04/src/plugins/tools/geometric/geometric.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometric/geometric.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,37 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += geometrictool.h \
+           infopanel.h 
+
+SOURCES += geometrictool.cpp \
+           infopanel.cpp
+
+CONFIG += plugin
+TEMPLATE = lib 
+TARGET = tupigeometrictool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/geometric/geometrictool.cpp tupi-0.2+git05/src/plugins/tools/geometric/geometrictool.cpp
--- tupi-0.2+git04/src/plugins/tools/geometric/geometrictool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometric/geometrictool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,478 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "geometrictool.h"
+#include "tuprectitem.h"
+#include "tupellipseitem.h"
+#include "tuplineitem.h"
+#include "tuppathitem.h"
+#include "tuplibraryobject.h"
+#include "tupinputdeviceinformation.h"
+#include "tupgraphicsscene.h"
+#include "tupscene.h"
+#include "tupframe.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tupbrushmanager.h"
+
+struct GeometricTool::Private
+{
+    TupRectItem *rect;
+    TupEllipseItem *ellipse;
+    TupLineItem *line;
+    TupPathItem *path;
+    TupGraphicsScene *scene;
+    InfoPanel *configurator;
+    bool added;
+    QPointF currentPoint;
+    QPointF lastPoint;
+    QMap<QString, TAction *> actions;
+    bool proportion;
+    QGraphicsItem *item;
+    QCursor squareCursor;
+    QCursor circleCursor;
+    QCursor lineCursor;
+};
+
+GeometricTool::GeometricTool() : k(new Private)
+{
+    k->scene = 0;
+    k->path = 0;
+    setupActions();
+}
+
+GeometricTool::~GeometricTool()
+{
+}
+
+QStringList GeometricTool::keys() const
+{
+    return QStringList() << tr("Rectangle") << tr("Ellipse") << tr("Line");
+}
+
+void GeometricTool::init(TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[GeometricTool::init()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    k->scene = scene;
+    delete k->path;
+    k->path = 0;
+    k->proportion = false;
+
+    foreach (QGraphicsView * view, scene->views()) {
+             view->setDragMode(QGraphicsView::NoDrag);
+             if (QGraphicsScene *scene = qobject_cast<QGraphicsScene *>(view->scene())) {
+                 foreach (QGraphicsItem *item, scene->items()) {
+                          item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                          item->setFlag(QGraphicsItem::ItemIsMovable, false);
+                 }
+             }
+    }
+}
+
+void GeometricTool::setupActions()
+{
+    TAction *action1 = new TAction(QIcon(kAppProp->themeDir() + "icons/square.png"), tr("Rectangle"), this);
+    action1->setShortcut(QKeySequence(tr("R")));
+    k->squareCursor = QCursor(kAppProp->themeDir() + "cursors/square.png", 0, 0);
+    action1->setCursor(k->squareCursor);
+    
+    k->actions.insert(tr("Rectangle"), action1);
+    
+    TAction *action2 = new TAction(QIcon(kAppProp->themeDir() + "icons/ellipse.png"), tr("Ellipse"), this);
+    action2->setShortcut(QKeySequence(tr("C")));
+    k->circleCursor = QCursor(kAppProp->themeDir() + "cursors/circle.png");
+    action2->setCursor(k->circleCursor);
+    
+    k->actions.insert(tr("Ellipse"), action2);
+    
+    TAction *action3 = new TAction(QIcon(kAppProp->themeDir() + "icons/line.png"), tr("Line"), this);
+    action3->setShortcut(QKeySequence(tr("L")));
+    k->lineCursor = QCursor(kAppProp->themeDir() + "cursors/line.png", 0, 0);
+    action3->setCursor(k->lineCursor);
+
+    k->actions.insert(tr("Line"), action3);
+}
+
+void GeometricTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[GeometricTool::press()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (input->buttons() == Qt::LeftButton) {
+        if (name() == tr("Rectangle")) {
+            k->added = false;
+            k->rect = new TupRectItem(QRectF(input->pos(), QSize(0,0)));
+            k->rect->setPen(brushManager->pen());
+            k->rect->setBrush(brushManager->brush());
+
+            k->currentPoint = input->pos();
+        } else if (name() == tr("Ellipse")) {
+                   k->added = false;
+                   k->ellipse = new TupEllipseItem(QRectF(input->pos(), QSize(0,0)));
+                   k->ellipse->setPen(brushManager->pen());
+                   k->ellipse->setBrush(brushManager->brush());
+
+                   k->currentPoint = input->pos();
+        } else if (name() == tr("Line")) {
+                   k->currentPoint = input->pos();
+
+                   if (k->path) {
+                       QPainterPath path = k->path->path();
+                       path.cubicTo(k->lastPoint, k->lastPoint, k->lastPoint);
+                       k->path->setPath(path);
+                   } else {
+                       k->path = new TupPathItem;
+                       k->path->setPen(brushManager->pen());
+                       k->path->setBrush(brushManager->brush());
+
+                       QPainterPath path;
+                       path.moveTo(k->currentPoint);
+                       k->path->setPath(path);
+                       scene->includeObject(k->path);
+
+                       k->line = new TupLineItem();
+                       k->line->setPen(brushManager->pen());
+                       k->line->setLine(QLineF(input->pos().x(), input->pos().y(), input->pos().x(), input->pos().y()));
+
+                       TupFrame *frame = scene->currentFrame();
+                       int zLevel = frame->getTopZLevel();
+                       k->line->setZValue(zLevel);
+
+                       scene->addItem(k->line);
+                   }
+        }
+    }
+}
+
+void GeometricTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    /*
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[GeometricTool::move()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+    */
+
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+    
+    if (name() == tr("Rectangle") || name() == tr("Ellipse")) {
+        if (!k->added) {
+            if (name() == tr("Rectangle"))
+                scene->includeObject(k->rect);
+            else
+                scene->includeObject(k->ellipse);
+            k->added = true;
+        }
+
+        int xMouse = input->pos().x();
+        int yMouse = input->pos().y();
+        int xInit = k->currentPoint.x();
+        int yInit = k->currentPoint.y();
+
+        QRectF rect;
+        if (name() == tr("Rectangle"))
+            rect = k->rect->rect();
+        else
+            rect = k->ellipse->rect();
+
+        if (k->proportion) {
+            int width = abs(xMouse - xInit);
+            int height = abs(yMouse - yInit);
+
+            bool xWins = false;
+            if (width <= height)
+                xWins = true; 
+
+            QPointF target;
+
+            if (xMouse >= xInit) {
+                if (yMouse >= yInit) {
+                    if (xWins)
+                        target = QPointF(xInit + width, yInit + width);      
+                    else
+                        target = QPointF(xInit + height, yInit + height);
+
+                    rect.setBottomRight(target);
+                } else {
+                    if (xWins)
+                        target = QPointF(xInit + width, yInit - width);
+                    else
+                        target = QPointF(xInit + height, yInit - height);
+
+                    rect.setTopRight(target);
+                }
+            } else {
+                if (yMouse >= yInit) {
+                    if (xWins)
+                        target = QPointF(xInit - width, yInit + width);
+                    else
+                        target = QPointF(xInit - height, yInit + height);
+
+                    rect.setBottomLeft(target);
+                } else {
+                    if (xWins)
+                        target = QPointF(xInit - width, yInit - width);
+                    else
+                        target = QPointF(xInit - height, yInit - height);
+
+                    rect.setTopLeft(target);
+                }
+            }
+            
+        } else {
+            if (xMouse >= xInit) {
+                if (yMouse >= yInit)
+                    rect.setBottomRight(input->pos());
+                else
+                    rect.setTopRight(input->pos());
+            } else {
+                if (yMouse >= yInit)
+                    rect.setBottomLeft(input->pos());
+                else
+                    rect.setTopLeft(input->pos());
+            }
+        }
+
+        if (name() == tr("Rectangle"))
+            k->rect->setRect(rect);
+        else
+            k->ellipse->setRect(rect);
+    } 
+}
+
+void GeometricTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[GeometricTool::release()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    QDomDocument doc;
+    QPointF point;
+
+    if (name() == tr("Rectangle")) {
+        doc.appendChild(dynamic_cast<TupAbstractSerializable *>(k->rect)->toXml(doc));
+        point = k->rect->pos();
+    } else if (name() == tr("Ellipse")) {
+               doc.appendChild(dynamic_cast<TupAbstractSerializable *>(k->ellipse)->toXml(doc));
+               QRectF rect = k->ellipse->rect();
+               point = rect.topLeft();
+    } else if (name() == tr("Line")) {
+               return;
+    }
+
+    TupProjectRequest event = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), 
+                              scene->currentFrameIndex(), 0, point, scene->spaceMode(), TupLibraryObject::Item, 
+                              TupProjectRequest::Add, doc.toString());
+    emit requested(&event);
+}
+
+QMap<QString, TAction *> GeometricTool::actions() const
+{
+    return k->actions;
+}
+
+int GeometricTool::toolType() const
+{
+    return Brush;
+}
+        
+QWidget *GeometricTool::configurator()
+{
+    InfoPanel::ToolType toolType = InfoPanel::Line;
+
+    if (name() == tr("Rectangle"))
+        toolType = InfoPanel::Rectangle;
+    else if (name() == tr("Ellipse"))
+             toolType = InfoPanel::Ellipse;
+
+    k->configurator = new InfoPanel(toolType);
+    return k->configurator;
+}
+
+void GeometricTool::aboutToChangeScene(TupGraphicsScene *scene)
+{
+    Q_UNUSED(scene);
+
+    endItem();
+}
+
+void GeometricTool::aboutToChangeTool() 
+{
+    endItem();
+}
+
+void GeometricTool::saveConfig()
+{
+}
+
+void GeometricTool::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
+        emit closeHugeCanvas();
+        return;
+    } else if (event->key() == Qt::Key_Shift) {
+               k->proportion = true;
+    } else {
+        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+        if (flags.first != -1 && flags.second != -1)
+            emit callForPlugin(flags.first, flags.second);
+    }
+}
+
+void GeometricTool::keyReleaseEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Shift)
+        k->proportion = false;
+}
+
+QCursor GeometricTool::cursor() const
+{
+    if (name() == tr("Rectangle")) {
+        return k->squareCursor;
+    } else if (name() == tr("Ellipse")) {
+               return k->circleCursor;
+    } else if (name() == tr("Line")) {
+               return k->lineCursor;
+    }
+
+    return QCursor(Qt::ArrowCursor);
+}
+
+void GeometricTool::endItem()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[GeometricTool::endItem()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    if (k->path) {
+        QDomDocument doc;
+        doc.appendChild(dynamic_cast<TupAbstractSerializable *>(k->path)->toXml(doc));
+        QPointF point = QPointF(0, 0);
+
+        TupProjectRequest event = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(), k->scene->currentLayerIndex(),
+                                  k->scene->currentFrameIndex(), 0, point, k->scene->spaceMode(), TupLibraryObject::Item, 
+                                  TupProjectRequest::Add, doc.toString());
+
+        emit requested(&event);
+        k->path = 0;
+    }
+}
+
+void GeometricTool::updatePos(QPointF pos)
+{
+    if (k->path) {
+        QLineF line;
+        if (k->proportion) {
+            qreal dx = pos.x() - k->currentPoint.x();
+            qreal dy = pos.y() - k->currentPoint.y();
+            qreal m = fabs(dx/dy);
+
+            if (m > 1) {
+                line = QLineF(k->currentPoint.x(), k->currentPoint.y(), pos.x(), k->currentPoint.y());
+                k->lastPoint = QPointF(pos.x(), k->currentPoint.y());
+            } else {
+                line = QLineF(k->currentPoint.x(), k->currentPoint.y(), k->currentPoint.x(), pos.y());
+                k->lastPoint = QPointF(k->currentPoint.x(), pos.y());
+            }
+
+        } else {
+            line = QLineF(k->currentPoint, pos);
+            k->lastPoint = pos;
+        }
+        if (k->line)
+            k->line->setLine(line);
+    }
+}
+
+/*
+void GeometricTool::doubleClick(const TupInputDeviceInformation *input, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(scene);
+
+    endItem();
+}
+*/
+
+void GeometricTool::sceneResponse(const TupSceneResponse *event)
+{
+    Q_UNUSED(event);
+    if (name() == tr("Line")) 
+        init(k->scene);
+}
+
+void GeometricTool::layerResponse(const TupLayerResponse *event)
+{
+    Q_UNUSED(event);
+    if (name() == tr("Line")) 
+        init(k->scene);
+}
+
+void GeometricTool::frameResponse(const TupFrameResponse *event)
+{
+    Q_UNUSED(event);
+    if (name() == tr("Line")) 
+        init(k->scene);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/geometric/geometrictool.h tupi-0.2+git05/src/plugins/tools/geometric/geometrictool.h
--- tupi-0.2+git04/src/plugins/tools/geometric/geometrictool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometric/geometrictool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,120 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef GEOMETRICTOOLPLUGIN_H
+#define GEOMETRICTOOLPLUGIN_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "tuprectitem.h"
+#include "tupellipseitem.h"
+#include "tuplineitem.h"
+#include "infopanel.h"
+
+#include <QObject>
+#include <QLabel>
+#include <QKeyEvent>
+#include <cmath>
+#include <QKeySequence>
+#include <QImage>
+#include <QPaintDevice>
+#include <QGraphicsView>
+
+/**
+ * @author David Cuadrado
+*/
+
+class TUPI_PLUGIN GeometricTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "geometrictool.json")
+    
+    public:
+        GeometricTool();
+        ~GeometricTool();
+        
+        virtual QStringList keys() const;
+        virtual void init(TupGraphicsScene *scene);
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void keyPressEvent(QKeyEvent *event);
+        virtual void keyReleaseEvent(QKeyEvent *event);
+        // virtual void doubleClick(const TupInputDeviceInformation *input, TupGraphicsScene *scene);
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+        virtual void layerResponse(const TupLayerResponse *event);
+        virtual void frameResponse(const TupFrameResponse *event);
+
+        virtual QMap<QString, TAction *> actions() const;
+        
+        int toolType() const;
+        
+        virtual QWidget *configurator();
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+        virtual void saveConfig();
+        virtual QCursor cursor() const;
+        void updatePos(QPointF pos);
+
+    public slots:
+        void endItem();
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+        
+    private:
+        void setupActions();
+
+    private:
+        struct Private;
+        Private *const k;
+
+    /*
+    private:
+        TupRectItem *m_rect;
+        TupEllipseItem *m_ellipse;
+        TupLineItem *m_line;
+        InfoPanel *m_configurator;
+        bool added;
+        QPointF firstPoint;
+        QMap<QString, TAction *> m_actions;
+        bool proportion;
+        QGraphicsItem *m_item;
+    */
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/geometric/geometrictool.json tupi-0.2+git05/src/plugins/tools/geometric/geometrictool.json
--- tupi-0.2+git04/src/plugins/tools/geometric/geometrictool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometric/geometrictool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "GeometricTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/geometric/infopanel.cpp tupi-0.2+git05/src/plugins/tools/geometric/infopanel.cpp
--- tupi-0.2+git04/src/plugins/tools/geometric/infopanel.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometric/infopanel.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,72 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "infopanel.h"
+
+InfoPanel::InfoPanel(InfoPanel::ToolType type, QWidget *parent) : QWidget(parent)
+{
+    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *label = new QLabel(tr("Tips"));
+    label->setAlignment(Qt::AlignHCenter); 
+    layout->addWidget(label);
+
+    mainLayout->addLayout(layout);
+
+    QTextEdit *textArea = new QTextEdit; 
+
+    // SQA: Check this code with several screen resolutions. It must looks good with everyone! 
+    textArea->setFont(QFont("Arial", 8, QFont::Normal, false));
+
+    if (type == InfoPanel::Line) {
+        textArea->append("<p><b>" + tr("Mouse Right Click") + ":</b> " +  tr("Close the line path") + "</p>");
+        textArea->append("<p><b>" + tr("Shift") + ":</b> " +  tr("Align line to horizontal/vertical axis") + "</p>"); 
+    } else {
+        textArea->append("<p><b>" + tr("Shift + Left Mouse Button") + ":</b> " +  tr("Set width/height proportional dimensions") + "</p>");
+    }
+
+    // QString text = textArea->document()->toPlainText();
+    // textArea->setFixedHeight(100);
+    // textArea->setFixedHeight(150);
+
+    mainLayout->addWidget(textArea);
+    mainLayout->addStretch(2);
+}
+
+InfoPanel::~InfoPanel()
+{
+}
+
diff -Nru tupi-0.2+git04/src/plugins/tools/geometric/infopanel.h tupi-0.2+git05/src/plugins/tools/geometric/infopanel.h
--- tupi-0.2+git04/src/plugins/tools/geometric/infopanel.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometric/infopanel.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,59 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef INFOPANEL_H
+#define INFOPANEL_H
+
+#include "tglobal.h"
+
+#include <QLabel>
+#include <QBoxLayout>
+#include <QTextEdit>
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN InfoPanel : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        enum ToolType { Rectangle = 1, Ellipse, Line };
+        InfoPanel(InfoPanel::ToolType type, QWidget *parent = 0);
+        ~InfoPanel();
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/geometrictool/geometrictool.cpp tupi-0.2+git05/src/plugins/tools/geometrictool/geometrictool.cpp
--- tupi-0.2+git04/src/plugins/tools/geometrictool/geometrictool.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometrictool/geometrictool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,467 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "geometrictool.h"
-#include "tuprectitem.h"
-#include "tupellipseitem.h"
-#include "tuplineitem.h"
-#include "tuppathitem.h"
-#include "tuplibraryobject.h"
-#include "tupinputdeviceinformation.h"
-#include "tupgraphicsscene.h"
-#include "tupscene.h"
-#include "tupframe.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tupbrushmanager.h"
-
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <cmath>
-#include <QKeySequence>
-#include <QDebug>
-#include <QImage>
-#include <QPaintDevice>
-#include <QGraphicsView>
-
-struct GeometricTool::Private
-{
-    TupRectItem *rect;
-    TupEllipseItem *ellipse;
-    TupLineItem *line;
-    TupPathItem *path;
-    TupGraphicsScene *scene;
-    InfoPanel *configurator;
-    bool added;
-    QPointF currentPoint;
-    QPointF lastPoint;
-    QMap<QString, TAction *> actions;
-    bool proportion;
-    QGraphicsItem *item;
-    QCursor squareCursor;
-    QCursor circleCursor;
-    QCursor lineCursor;
-};
-
-GeometricTool::GeometricTool() : k(new Private)
-{
-    k->scene = 0;
-    k->path = 0;
-    setupActions();
-}
-
-GeometricTool::~GeometricTool()
-{
-}
-
-QStringList GeometricTool::keys() const
-{
-    return QStringList() << tr("Rectangle") << tr("Ellipse") << tr("Line");
-}
-
-void GeometricTool::init(TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    k->scene = scene;
-    delete k->path;
-    k->path = 0;
-    k->proportion = false;
-
-    foreach (QGraphicsView * view, scene->views()) {
-             view->setDragMode(QGraphicsView::NoDrag);
-             if (QGraphicsScene *scene = qobject_cast<QGraphicsScene *>(view->scene())) {
-                 foreach (QGraphicsItem *item, scene->items()) {
-                          item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                          item->setFlag(QGraphicsItem::ItemIsMovable, false);
-                 }
-             }
-    }
-}
-
-void GeometricTool::setupActions()
-{
-    TAction *action1 = new TAction(QIcon(kAppProp->themeDir() + "icons/square.png"), tr("Rectangle"), this);
-    action1->setShortcut(QKeySequence(tr("R")));
-    k->squareCursor = QCursor(kAppProp->themeDir() + "cursors/square.png", 0, 0);
-    action1->setCursor(k->squareCursor);
-    
-    k->actions.insert(tr("Rectangle"), action1);
-    
-    TAction *action2 = new TAction(QIcon(kAppProp->themeDir() + "icons/ellipse.png"), tr("Ellipse"), this);
-    action2->setShortcut(QKeySequence(tr("C")));
-    k->circleCursor = QCursor(kAppProp->themeDir() + "cursors/circle.png");
-    action2->setCursor(k->circleCursor);
-    
-    k->actions.insert(tr("Ellipse"), action2);
-    
-    TAction *action3 = new TAction(QIcon(kAppProp->themeDir() + "icons/line.png"), tr("Line"), this);
-    action3->setShortcut(QKeySequence(tr("L")));
-    k->lineCursor = QCursor(kAppProp->themeDir() + "cursors/line.png", 0, 0);
-    action3->setCursor(k->lineCursor);
-
-    k->actions.insert(tr("Line"), action3);
-}
-
-void GeometricTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (input->buttons() == Qt::LeftButton) {
-        if (name() == tr("Rectangle")) {
-            k->added = false;
-            k->rect = new TupRectItem(QRectF(input->pos(), QSize(0,0)));
-            k->rect->setPen(brushManager->pen());
-            k->rect->setBrush(brushManager->brush());
-
-            k->currentPoint = input->pos();
-        } else if (name() == tr("Ellipse")) {
-                   k->added = false;
-                   k->ellipse = new TupEllipseItem(QRectF(input->pos(), QSize(0,0)));
-                   k->ellipse->setPen(brushManager->pen());
-                   k->ellipse->setBrush(brushManager->brush());
-
-                   k->currentPoint = input->pos();
-        } else if (name() == tr("Line")) {
-                   k->currentPoint = input->pos();
-
-                   if (k->path) {
-                       QPainterPath path = k->path->path();
-                       path.cubicTo(k->lastPoint, k->lastPoint, k->lastPoint);
-                       k->path->setPath(path);
-                   } else {
-                       k->path = new TupPathItem;
-                       k->path->setPen(brushManager->pen());
-                       k->path->setBrush(brushManager->brush());
-
-                       QPainterPath path;
-                       path.moveTo(k->currentPoint);
-                       k->path->setPath(path);
-                       scene->includeObject(k->path);
-
-                       k->line = new TupLineItem();
-                       k->line->setPen(brushManager->pen());
-                       k->line->setLine(QLineF(input->pos().x(), input->pos().y(), input->pos().x(), input->pos().y()));
-
-                       TupFrame *frame = scene->currentFrame();
-                       int zLevel = frame->getTopZLevel();
-                       k->line->setZValue(zLevel);
-
-                       scene->addItem(k->line);
-                   }
-        }
-    } 
-}
-
-void GeometricTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-    
-    if (name() == tr("Rectangle") || name() == tr("Ellipse")) {
-        if (!k->added) {
-            if (name() == tr("Rectangle"))
-                scene->includeObject(k->rect);
-            else
-                scene->includeObject(k->ellipse);
-            k->added = true;
-        }
-
-        int xMouse = input->pos().x();
-        int yMouse = input->pos().y();
-        int xInit = k->currentPoint.x();
-        int yInit = k->currentPoint.y();
-
-        QRectF rect;
-        if (name() == tr("Rectangle"))
-            rect = k->rect->rect();
-        else
-            rect = k->ellipse->rect();
-
-        if (k->proportion) {
-            int width = abs(xMouse - xInit);
-            int height = abs(yMouse - yInit);
-
-            bool xWins = false;
-            if (width <= height)
-                xWins = true; 
-
-            QPointF target;
-
-            if (xMouse >= xInit) {
-                if (yMouse >= yInit) {
-                    if (xWins)
-                        target = QPointF(xInit + width, yInit + width);      
-                    else
-                        target = QPointF(xInit + height, yInit + height);
-
-                    rect.setBottomRight(target);
-                } else {
-                    if (xWins)
-                        target = QPointF(xInit + width, yInit - width);
-                    else
-                        target = QPointF(xInit + height, yInit - height);
-
-                    rect.setTopRight(target);
-                }
-            } else {
-                if (yMouse >= yInit) {
-                    if (xWins)
-                        target = QPointF(xInit - width, yInit + width);
-                    else
-                        target = QPointF(xInit - height, yInit + height);
-
-                    rect.setBottomLeft(target);
-                } else {
-                    if (xWins)
-                        target = QPointF(xInit - width, yInit - width);
-                    else
-                        target = QPointF(xInit - height, yInit - height);
-
-                    rect.setTopLeft(target);
-                }
-            }
-            
-        } else {
-            if (xMouse >= xInit) {
-                if (yMouse >= yInit)
-                    rect.setBottomRight(input->pos());
-                else
-                    rect.setTopRight(input->pos());
-            } else {
-                if (yMouse >= yInit)
-                    rect.setBottomLeft(input->pos());
-                else
-                    rect.setTopLeft(input->pos());
-            }
-        }
-
-        if (name() == tr("Rectangle"))
-            k->rect->setRect(rect);
-        else
-            k->ellipse->setRect(rect);
-    } 
-}
-
-void GeometricTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    QDomDocument doc;
-    QPointF point;
-
-    if (name() == tr("Rectangle")) {
-        doc.appendChild(dynamic_cast<TupAbstractSerializable *>(k->rect)->toXml(doc));
-        point = k->rect->pos();
-    } else if (name() == tr("Ellipse")) {
-               doc.appendChild(dynamic_cast<TupAbstractSerializable *>(k->ellipse)->toXml(doc));
-               QRectF rect = k->ellipse->rect();
-               point = rect.topLeft();
-    } else if (name() == tr("Line")) {
-               return;
-    }
-
-    TupProjectRequest event = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), 
-                              scene->currentFrameIndex(), 0, point, scene->spaceMode(), TupLibraryObject::Item, 
-                              TupProjectRequest::Add, doc.toString());
-    emit requested(&event);
-}
-
-QMap<QString, TAction *> GeometricTool::actions() const
-{
-    return k->actions;
-}
-
-int GeometricTool::toolType() const
-{
-    return Brush;
-}
-        
-QWidget *GeometricTool::configurator()
-{
-    InfoPanel::ToolType toolType = InfoPanel::Line;
-
-    if (name() == tr("Rectangle"))
-        toolType = InfoPanel::Rectangle;
-    else if (name() == tr("Ellipse"))
-             toolType = InfoPanel::Ellipse;
-
-    k->configurator = new InfoPanel(toolType);
-    return k->configurator;
-}
-
-void GeometricTool::aboutToChangeScene(TupGraphicsScene *scene)
-{
-    Q_UNUSED(scene);
-
-    endItem();
-}
-
-void GeometricTool::aboutToChangeTool() 
-{
-    endItem();
-}
-
-void GeometricTool::saveConfig()
-{
-}
-
-void GeometricTool::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
-        emit closeHugeCanvas();
-        return;
-    } else if (event->key() == Qt::Key_Shift) {
-               k->proportion = true;
-    } else {
-        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-        if (flags.first != -1 && flags.second != -1)
-            emit callForPlugin(flags.first, flags.second);
-    }
-}
-
-void GeometricTool::keyReleaseEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_Shift)
-        k->proportion = false;
-}
-
-QCursor GeometricTool::cursor() const
-{
-    if (name() == tr("Rectangle")) {
-        return k->squareCursor;
-    } else if (name() == tr("Ellipse")) {
-               return k->circleCursor;
-    } else if (name() == tr("Line")) {
-               return k->lineCursor;
-    }
-
-    return QCursor(Qt::ArrowCursor);
-}
-
-void GeometricTool::endItem()
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    if (k->path) {
-        QDomDocument doc;
-        doc.appendChild(dynamic_cast<TupAbstractSerializable *>(k->path)->toXml(doc));
-        QPointF point = QPointF(0, 0);
-
-        TupProjectRequest event = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(), k->scene->currentLayerIndex(),
-                                  k->scene->currentFrameIndex(), 0, point, k->scene->spaceMode(), TupLibraryObject::Item, 
-                                  TupProjectRequest::Add, doc.toString());
-
-        emit requested(&event);
-        k->path = 0;
-    }
-}
-
-void GeometricTool::updatePos(QPointF pos)
-{
-    if (k->path) {
-        QLineF line;
-        if (k->proportion) {
-            qreal dx = pos.x() - k->currentPoint.x();
-            qreal dy = pos.y() - k->currentPoint.y();
-            qreal m = fabs(dx/dy);
-
-            if (m > 1) {
-                line = QLineF(k->currentPoint.x(), k->currentPoint.y(), pos.x(), k->currentPoint.y());
-                k->lastPoint = QPointF(pos.x(), k->currentPoint.y());
-            } else {
-                line = QLineF(k->currentPoint.x(), k->currentPoint.y(), k->currentPoint.x(), pos.y());
-                k->lastPoint = QPointF(k->currentPoint.x(), pos.y());
-            }
-
-        } else {
-            line = QLineF(k->currentPoint, pos);
-            k->lastPoint = pos;
-        }
-        if (k->line)
-            k->line->setLine(line);
-    }
-}
-
-void GeometricTool::doubleClick(const TupInputDeviceInformation *input, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(scene);
-
-    endItem();
-}
-
-void GeometricTool::sceneResponse(const TupSceneResponse *event)
-{
-    Q_UNUSED(event);
-    if (name() == tr("Line")) 
-        init(k->scene);
-}
-
-void GeometricTool::layerResponse(const TupLayerResponse *event)
-{
-    Q_UNUSED(event);
-    if (name() == tr("Line")) 
-        init(k->scene);
-}
-
-void GeometricTool::frameResponse(const TupFrameResponse *event)
-{
-    Q_UNUSED(event);
-    if (name() == tr("Line")) 
-        init(k->scene);
-}
-
-Q_EXPORT_PLUGIN2(tup_geometric, GeometricTool)
-
diff -Nru tupi-0.2+git04/src/plugins/tools/geometrictool/geometrictool.h tupi-0.2+git05/src/plugins/tools/geometrictool/geometrictool.h
--- tupi-0.2+git04/src/plugins/tools/geometrictool/geometrictool.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometrictool/geometrictool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef AGEOMETRICTOOLPLUGIN_H
-#define AGEOMETRICTOOLPLUGIN_H
-
-#include "tuptoolplugin.h"
-#include "tuprectitem.h"
-#include "tupellipseitem.h"
-#include "tuplineitem.h"
-#include "infopanel.h"
-
-#include <QObject>
-#include <QLabel>
-#include <QKeyEvent>
-
-/**
- * @author David Cuadrado
-*/
-
-class GeometricTool : public TupToolPlugin
-{
-    Q_OBJECT
-    
-    public:
-        GeometricTool();
-        ~GeometricTool();
-        
-        virtual QStringList keys() const;
-        virtual void init(TupGraphicsScene *scene);
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void keyPressEvent(QKeyEvent *event);
-        virtual void keyReleaseEvent(QKeyEvent *event);
-        virtual void doubleClick(const TupInputDeviceInformation *input, TupGraphicsScene *scene);
-
-        virtual void sceneResponse(const TupSceneResponse *event);
-        virtual void layerResponse(const TupLayerResponse *event);
-        virtual void frameResponse(const TupFrameResponse *event);
-
-        virtual QMap<QString, TAction *> actions() const;
-        
-        int toolType() const;
-        
-        virtual QWidget *configurator();
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-        virtual void saveConfig();
-        virtual QCursor cursor() const;
-        void updatePos(QPointF pos);
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
-        
-    private:
-        void setupActions();
-
-    private:
-        void endItem();
-        struct Private;
-        Private *const k;
-
-    /*
-    private:
-        TupRectItem *m_rect;
-        TupEllipseItem *m_ellipse;
-        TupLineItem *m_line;
-        InfoPanel *m_configurator;
-        bool added;
-        QPointF firstPoint;
-        QMap<QString, TAction *> m_actions;
-        bool proportion;
-        QGraphicsItem *m_item;
-    */
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/geometrictool/geometrictool.json tupi-0.2+git05/src/plugins/tools/geometrictool/geometrictool.json
--- tupi-0.2+git04/src/plugins/tools/geometrictool/geometrictool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometrictool/geometrictool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "GeometricTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/geometrictool/geometrictool.pro tupi-0.2+git05/src/plugins/tools/geometrictool/geometrictool.pro
--- tupi-0.2+git04/src/plugins/tools/geometrictool/geometrictool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometrictool/geometrictool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/geometrictool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += geometrictool.h \
-           infopanel.h 
-SOURCES += geometrictool.cpp \
-           infopanel.cpp
-
-CONFIG += plugin
-TEMPLATE = lib 
-TARGET = tupigeometrictool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/geometrictool/infopanel.cpp tupi-0.2+git05/src/plugins/tools/geometrictool/infopanel.cpp
--- tupi-0.2+git04/src/plugins/tools/geometrictool/infopanel.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometrictool/infopanel.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "infopanel.h"
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QBoxLayout>
-#include <QTextEdit>
-
-InfoPanel::InfoPanel(InfoPanel::ToolType type, QWidget *parent) : QWidget(parent)
-{
-    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-
-    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *label = new QLabel(tr("Tips"));
-    label->setAlignment(Qt::AlignHCenter); 
-    layout->addWidget(label);
-
-    mainLayout->addLayout(layout);
-
-    QTextEdit *textArea = new QTextEdit; 
-
-    // SQA: Check this code with several screen resolutions. It must looks good with everyone! 
-    textArea->setFont(QFont("Arial", 8, QFont::Normal, false));
-
-    if (type == InfoPanel::Line) {
-        textArea->append("<p><b>" + tr("Mouse Double Click") + ":</b> " +  tr("Close the line path") + "</p>");
-        textArea->append("<p><b>" + tr("Shift") + ":</b> " +  tr("Align line to horizontal/vertical axis") + "</p>"); 
-    } else {
-        textArea->append("<p><b>" + tr("Shift + Left Mouse Button") + ":</b> " +  tr("Set width/height proportional dimensions") + "</p>");
-    }
-
-    QString text = textArea->document()->toPlainText();
-    int height = 150;
-
-    textArea->setFixedHeight(height);
-
-    mainLayout->addWidget(textArea);
-    mainLayout->addStretch(2);
-}
-
-InfoPanel::~InfoPanel()
-{
-}
-
diff -Nru tupi-0.2+git04/src/plugins/tools/geometrictool/infopanel.h tupi-0.2+git05/src/plugins/tools/geometrictool/infopanel.h
--- tupi-0.2+git04/src/plugins/tools/geometrictool/infopanel.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/geometrictool/infopanel.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef INFOPANEL_H
-#define INFOPANEL_H
-
-#include <QLabel>
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class InfoPanel : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        enum ToolType { Rectangle = 1, Ellipse, Line };
-        InfoPanel(InfoPanel::ToolType type, QWidget *parent = 0);
-        ~InfoPanel();
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/ink/configurator.cpp tupi-0.2+git05/src/plugins/tools/ink/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/ink/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/ink/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,187 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+
+Configurator::Configurator(QWidget *parent) :QWidget(parent)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Configurator()]";
+        #else
+            TINIT;
+        #endif
+    #endif
+
+    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+
+    /*
+    QTextEdit *textArea = new QTextEdit; 
+    textArea->setFixedHeight(170);
+    textArea->setHtml("<p>" + tr("This tool is just a <b>proof-of-concept</b> of the basic algorithm for the Tupi's free-tracing vectorial brushes") + "</p>"); 
+    mainLayout->addWidget(textArea);
+    */
+
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *label = new QLabel(tr("Parameters"));
+    label->setAlignment(Qt::AlignHCenter);
+    layout->addWidget(label);
+    mainLayout->addLayout(layout);
+
+    /*
+    QBoxLayout *structureLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *structureLabel = new QLabel(tr("Structure"));
+    structureLabel->setAlignment(Qt::AlignHCenter);
+    structureLayout->addWidget(structureLabel);
+
+    structureCombo = new QComboBox();
+    structureCombo->addItem(tr("Basic"));
+    structureCombo->addItem(tr("Axial"));
+    structureCombo->addItem(tr("Organic"));
+    structureCombo->setCurrentIndex(2);
+    structureLayout->addWidget(structureCombo);
+
+    mainLayout->addLayout(structureLayout);
+    */
+
+    QBoxLayout *spaceLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *spaceLabel = new QLabel(tr("Dot Spacing"));
+    spaceLabel->setAlignment(Qt::AlignHCenter);
+    spaceLayout->addWidget(spaceLabel);
+
+    spacingBox = new QSpinBox();
+    spacingBox->setSingleStep(1);
+    spacingBox->setMinimum(1);
+    spacingBox->setMaximum(10);
+    spacingBox->setValue(5);
+    spaceLayout->addWidget(spacingBox);
+
+    connect(spacingBox, SIGNAL(valueChanged(int)), this, SIGNAL(updateSpacing(int)));
+
+    mainLayout->addLayout(spaceLayout);
+
+    QBoxLayout *sizeLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *sizeLabel = new QLabel(tr("Size Tolerance"));
+    sizeLabel->setAlignment(Qt::AlignHCenter);
+    sizeLayout->addWidget(sizeLabel);
+
+    sizeBox = new QSpinBox();
+    sizeBox->setSingleStep(10);
+    sizeBox->setMinimum(0);
+    sizeBox->setMaximum(200);
+    sizeBox->setValue(50);
+    sizeLayout->addWidget(sizeBox);
+
+    connect(sizeBox, SIGNAL(valueChanged(int)), this, SIGNAL(updateSizeTolerance(int)));
+
+    mainLayout->addLayout(sizeLayout);
+
+    /*
+    QBoxLayout *checkLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    checkBox = new QCheckBox(tr("Run simulation"));
+    checkBox->setChecked(true);
+    checkLayout->addWidget(checkBox);
+    connect(checkBox, SIGNAL(stateChanged(int)), this, SLOT(updateInterface(int)));
+    mainLayout->addLayout(checkLayout);
+    */
+
+    QBoxLayout *smoothLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *smoothLabel = new QLabel(tr("Smoothness"));
+    smoothLabel->setAlignment(Qt::AlignHCenter);
+    smoothLayout->addWidget(smoothLabel);
+    smoothBox = new QDoubleSpinBox();
+
+    smoothBox->setValue(4.0);
+    smoothBox->setDecimals(2);
+    smoothBox->setSingleStep(0.1);
+    smoothBox->setMaximum(100);
+    smoothLayout->addWidget(smoothBox);
+
+    mainLayout->addLayout(smoothLayout);
+    // smoothBox->setDisabled(true);
+
+    mainLayout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~Configurator()]";
+        #else
+            TEND;
+        #endif
+    #endif
+}
+
+int Configurator::spacingValue()
+{
+    return spacingBox->value();
+}
+
+qreal Configurator::sizeToleranceValue()
+{
+    return sizeBox->value();
+}
+
+/*
+bool Configurator::runSimulation()
+{
+    return checkBox->isChecked();
+}
+*/
+
+/*
+void Configurator::updateInterface(int state)
+{ 
+    if (state == 2)
+        smoothBox->setDisabled(false);
+    else
+        smoothBox->setDisabled(true);
+}
+*/
+
+double Configurator::smoothness() const
+{
+    return smoothBox->value();
+}
+
+/*
+Configurator::Structure Configurator::structureType()
+{
+    int index = structureCombo->currentIndex();
+    return Structure(index);
+}
+*/
diff -Nru tupi-0.2+git04/src/plugins/tools/ink/configurator.h tupi-0.2+git05/src/plugins/tools/ink/configurator.h
--- tupi-0.2+git04/src/plugins/tools/ink/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/ink/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,83 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "tglobal.h"
+
+#include <QLabel>
+#include <QComboBox>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include <QBoxLayout>
+#include <QTextEdit>
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Configurator : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        enum Structure { Basic = 0, Axial, Organic };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+        int spacingValue();
+        qreal sizeToleranceValue();
+        // bool runSimulation();
+        double smoothness() const;
+        // Configurator::Structure structureType();
+
+    signals:
+        void updateSpacing(int value);
+        void updateSizeTolerance(int value);
+
+    // private slots:
+    //         void updateInterface(int state);
+
+    private:
+        QComboBox *structureCombo;
+        QSpinBox *spacingBox;
+        QSpinBox *sizeBox;
+        // QCheckBox *checkBox;
+        QDoubleSpinBox *smoothBox;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/ink/ink.pro tupi-0.2+git05/src/plugins/tools/ink/ink.pro
--- tupi-0.2+git04/src/plugins/tools/ink/ink.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/ink/ink.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,37 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += inktool.h \
+           configurator.h
+
+SOURCES += inktool.cpp \
+           configurator.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib 
+TARGET = tupiinktool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/ink/inktool.cpp tupi-0.2+git05/src/plugins/tools/ink/inktool.cpp
--- tupi-0.2+git04/src/plugins/tools/ink/inktool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/ink/inktool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,693 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "inktool.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicalgorithm.h"
+#include "tupgraphicsscene.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupellipseitem.h"
+#include "tuplineitem.h"
+#include "tuptextitem.h"
+#include "taction.h"
+#include "talgorithm.h"
+#include "tconfig.h"
+
+struct InkTool::Private
+{
+    QPointF firstPoint;
+    QPointF oldPos;
+
+    QPointF previewPoint;
+    QPointF oldPosRight;
+    QPointF oldPosLeft;
+    QPointF connector;
+
+    QPainterPath path;
+    QPainterPath inkPath;
+    QList<QPointF> leftPoints;
+
+    Configurator *configurator;
+    QMap<QString, TAction *> actions;
+
+    TupPathItem *item;
+
+    int dotsCounter;
+    qreal penWidth;
+    qreal oldSlope;
+    int spacing;
+    qreal tolerance;
+    qreal widthVar;
+    int arrowSize;
+    int firstArrow;
+    QCursor cursor;
+};
+
+InkTool::InkTool() : k(new Private)
+{
+    k->configurator = 0;
+    k->item = 0;
+    k->cursor = QCursor(kAppProp->themeDir() + "cursors/contour.png", 0, 15);
+
+    setupActions();
+}
+
+InkTool::~InkTool()
+{
+}
+
+void InkTool::init(TupGraphicsScene *scene)
+{
+    k->spacing = k->configurator->spacingValue();
+
+    TCONFIG->beginGroup("PenParameters");
+    int thickness = TCONFIG->value("Thickness", -1).toInt();
+    k->tolerance = k->configurator->sizeToleranceValue()/(qreal)100;
+
+    k->widthVar = k->tolerance*thickness;
+
+    if (k->widthVar < 1)
+        k->widthVar = 1; 
+		
+    /*
+    tError() << "InkTool::init() - thickness: " << thickness;
+    tError() << "InkTool::init() - k->tolerance: " << k->tolerance;
+    tError() << "InkTool::init() - k->widthVar: " << k->widthVar;
+    */
+
+    foreach (QGraphicsView * view, scene->views()) {
+             view->setDragMode(QGraphicsView::NoDrag);
+             Q_CHECK_PTR(view->scene());
+             if (QGraphicsScene *scene = qobject_cast<QGraphicsScene *>(view->scene())) {
+                 foreach (QGraphicsItem *item, scene->items()) {
+                          item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                          item->setFlag(QGraphicsItem::ItemIsMovable, false);
+                 }
+             }
+    }
+}
+
+QStringList InkTool::keys() const
+{
+    return QStringList() << tr("Ink");
+}
+
+void InkTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    k->oldSlope = 0;
+    k->penWidth = brushManager->pen().widthF()/2;
+
+    k->dotsCounter = 1;
+    k->firstPoint = input->pos();
+    k->connector = k->firstPoint;
+
+    k->path = QPainterPath();
+    k->path.moveTo(k->firstPoint);
+
+    k->inkPath = QPainterPath();
+    k->inkPath.setFillRule(Qt::WindingFill);
+    k->inkPath.moveTo(k->firstPoint);
+
+    k->leftPoints.clear(); 
+    k->leftPoints << k->firstPoint;
+
+    k->oldPos = input->pos();
+    k->oldPosRight = input->pos();
+    k->oldPosLeft = input->pos();
+    k->previewPoint = input->pos();
+
+    k->item = new TupPathItem();
+    QColor color(55, 155, 55, 200);
+    QPen pen(QBrush(color), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+    k->item->setPen(pen);
+
+    scene->includeObject(k->item);
+
+    k->firstArrow = rand() % 10 + 1;
+    k->arrowSize = -1;
+}
+
+void InkTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(brushManager);
+
+    k->dotsCounter++;
+
+    foreach (QGraphicsView * view, scene->views())
+             view->setDragMode(QGraphicsView::NoDrag);
+
+    QPointF currentPoint = input->pos();
+
+    qreal my = currentPoint.y() - k->previewPoint.y(); 
+    qreal mx = currentPoint.x() - k->previewPoint.x();
+    qreal m;
+
+    if (currentPoint != k->previewPoint) {
+        if (mx != 0)
+            m = my / mx;
+        else
+            m = 100;
+
+        k->path.moveTo(k->previewPoint);
+        k->path.lineTo(currentPoint);
+
+        k->item->setPath(k->path);
+
+        // tError() << "InkTool::move() - Flag 1";
+
+        qreal slopeVar = abs(k->oldSlope - m);
+        qreal distance = sqrt(pow(abs(currentPoint.x() - k->oldPos.x()), 2) + pow(abs(currentPoint.y() - k->oldPos.y()), 2));
+
+        if ((k->dotsCounter > k->firstArrow) && ((k->dotsCounter % k->spacing == 0) || ((slopeVar >= 1) && (distance > 10)))) {
+
+            if (k->arrowSize == -1) {
+                // tError() << "InkTool::move() - Flag 3";
+                qreal pow1 = pow(currentPoint.x() - k->firstPoint.x(), 2);
+                qreal pow2 = pow(currentPoint.y() - k->firstPoint.y(), 2); 
+                k->arrowSize = sqrt(pow1 + pow2);
+                if (k->arrowSize > 0)
+                    k->arrowSize = (rand() % k->arrowSize) + 1; 
+                else
+                    k->arrowSize = 5;
+            }
+
+            k->oldSlope = m;
+
+            qreal pm;  
+            qreal x0;
+            qreal y0;
+            qreal x1;
+            qreal y1;
+            // bool isNAN = false;
+
+            if (m == 0) {
+                // isNAN = true;
+                pm = 100; 
+            } else {
+                pm = (-1) * (1/m);
+            } 
+
+            #ifdef K_DEBUG
+                   bool isNAN = false;
+                   if (m == 0)
+                       isNAN = true;
+					   
+                   if (m == 100) {
+                       QString msg = "InkTool::move() - M: NAN";
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
+                   } else {
+                       QString msg = "InkTool::move() - M: " + QString::number(m);
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
+                   }
+
+                   if (isNAN) {
+                       QString msg = "InkTool::move() - M(inv): NAN";
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
+                   } else {
+                       QString msg = "InkTool::move() - M(inv): " + QString::number(pm);
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
+                   }
+            #endif
+
+            qreal hypotenuse;
+
+            if (fabs(pm) < 5) { // Line's slope is close to 0
+                int cutter = k->penWidth;
+                bool found = false;
+                qreal limit = 0;
+                int iterations = 0;
+
+                if (k->tolerance < 1) {
+                    while (!found) {
+                       iterations++;
+                       x0 = currentPoint.x() - cutter;
+                       y0 = (pm*(x0 - currentPoint.x())) + currentPoint.y();
+
+                       x1 = currentPoint.x() + cutter;
+                       y1 = (pm*(x1 - currentPoint.x())) + currentPoint.y();
+                       hypotenuse = sqrt(pow(x1 - x0, 2) + pow(y1 - y0, 2));
+
+                       limit = hypotenuse - brushManager->pen().widthF();
+
+                       if (fabs(limit) > k->widthVar) {
+                           if (limit > 0) {
+                                   cutter -= 0.2;
+                                   if (cutter == 0)
+                                       found = true;
+                           } else {
+                                   cutter += 0.2;
+                           }
+                       } else {
+                           found = true;
+                       }
+
+                       if (iterations >10)
+                           found = true;
+                    }
+                } else {
+                       int random = rand() % 101;
+
+                       qreal plus = (qreal)random/(qreal)100 * (k->penWidth*k->tolerance);
+
+                       x0 = currentPoint.x() - plus;
+                       y0 = (pm*(x0 - currentPoint.x())) + currentPoint.y();
+
+                       x1 = currentPoint.x() + plus;
+                       y1 = (pm*(x1 - currentPoint.x())) + currentPoint.y();
+                       hypotenuse = sqrt(pow(x1 - x0, 2) + pow(y1 - y0, 2));
+                }
+
+            } else { // Line's slope is 0 or very very close to
+
+                    qreal delta;
+                    qreal plus;
+                    int random = rand() % 101;
+
+                    if (k->tolerance == 0) {
+                        plus = 0; 
+                    } else if (k->tolerance < 1) {
+                               if (k->widthVar > 0)
+                                   plus = rand() % (int) k->widthVar;
+                               else
+                                   plus = rand() % 5;
+                    } else {
+                        plus = (qreal)random/(qreal)100 * (k->penWidth*k->tolerance);
+                    }
+
+                    delta = k->penWidth + plus;
+
+                    x0 = currentPoint.x();
+                    y0 = currentPoint.y() - delta;
+
+                    x1 = currentPoint.x();
+                    y1 = currentPoint.y() + delta;
+
+                    hypotenuse = fabs(y1 - y0);
+            }
+
+            QPointF right;
+            QPointF left;
+
+            if (k->previewPoint.x() < currentPoint.x()) {
+                if (k->previewPoint.y() < currentPoint.y()) {
+                    #ifdef K_DEBUG
+                        QString msg = "    -> InkTool::move() - Going down-right";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tDebug() << msg;
+                        #endif
+                    #endif
+
+                    if (y0 > y1) {
+                        left = QPointF(x0, y0);
+                        right = QPointF(x1, y1);
+                    } else {
+                        left = QPointF(x1, y1);
+                        right = QPointF(x0, y0);
+                    }
+
+                    qreal endX = currentPoint.x() + k->arrowSize;
+                    qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                    k->connector = QPoint(endX, endY);
+
+                } else if (k->previewPoint.y() > currentPoint.y()) {
+                           #ifdef K_DEBUG
+                               QString msg = "    -> InkTool::move() - Going up-right";
+                               #ifdef Q_OS_WIN32
+                                   qDebug() << msg;
+                               #else
+                                   tDebug() << msg;
+                               #endif
+                           #endif
+
+                           if (x0 > x1) {
+                               left = QPointF(x0, y0);
+                               right = QPointF(x1, y1);
+                           } else {
+                               left = QPointF(x1, y1);
+                               right = QPointF(x0, y0);
+                           }
+
+                           qreal endX = currentPoint.x() + k->arrowSize;
+                           qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                           k->connector = QPoint(endX, endY);
+                } else {
+                     #ifdef K_DEBUG
+                         QString msg = "    -> InkTool::move() - Going right";
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tDebug() << msg;
+                         #endif
+                     #endif
+
+                     if (y0 > y1) {
+                         left = QPointF(x0, y0);
+                         right = QPointF(x1, y1);
+                     } else {
+                         left = QPointF(x1, y1);
+                         right = QPointF(x0, y0);
+                     }
+
+                     qreal endX = currentPoint.x() + k->arrowSize;
+                     qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                     k->connector = QPoint(endX, endY);
+                }
+            } else if (k->previewPoint.x() > currentPoint.x()) {
+                if (k->previewPoint.y() < currentPoint.y()) {
+                    #ifdef K_DEBUG
+                        QString msg = "    -> InkTool::move() - Going down-left";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tDebug() << msg;
+                        #endif
+                    #endif
+
+                    if (y0 > y1) {
+                        right = QPointF(x0, y0);
+                        left = QPointF(x1, y1);
+                    } else {
+                        right = QPointF(x1, y1);
+                        left = QPointF(x0, y0);
+                    }
+
+                    qreal endX = currentPoint.x() - k->arrowSize;
+                    qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                    k->connector = QPoint(endX, endY);
+
+                } else if (k->previewPoint.y() > currentPoint.y()) {
+                           #ifdef K_DEBUG
+                               QString msg = "    -> InkTool::move() - Going up-left";
+                               #ifdef Q_OS_WIN32
+                                   qDebug() << msg;
+                               #else
+                                   tDebug() << msg;
+                               #endif
+                           #endif
+
+                           if (x0 > x1) {
+                               left = QPointF(x0, y0);
+                               right = QPointF(x1, y1);
+                           } else {
+                               if (x0 < x1) {
+                                   left = QPointF(x1, y1);
+                                   right = QPointF(x0, y0);
+                               } else { // x0 == x1
+                                   if (y0 > y1) {
+                                       left = QPointF(x1, y1);
+                                       right = QPointF(x0, y0);
+                                   } else {
+                                       left = QPointF(x0, y0);
+                                       right = QPointF(x1, y1);
+                                   }
+                               }
+                           }
+
+                           qreal endX = currentPoint.x() - k->arrowSize;
+                           qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                           k->connector = QPoint(endX, endY);
+
+                } else {
+                     #ifdef K_DEBUG
+                         QString msg = "    -> InkTool::move() - Going left";
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tDebug() << msg;
+                         #endif
+                     #endif
+                     if (y0 > y1) {
+                         right = QPointF(x0, y0);
+                         left = QPointF(x1, y1);
+                     } else {
+                         right = QPointF(x1, y1);
+                         left = QPointF(x0, y0);
+                     }
+
+                     qreal endX = currentPoint.x() - k->arrowSize;
+                     qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                     k->connector = QPoint(endX, endY);
+                }
+            } else if (k->previewPoint.x() == currentPoint.x()) {
+                       if (k->previewPoint.y() > currentPoint.y()) {
+                           #ifdef K_DEBUG
+                               QString msg = "    -> InkTool::move() - Going up";
+                               #ifdef Q_OS_WIN32
+                                   qDebug() << msg;
+                               #else
+                                   tDebug() << msg;
+                               #endif
+                           #endif
+                           if (x0 > x1) {
+                               left = QPointF(x0, y0);
+                               right = QPointF(x1, y1);
+                           } else {
+                               left = QPointF(x1, y1);
+                               right = QPointF(x0, y0);
+                           }
+
+                           qreal endX = currentPoint.x();
+                           qreal endY = currentPoint.y() - k->arrowSize;
+                           k->connector = QPoint(endX, endY);
+                       } else {
+                           #ifdef K_DEBUG
+                               QString msg = "    -> InkTool::move() - Going down";
+                               #ifdef Q_OS_WIN32
+                                   qDebug() << msg;
+                               #else
+                                   tDebug() << msg;
+                               #endif
+                           #endif
+                           if (x0 > x1) {
+                               right = QPointF(x0, y0);
+                               left = QPointF(x1, y1);
+                           } else {
+                               right = QPointF(x1, y1);
+                               left = QPointF(x0, y0);
+                           }
+
+                           qreal endX = currentPoint.x();
+                           qreal endY = currentPoint.y() + k->arrowSize;
+                           k->connector = QPoint(endX, endY);
+                       }
+            }
+
+            k->inkPath.moveTo(k->oldPosRight);
+            k->inkPath.lineTo(right);
+            k->oldPosRight = right;
+
+            k->oldPosLeft = left;
+            k->leftPoints << left;
+
+            k->oldPos = currentPoint;
+        }
+    }
+
+    k->previewPoint = currentPoint;
+}
+
+void InkTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(scene);
+
+    QPointF currentPoint = input->pos();
+    qreal radius = brushManager->pen().width();
+
+    if (k->firstPoint == currentPoint && k->inkPath.elementCount() == 1)
+        k->inkPath.addEllipse(input->pos().x() - (radius/2), input->pos().y()-(radius/2), radius, radius);
+
+    k->path.moveTo(k->oldPos);
+    k->path.lineTo(k->connector);
+    k->inkPath.moveTo(k->oldPosRight);
+    k->inkPath.lineTo(k->connector);
+
+    k->leftPoints << k->connector; 
+
+    scene->removeItem(k->item);
+
+    QPen inkPen(brushManager->penColor(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+
+    if (k->firstPoint != currentPoint) {
+        for (int i = k->leftPoints.size()-1; i > 0; i--) {
+             k->inkPath.moveTo(k->leftPoints.at(i));
+             k->inkPath.lineTo(k->leftPoints.at(i-1));
+        }
+
+        k->inkPath.moveTo(k->leftPoints.at(0));
+        k->inkPath.lineTo(QPointF(0, 0));
+
+        smoothPath(k->inkPath, k->configurator->smoothness());
+
+        TupPathItem *line = new TupPathItem();
+        line->setPen(inkPen);
+        line->setBrush(brushManager->penBrush());
+        line->setPath(k->inkPath);
+        scene->includeObject(line);
+
+        QDomDocument doc;
+        doc.appendChild(line->toXml(doc));
+        TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
+                                                                         0, QPointF(), scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
+                                                                         doc.toString());
+        emit requested(&request);
+
+    } else {
+        QPointF distance((radius + 2)/2, (radius + 2)/2);
+        TupEllipseItem *blackEllipse = new TupEllipseItem(QRectF(k->connector - distance, QSize(radius + 2, radius + 2)));
+        blackEllipse->setPen(inkPen);
+        blackEllipse->setBrush(brushManager->penBrush());
+        scene->includeObject(blackEllipse);
+
+        QDomDocument doc;
+        doc.appendChild(blackEllipse->toXml(doc));
+        TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
+                                                                         0, currentPoint, scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
+                                                                         doc.toString());
+        emit requested(&request);
+    }
+}
+
+void InkTool::setupActions()
+{
+    TAction *inkPen = new TAction(QPixmap(kAppProp->themeDir() + "icons/ink.png"), tr("Ink"), this);
+    inkPen->setShortcut(QKeySequence(tr("K")));
+    inkPen->setToolTip(tr("Ink") + " - " + "K");
+    inkPen->setCursor(k->cursor);
+
+    k->actions.insert(tr("Ink"), inkPen);
+}
+
+QMap<QString, TAction *> InkTool::actions() const
+{
+    return k->actions;
+}
+
+int InkTool::toolType() const
+{
+    return TupToolInterface::Brush;
+}
+
+QWidget *InkTool::configurator() 
+{
+    if (! k->configurator) {
+        k->configurator = new Configurator;
+        connect(k->configurator, SIGNAL(updateSpacing(int)), this, SLOT(updateSpacingVar(int)));
+        connect(k->configurator, SIGNAL(updateSizeTolerance(int)), this, SLOT(updateSizeToleranceVar(int)));
+    }
+
+    return k->configurator;
+}
+
+void InkTool::aboutToChangeTool() 
+{
+}
+
+void InkTool::saveConfig()
+{
+}
+
+void InkTool::updateSpacingVar(int value)
+{
+    k->spacing = value;
+}
+
+void InkTool::updateSizeToleranceVar(int value)
+{
+    k->tolerance = (qreal)value/(qreal)100;
+}
+
+void InkTool::smoothPath(QPainterPath &path, double smoothness, int from, int to)
+{
+    QPolygonF pol;
+    QList<QPolygonF> polygons = path.toSubpathPolygons();
+
+    QList<QPolygonF>::iterator it = polygons.begin();
+
+    QPolygonF::iterator pointIt;
+
+    while (it != polygons.end()) {
+           pointIt = (*it).begin();
+
+           while (pointIt <= (*it).end()-2) {
+                  pol << (*pointIt);
+                  pointIt += 2;
+           }
+           ++it;
+    }
+
+    if (smoothness > 0) {
+        path = TupGraphicalAlgorithm::bezierFit(pol, smoothness, from, to);
+    } else {
+        path = QPainterPath();
+        path.addPolygon(pol);
+    }
+}
+
+void InkTool::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
+        emit closeHugeCanvas();
+    } else {
+        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+        if (flags.first != -1 && flags.second != -1)
+            emit callForPlugin(flags.first, flags.second);
+    }
+}
+
+QCursor InkTool::cursor() const
+{
+    return k->cursor;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/ink/inktool.h tupi-0.2+git05/src/plugins/tools/ink/inktool.h
--- tupi-0.2+git04/src/plugins/tools/ink/inktool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/ink/inktool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,126 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef INKTOOL_H
+#define INKTOOL_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "configurator.h"
+#include "tuppathitem.h"
+
+#include <QObject>
+#include <QSpinBox>
+#include <QTimer>
+#include <QPointF>
+#include <QKeySequence>
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QMatrix>
+#include <QGraphicsLineItem>
+#include <QGraphicsView>
+#include <QBrush>
+#include <cmath>
+
+/**
+ * @author David Cuadrado
+*/
+
+class TUPI_PLUGIN InkTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "inktool.json")
+    
+    public:
+        InkTool();
+        virtual ~InkTool();
+        
+        virtual void init(TupGraphicsScene *scene);
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+        virtual void aboutToChangeTool();
+        virtual void saveConfig();
+        virtual void keyPressEvent(QKeyEvent *event);
+        virtual QCursor cursor() const;
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+        
+    private:
+        void setupActions();
+        void smoothPath(QPainterPath &path, double smoothness, int from = 0, int to = -1);
+
+    private slots:
+        void updateSpacingVar(int value);
+        void updateSizeToleranceVar(int value);
+
+    private:
+        struct Private;
+        Private *const k;
+
+    /*        
+    private:
+        QPointF m_firstPoint;
+        QPointF m_oldPos;
+        QPointF previewPoint;
+        QPointF oldPosRight;
+        QPointF oldPosLeft;
+        QPointF connector;
+        QPainterPath m_path;
+        QPainterPath pathRight; 
+        QPainterPath pathLeft;
+        Configurator *m_configurator;
+        QMap<QString, TAction *> m_actions;
+        TupPathItem *m_item;
+        TupPathItem *itemRight;
+        TupPathItem *itemLeft;
+        int dotsCounter;
+        qreal penWidth;
+        qreal oldSlope;
+        int spacing;
+        qreal tolerance;
+        qreal widthVar; 
+        int arrowSize;
+        int firstArrow;
+    */
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/ink/inktool.json tupi-0.2+git05/src/plugins/tools/ink/inktool.json
--- tupi-0.2+git04/src/plugins/tools/ink/inktool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/ink/inktool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "InkTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/ink/ink.xpm tupi-0.2+git05/src/plugins/tools/ink/ink.xpm
--- tupi-0.2+git04/src/plugins/tools/ink/ink.xpm	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/ink/ink.xpm	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,296 @@
+/* XPM */
+const char *brush_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"33 33 257 2",
+"   c #040302",
+".  c #090301",
+"X  c #090909",
+"o  c #120400",
+"O  c #130801",
+"+  c #120D08",
+"@  c #1B0600",
+"#  c #1B0900",
+"$  c #1E0E08",
+"%  c #1E1005",
+"&  c #1C1A16",
+"*  c #250B00",
+"=  c #2B0C00",
+"-  c #200700",
+";  c #2B1105",
+":  c #340D00",
+">  c #3D0D00",
+",  c #3A1200",
+"<  c #361808",
+"1  c #301F16",
+"2  c #26221C",
+"3  c #33312E",
+"4  c #490F00",
+"5  c #441401",
+"6  c #4C1A00",
+"7  c #531D00",
+"8  c #5E1B00",
+"9  c #551602",
+"0  c #4A2409",
+"q  c #402516",
+"w  c #522400",
+"e  c #562A07",
+"r  c #502917",
+"t  c #6A1A00",
+"y  c #731D00",
+"u  c #652806",
+"i  c #6D3A00",
+"p  c #693C08",
+"a  c #693519",
+"s  c #742300",
+"d  c #7B2A00",
+"f  c #723500",
+"g  c #753A00",
+"h  c #763808",
+"j  c #46423A",
+"k  c #7B4501",
+"l  c #7D4A03",
+"z  c #724414",
+"x  c #74511A",
+"c  c #654F31",
+"v  c #7B4825",
+"b  c #474640",
+"n  c #56524B",
+"m  c #62554A",
+"M  c #665E52",
+"N  c #715C50",
+"B  c #626056",
+"V  c #6E6B63",
+"C  c #7A786E",
+"Z  c #842D00",
+"A  c #833303",
+"S  c #873A03",
+"D  c #953803",
+"F  c #8C4B09",
+"G  c #864819",
+"H  c #8B5006",
+"J  c #8A5213",
+"K  c #964605",
+"L  c #954C11",
+"P  c #995B0A",
+"I  c #94540A",
+"U  c #945816",
+"Y  c #964E20",
+"T  c #835535",
+"R  c #8E6012",
+"E  c #9E6116",
+"W  c #996127",
+"Q  c #A64A03",
+"!  c #A85208",
+"~  c #AB5A11",
+"^  c #B15306",
+"/  c #AC620B",
+"(  c #A7670A",
+")  c #A7631B",
+"_  c #B86608",
+"`  c #B76717",
+"'  c #B8781A",
+"]  c #A76C25",
+"[  c #AF762D",
+"{  c #A37531",
+"}  c #B46C27",
+"|  c #B67424",
+" . c #B7783C",
+".. c #826F46",
+"X. c #886A55",
+"o. c #817A54",
+"O. c #857E59",
+"+. c #94754C",
+"@. c #927856",
+"#. c #807D73",
+"$. c #927565",
+"%. c #A77740",
+"&. c #CB6D03",
+"*. c #C56E01",
+"=. c #C36D1D",
+"-. c #CB7400",
+";. c #CB7807",
+":. c #CC7B13",
+">. c #C57819",
+",. c #D67A00",
+"<. c #D17F1C",
+"1. c #C27320",
+"2. c #C17F37",
+"3. c #B48234",
+"4. c #88825D",
+"5. c #988657",
+"6. c #8B8461",
+"7. c #828074",
+"8. c #938D6A",
+"9. c #928864",
+"0. c #968B74",
+"q. c #96906D",
+"w. c #97927C",
+"e. c #9A9473",
+"r. c #99957C",
+"t. c #9E9877",
+"y. c #9E987B",
+"u. c #969175",
+"i. c #A68658",
+"p. c #B98048",
+"a. c #B98A55",
+"s. c #B99554",
+"d. c #A48D65",
+"f. c #A68F7A",
+"g. c #A9956A",
+"h. c #A49375",
+"j. c #A39A7D",
+"k. c #B49462",
+"l. c #B89E73",
+"z. c #CC8307",
+"x. c #C78319",
+"c. c #D38502",
+"v. c #DB8B08",
+"b. c #D58818",
+"n. c #DE940A",
+"m. c #D99119",
+"M. c #C98227",
+"N. c #CA8C3B",
+"B. c #C2933A",
+"V. c #D28429",
+"C. c #D58934",
+"Z. c #DA8E3D",
+"A. c #DC9C25",
+"S. c #DA932A",
+"D. c #D99635",
+"F. c #CC972B",
+"G. c #DCA033",
+"H. c #E29C17",
+"J. c #E59309",
+"K. c #E7A937",
+"L. c #CB8746",
+"P. c #C4954B",
+"I. c #CA935C",
+"U. c #DA9C5B",
+"Y. c #C69B68",
+"T. c #CEA559",
+"R. c #DBA149",
+"E. c #CCAD76",
+"W. c #DCAC73",
+"Q. c #E6AC48",
+"!. c #E1AA52",
+"~. c #EBB54A",
+"^. c #EAB756",
+"/. c #EDB961",
+"(. c #E2B57D",
+"). c #ECC16C",
+"_. c #999580",
+"`. c #9D9984",
+"'. c #939082",
+"]. c #A09C85",
+"[. c #A19D89",
+"{. c #A4A18B",
+"}. c #A9A58D",
+"|. c #AEA98C",
+" X c #AAA593",
+".X c #ACA59C",
+"XX c #ADA994",
+"oX c #ADAA99",
+"OX c #A6A392",
+"+X c #B0AA8D",
+"@X c #B0AC9C",
+"#X c #B1AA96",
+"$X c #B6B195",
+"%X c #B4B19C",
+"&X c #B8B39A",
+"*X c #BDB89E",
+"=X c #A9A7A0",
+"-X c #B1AEA1",
+";X c #B5B3A2",
+":X c #B9B4A2",
+">X c #B8B5AA",
+",X c #BCB9A5",
+"<X c #BDBAAB",
+"1X c #BEBCB1",
+"2X c #C3BB9D",
+"3X c #C1BDA4",
+"4X c #C0BDAB",
+"5X c #C0BEB3",
+"6X c #E3B587",
+"7X c #E9BD92",
+"8X c #D3C09D",
+"9X c #C5C1AC",
+"0X c #C9C5AC",
+"qX c #C8C3A6",
+"wX c #C3C1B5",
+"eX c #C5C2B8",
+"rX c #C9C5B2",
+"tX c #CDC9B4",
+"yX c #CDCBBC",
+"uX c #D1CDB2",
+"iX c #D2CEB9",
+"pX c #DECFBA",
+"aX c #D6D1B5",
+"sX c #D8D3B6",
+"dX c #DAD5BA",
+"fX c #DED9BE",
+"gX c #EBC198",
+"hX c #EDCAA7",
+"jX c #E8D0A9",
+"kX c #F0D2B6",
+"lX c #CCCBC2",
+"zX c #D0CEC5",
+"xX c #D3D2CA",
+"cX c #DEDAC4",
+"vX c #D9D6C4",
+"bX c #DAD9D3",
+"nX c #DBDBD4",
+"mX c #E0DBC2",
+"MX c #E1DDCA",
+"NX c #E0DFD9",
+"BX c #F0DAC3",
+"VX c #E5E1CC",
+"CX c #EAE0CA",
+"ZX c #E7E3D0",
+"AX c #E9E5D3",
+"SX c #EBE8D6",
+"DX c #EEEBDC",
+"FX c #E1E0DB",
+"GX c #F0E1CF",
+"HX c #F3EADC",
+"JX c #EFEDE1",
+"KX c #F0EEE1",
+"LX c #F9EDE4",
+"PX c #F2F0E4",
+"IX c #F4F2E8",
+"UX c gray100",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXuXj.4.o.8.q.8.8.q.q.8.8.8.8.8.8.8.8.V g.,XYXYXYXYXYXYX",
+"YXYXYXYX0Xy.e.2XfXfXfXfXfXfXfXfXfXfXfXfXfXfXdXaXuX$Xt.8.*XYXYXYXYX",
+"YXYXYX$X4.qXcXfXfXMXVXAXAXSXAXSXSXSXSXAXAXZXVXcX8X0XqX&X8.+XYXYXYX",
+"YXYX&X8.sXfXfXSXIXIXIXIXPXPXPXIXPXPXPXPXIXIXPXJXW.dX0X,X%X8.|.YXYX",
+"YX0X4.aXfXVXPXIXPXPXPXPXPXPXPXPXPXPXLXKXKXKXHXBX{ Y.xXyX>X%X6.$XYX",
+"YXt.qXfXVXIXPXPXPXPXPXDXKXPXDXPXPXDXKXKXKXKXhXx.R x *XyX5X:XoX4.cX",
+"tXe.fXcXPXPXPXDXPXDXPXDXDXKXPXDXDXPXDXHXhXZ.&._ P q c <X5X>X-Xw.$X",
+"y.2XdXSXPXPXPXDXDXDXDXPXDXDXDXDXDXkX!.<.&.-.-._ J < < #.5X:X>X.X6.",
+"O.sXdXIXPXKXHXDXDXDXDXDXHXDXLX7XC.&.;.:.n.n.z.( W e < 3 >X>X1X>X6.",
+"o.dXmXPXKXKXDXDXDXPXDXDXHX6XV.,.:.b.D.Q.G.A.x.' U p 5 2 C >X1X<Xu.",
+"q.dXVXPXKXKXDXDXDXDXDXGXU.,.c.` D.Q.^.^.K.D.| | F h , X V >XeX1Xr.",
+"q.sXAXPXKXDXDXDXDXHXHX(.c.c.>.R.^.^.~.~.S.| M.| I e , X n :XeXeX].",
+"q.sXZXPXDXDXSXDXDXDXjXv.c.z.!.)./.~.Q.N.] V.C.~ F 6 * X b ;XeXeX].",
+"q.sXAXPXDXDXDXDXDXDX!.c.' G.^./.^.Q.[ | C.V.' H f w ; X b -XeXeX].",
+"q.sXZXDXDXDXDXDXSXSX!.( _ A.Q.^.G.] E D.C.>.( g g 8 # X `.;XwXeX].",
+"q.sXAXPXDXDXDXSXDXAXT.l P m.K.D.U I V.Z.:.( i g s :   & >XoXeXeX].",
+"8.aXAXJXDXDXSXSXDXSXE.g I x.Z.G z ` C.;.( l f y 4 o   #.,X@XeXeXy.",
+"8.aXZXHXDXSXSXSXCXGXI.H p I Y p G ` ~ H l w > : @ o < w. X@X5X5X{.",
+"8.aXMXDXCX6XW.L.} F A F g u e e u w w w 5 > = o   0 |.:X%XoX5XwX].",
+"8.uXMXZXU.| Q ! ! K K K g w ; O % = , 4 4 = . . 1 uX5X,XoX X1X5Xy.",
+"9.qXdXL.` L D ^ _ b.c.*.K 7 ; * * # * @ o   X M tXrX4X%XXX{.5XeX{.",
+"8.2XI. .] ~ ` :.m.m.J.&.Q Z 5 # O       X j  XtXrX4X&XXX{.{.eX1Xj.",
+"8.l.a.%.} 1.V.S.A.m.&.^ D d 9 - % n M '.wXiXtXrX4X&XoX X`.OXeXeXt.",
+"o.g.a.p.3.N.D.A.m.*.^ D A y 8 @ O @.iXiXtX0X9X4X*XoX X{.`.-XlXlX8.",
+"$.g.i.a.P.P.F.z.` Q Q Z d y 4 - O X.9X9X9X,X,X%XXX}.{.`.`.eXlXzXC ",
+"}.+.8.k.s.B.x./ Q L D Z y 8 : @ O h.,X*X&X&XXX X}.`.`.w.oXxXxX1X9.",
+"dXO.h.g.s.3.) L D S Z y t > - X + ].XXXX|.}.{.`.`._._.OXlXnXnXw.2X",
+"YX|.5.g.i.%.W G A a a u 9 ; $ + j {.{.{.{.`.`._.w.w. XlXFXNX<Xq.YX",
+"YXcXt.5.g.i.+.T Y a a r 1 1 & 2 y.`.`.`._._._.w.`.<XxXFXFXlX6.qXYX",
+"YXYX0Xe.@.h.].f.$.$.X.N N n n 0.XX X XoXoX;X>XeXxXnXFXFXeX6.&XYXYX",
+"YXYXYXtXj.0.f. X.X.X=X=X=X=X1XlXlXlXlXlXzXzXxXxXnXnXxX X9.*XYXYXYX",
+"YXYXYXYXAX&XO...0.].-X>X>X5XlXlXlXlXlXlXlXlXlX<X:X{.O.+XvXYXYXYXYX",
+"YXYXYXYXYXYXYX3Xj.q.4.o.o.o.o.o.o.o.V 4...4.o.8.t.$XVXYXYXYXYXYXYX"
+};
diff -Nru tupi-0.2+git04/src/plugins/tools/inktool/configurator.cpp tupi-0.2+git05/src/plugins/tools/inktool/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/inktool/configurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/inktool/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,184 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "configurator.h"
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QBoxLayout>
-#include <QTextEdit>
-
-Configurator::Configurator(QWidget *parent) :QWidget(parent)
-{
-    #ifdef K_DEBUG
-           TINIT;
-    #endif
-
-    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-
-    /*
-    QTextEdit *textArea = new QTextEdit; 
-    textArea->setFixedHeight(170);
-    textArea->setHtml("<p>" + tr("This tool is just a <b>proof-of-concept</b> of the basic algorithm for the Tupi's free-tracing vectorial brushes") + "</p>"); 
-    mainLayout->addWidget(textArea);
-    */
-
-    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *label = new QLabel(tr("Parameters"));
-    label->setAlignment(Qt::AlignHCenter);
-    layout->addWidget(label);
-    mainLayout->addLayout(layout);
-
-    /*
-    QBoxLayout *structureLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *structureLabel = new QLabel(tr("Structure"));
-    structureLabel->setAlignment(Qt::AlignHCenter);
-    structureLayout->addWidget(structureLabel);
-
-    structureCombo = new QComboBox();
-    structureCombo->addItem(tr("Basic"));
-    structureCombo->addItem(tr("Axial"));
-    structureCombo->addItem(tr("Organic"));
-    structureCombo->setCurrentIndex(2);
-    structureLayout->addWidget(structureCombo);
-
-    mainLayout->addLayout(structureLayout);
-    */
-
-    QBoxLayout *spaceLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *spaceLabel = new QLabel(tr("Dot Spacing"));
-    spaceLabel->setAlignment(Qt::AlignHCenter);
-    spaceLayout->addWidget(spaceLabel);
-
-    spacingBox = new QSpinBox();
-    spacingBox->setSingleStep(1);
-    spacingBox->setMinimum(1);
-    spacingBox->setMaximum(10);
-    spacingBox->setValue(5);
-    spaceLayout->addWidget(spacingBox);
-
-    connect(spacingBox, SIGNAL(valueChanged(int)), this, SIGNAL(updateSpacing(int)));
-
-    mainLayout->addLayout(spaceLayout);
-
-    QBoxLayout *sizeLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *sizeLabel = new QLabel(tr("Size Tolerance"));
-    sizeLabel->setAlignment(Qt::AlignHCenter);
-    sizeLayout->addWidget(sizeLabel);
-
-    sizeBox = new QSpinBox();
-    sizeBox->setSingleStep(10);
-    sizeBox->setMinimum(0);
-    sizeBox->setMaximum(200);
-    sizeBox->setValue(50);
-    sizeLayout->addWidget(sizeBox);
-
-    connect(sizeBox, SIGNAL(valueChanged(int)), this, SIGNAL(updateSizeTolerance(int)));
-
-    mainLayout->addLayout(sizeLayout);
-
-    /*
-    QBoxLayout *checkLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    checkBox = new QCheckBox(tr("Run simulation"));
-    checkBox->setChecked(true);
-    checkLayout->addWidget(checkBox);
-    connect(checkBox, SIGNAL(stateChanged(int)), this, SLOT(updateInterface(int)));
-    mainLayout->addLayout(checkLayout);
-    */
-
-    QBoxLayout *smoothLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *smoothLabel = new QLabel(tr("Smoothness"));
-    smoothLabel->setAlignment(Qt::AlignHCenter);
-    smoothLayout->addWidget(smoothLabel);
-    smoothBox = new QDoubleSpinBox();
-
-    smoothBox->setValue(4.0);
-    smoothBox->setDecimals(2);
-    smoothBox->setSingleStep(0.1);
-    smoothBox->setMaximum(100);
-    smoothLayout->addWidget(smoothBox);
-
-    mainLayout->addLayout(smoothLayout);
-    // smoothBox->setDisabled(true);
-
-    mainLayout->addStretch(2);
-}
-
-Configurator::~Configurator()
-{
-    #ifdef K_DEBUG
-           TEND;
-    #endif
-}
-
-int Configurator::spacingValue()
-{
-    return spacingBox->value();
-}
-
-qreal Configurator::sizeToleranceValue()
-{
-    return sizeBox->value();
-}
-
-/*
-bool Configurator::runSimulation()
-{
-    return checkBox->isChecked();
-}
-*/
-
-/*
-void Configurator::updateInterface(int state)
-{ 
-    if (state == 2)
-        smoothBox->setDisabled(false);
-    else
-        smoothBox->setDisabled(true);
-}
-*/
-
-double Configurator::smoothness() const
-{
-    return smoothBox->value();
-}
-
-/*
-Configurator::Structure Configurator::structureType()
-{
-    int index = structureCombo->currentIndex();
-    return Structure(index);
-}
-*/
diff -Nru tupi-0.2+git04/src/plugins/tools/inktool/configurator.h tupi-0.2+git05/src/plugins/tools/inktool/configurator.h
--- tupi-0.2+git04/src/plugins/tools/inktool/configurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/inktool/configurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONFIGURATOR_H
-#define CONFIGURATOR_H
-
-#include <QLabel>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QDoubleSpinBox>
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Configurator : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        enum Structure { Basic = 0, Axial, Organic };
-
-        Configurator(QWidget *parent = 0);
-        ~Configurator();
-        int spacingValue();
-        qreal sizeToleranceValue();
-        // bool runSimulation();
-        double smoothness() const;
-        // Configurator::Structure structureType();
-
-    signals:
-        void updateSpacing(int value);
-        void updateSizeTolerance(int value);
-
-    // private slots:
-    //         void updateInterface(int state);
-
-    private:
-        QComboBox *structureCombo;
-        QSpinBox *spacingBox;
-        QSpinBox *sizeBox;
-        // QCheckBox *checkBox;
-        QDoubleSpinBox *smoothBox;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/inktool/inktool.cpp tupi-0.2+git05/src/plugins/tools/inktool/inktool.cpp
--- tupi-0.2+git04/src/plugins/tools/inktool/inktool.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/inktool/inktool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,647 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez                                                     *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "inktool.h"
-
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicalgorithm.h"
-#include "tupgraphicsscene.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupellipseitem.h"
-#include "tuplineitem.h"
-#include "tuptextitem.h"
-
-#include "taction.h"
-#include "talgorithm.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "tconfig.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QGraphicsPathItem>
-#include <QPainterPath>
-#include <QMatrix>
-#include <QGraphicsLineItem>
-#include <QGraphicsView>
-#include <QBrush>
-#include <cmath>
-
-struct InkTool::Private
-{
-    QPointF firstPoint;
-    QPointF oldPos;
-
-    QPointF previewPoint;
-    QPointF oldPosRight;
-    QPointF oldPosLeft;
-    QPointF connector;
-
-    QPainterPath path;
-    QPainterPath inkPath;
-    QList<QPointF> leftPoints;
-
-    Configurator *configurator;
-    QMap<QString, TAction *> actions;
-
-    TupPathItem *item;
-
-    int dotsCounter;
-    qreal penWidth;
-    qreal oldSlope;
-    int spacing;
-    qreal tolerance;
-    qreal widthVar;
-    int arrowSize;
-    int firstArrow;
-    QCursor cursor;
-};
-
-InkTool::InkTool() : k(new Private)
-{
-    k->configurator = 0;
-    k->item = 0;
-    k->cursor = QCursor(kAppProp->themeDir() + "cursors/contour.png", 0, 15);
-
-    setupActions();
-}
-
-InkTool::~InkTool()
-{
-}
-
-void InkTool::init(TupGraphicsScene *scene)
-{
-    k->spacing = k->configurator->spacingValue();
-
-    TCONFIG->beginGroup("PenParameters");
-    int thickness = TCONFIG->value("Thickness", -1).toInt();
-    k->tolerance = k->configurator->sizeToleranceValue()/(qreal)100;
-
-    k->widthVar = k->tolerance*thickness;
-
-    if (k->widthVar < 1)
-        k->widthVar = 1; 
-
-    tError() << "InkTool::init() - thickness: " << thickness;
-    tError() << "InkTool::init() - k->tolerance: " << k->tolerance;
-    tError() << "InkTool::init() - k->widthVar: " << k->widthVar;
-
-    foreach (QGraphicsView * view, scene->views()) {
-             view->setDragMode(QGraphicsView::NoDrag);
-             Q_CHECK_PTR(view->scene());
-             if (QGraphicsScene *scene = qobject_cast<QGraphicsScene *>(view->scene())) {
-                 foreach (QGraphicsItem *item, scene->items()) {
-                          item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                          item->setFlag(QGraphicsItem::ItemIsMovable, false);
-                 }
-             }
-    }
-}
-
-QStringList InkTool::keys() const
-{
-    return QStringList() << tr("Ink");
-}
-
-void InkTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    k->oldSlope = 0;
-    k->penWidth = brushManager->pen().widthF()/2;
-
-    k->dotsCounter = 1;
-    k->firstPoint = input->pos();
-    k->connector = k->firstPoint;
-
-    k->path = QPainterPath();
-    k->path.moveTo(k->firstPoint);
-
-    k->inkPath = QPainterPath();
-    k->inkPath.setFillRule(Qt::WindingFill);
-    k->inkPath.moveTo(k->firstPoint);
-
-    k->leftPoints.clear(); 
-    k->leftPoints << k->firstPoint;
-
-    k->oldPos = input->pos();
-    k->oldPosRight = input->pos();
-    k->oldPosLeft = input->pos();
-    k->previewPoint = input->pos();
-
-    k->item = new TupPathItem();
-    QColor color(55, 155, 55, 200);
-    QPen pen(QBrush(color), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-    k->item->setPen(pen);
-
-    scene->includeObject(k->item);
-
-    k->firstArrow = rand() % 10 + 1;
-    k->arrowSize = -1;
-}
-
-void InkTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(brushManager);
-
-    k->dotsCounter++;
-
-    foreach (QGraphicsView * view, scene->views())
-             view->setDragMode(QGraphicsView::NoDrag);
-
-    QPointF currentPoint = input->pos();
-
-    qreal my = currentPoint.y() - k->previewPoint.y(); 
-    qreal mx = currentPoint.x() - k->previewPoint.x();
-    qreal m;
-
-    if (currentPoint != k->previewPoint) {
-        if (mx != 0)
-            m = my / mx;
-        else
-            m = 100;
-
-        k->path.moveTo(k->previewPoint);
-        k->path.lineTo(currentPoint);
-
-        k->item->setPath(k->path);
-
-        tError() << "InkTool::move() - Flag 1";
-
-        qreal slopeVar = abs(k->oldSlope - m);
-        qreal distance = sqrt(pow(abs(currentPoint.x() - k->oldPos.x()), 2) + pow(abs(currentPoint.y() - k->oldPos.y()), 2));
-
-        if ((k->dotsCounter > k->firstArrow) && ((k->dotsCounter % k->spacing == 0) || ((slopeVar >= 1) && (distance > 10)))) {
-
-            if (k->arrowSize == -1) {
-                tError() << "InkTool::move() - Flag 3";
-                qreal pow1 = pow(currentPoint.x() - k->firstPoint.x(), 2);
-                qreal pow2 = pow(currentPoint.y() - k->firstPoint.y(), 2); 
-                k->arrowSize = sqrt(pow1 + pow2);
-                if (k->arrowSize > 0)
-                    k->arrowSize = (rand() % k->arrowSize) + 1; 
-                else
-                    k->arrowSize = 5;
-            }
-
-            k->oldSlope = m;
-
-            qreal pm;  
-            qreal x0;
-            qreal y0;
-            qreal x1;
-            qreal y1;
-            bool isNAN = false;
-
-            if (m == 0) {
-                isNAN = true;
-                pm = 100; 
-            } else {
-                pm = (-1) * (1/m);
-            } 
-
-            #ifdef K_DEBUG
-                   if (m == 100)
-                       tError() << "InkTool::move() - M: NAN";
-                   else
-                       tError() << "InkTool::move() - M: " << m;
-
-                   if (isNAN)
-                       tError() << "InkTool::move() - M(inv): NAN";
-                   else
-                       tError() << "InkTool::move() - M(inv): " << pm;
-            #endif
-
-            qreal hypotenuse;
-
-            if (fabs(pm) < 5) { // Line's slope is close to 0
-
-                int cutter = k->penWidth;
-                bool found = false;
-                qreal limit = 0;
-                int iterations = 0;
-
-                if (k->tolerance < 1) {
-                    while (!found) {
-                       iterations++;
-                       x0 = currentPoint.x() - cutter;
-                       y0 = (pm*(x0 - currentPoint.x())) + currentPoint.y();
-
-                       x1 = currentPoint.x() + cutter;
-                       y1 = (pm*(x1 - currentPoint.x())) + currentPoint.y();
-                       hypotenuse = sqrt(pow(x1 - x0, 2) + pow(y1 - y0, 2));
-
-                       limit = hypotenuse - brushManager->pen().widthF();
-
-                       if (fabs(limit) > k->widthVar) {
-                           if (limit > 0) {
-                                   cutter -= 0.2;
-                                   if (cutter == 0)
-                                       found = true;
-                           } else {
-                                   cutter += 0.2;
-                           }
-                       } else {
-                           found = true;
-                       }
-
-                       if (iterations >10)
-                           found = true;
-                    }
-                } else {
-                       int random = rand() % 101;
-
-                       qreal plus = (qreal)random/(qreal)100 * (k->penWidth*k->tolerance);
-
-                       x0 = currentPoint.x() - plus;
-                       y0 = (pm*(x0 - currentPoint.x())) + currentPoint.y();
-
-                       x1 = currentPoint.x() + plus;
-                       y1 = (pm*(x1 - currentPoint.x())) + currentPoint.y();
-                       hypotenuse = sqrt(pow(x1 - x0, 2) + pow(y1 - y0, 2));
-                }
-
-            } else { // Line's slope is 0 or very very close to
-
-                    qreal delta;
-                    qreal plus;
-                    int random = rand() % 101;
-
-                    if (k->tolerance == 0) {
-                        plus = 0; 
-                    } else if (k->tolerance < 1) {
-                               if (k->widthVar > 0)
-                                   plus = rand() % (int) k->widthVar;
-                               else
-                                   plus = rand() % 5;
-                    } else {
-                        plus = (qreal)random/(qreal)100 * (k->penWidth*k->tolerance);
-                    }
-
-                    delta = k->penWidth + plus;
-
-                    x0 = currentPoint.x();
-                    y0 = currentPoint.y() - delta;
-
-                    x1 = currentPoint.x();
-                    y1 = currentPoint.y() + delta;
-
-                    hypotenuse = fabs(y1 - y0);
-            }
-
-            QPointF right;
-            QPointF left;
-
-            if (k->previewPoint.x() < currentPoint.x()) {
-                if (k->previewPoint.y() < currentPoint.y()) {
-                    #ifdef K_DEBUG
-                           tDebug() << "    -> InkTool::move() - Going down-right";
-                           tDebug() << "";
-                    #endif
-                    if (y0 > y1) {
-                        left = QPointF(x0, y0);
-                        right = QPointF(x1, y1);
-                    } else {
-                        left = QPointF(x1, y1);
-                        right = QPointF(x0, y0);
-                    }
-
-                    qreal endX = currentPoint.x() + k->arrowSize;
-                    qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                    k->connector = QPoint(endX, endY);
-
-                } else if (k->previewPoint.y() > currentPoint.y()) {
-                           #ifdef K_DEBUG
-                                  tDebug() << "    -> InkTool::move() - Going up-right";
-                                  tDebug() << "";
-                           #endif
-                           if (x0 > x1) {
-                               left = QPointF(x0, y0);
-                               right = QPointF(x1, y1);
-                           } else {
-                               left = QPointF(x1, y1);
-                               right = QPointF(x0, y0);
-                           }
-
-                           qreal endX = currentPoint.x() + k->arrowSize;
-                           qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                           k->connector = QPoint(endX, endY);
-                } else {
-                     #ifdef K_DEBUG
-                            tDebug() << "    -> InkTool::move() - Going right";
-                            tDebug() << "";
-                     #endif
-                     if (y0 > y1) {
-                         left = QPointF(x0, y0);
-                         right = QPointF(x1, y1);
-                     } else {
-                         left = QPointF(x1, y1);
-                         right = QPointF(x0, y0);
-                     }
-
-                     qreal endX = currentPoint.x() + k->arrowSize;
-                     qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                     k->connector = QPoint(endX, endY);
-                }
-            } else if (k->previewPoint.x() > currentPoint.x()) {
-                if (k->previewPoint.y() < currentPoint.y()) {
-                     #ifdef K_DEBUG
-                            tDebug() << "    -> InkTool::move() - Going down-left";
-                            tDebug() << "";
-                     #endif
-
-                    if (y0 > y1) {
-                        right = QPointF(x0, y0);
-                        left = QPointF(x1, y1);
-                    } else {
-                        right = QPointF(x1, y1);
-                        left = QPointF(x0, y0);
-                    }
-
-                    qreal endX = currentPoint.x() - k->arrowSize;
-                    qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                    k->connector = QPoint(endX, endY);
-
-                } else if (k->previewPoint.y() > currentPoint.y()) {
-                           #ifdef K_DEBUG
-                                  tDebug() << "    -> InkTool::move() - Going up-left";
-                                  tDebug() << "";
-                           #endif
-
-                           if (x0 > x1) {
-                               left = QPointF(x0, y0);
-                               right = QPointF(x1, y1);
-                           } else {
-                               if (x0 < x1) {
-                                   left = QPointF(x1, y1);
-                                   right = QPointF(x0, y0);
-                               } else { // x0 == x1
-                                   if (y0 > y1) {
-                                       left = QPointF(x1, y1);
-                                       right = QPointF(x0, y0);
-                                   } else {
-                                       left = QPointF(x0, y0);
-                                       right = QPointF(x1, y1);
-                                   }
-                               }
-                           }
-
-                           qreal endX = currentPoint.x() - k->arrowSize;
-                           qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                           k->connector = QPoint(endX, endY);
-
-                } else {
-                     #ifdef K_DEBUG
-                            tDebug() << "    -> InkTool::move() - Going left";
-                            tDebug() << "";
-                     #endif
-                     if (y0 > y1) {
-                         right = QPointF(x0, y0);
-                         left = QPointF(x1, y1);
-                     } else {
-                         right = QPointF(x1, y1);
-                         left = QPointF(x0, y0);
-                     }
-
-                     qreal endX = currentPoint.x() - k->arrowSize;
-                     qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                     k->connector = QPoint(endX, endY);
-                }
-            } else if (k->previewPoint.x() == currentPoint.x()) {
-                       if (k->previewPoint.y() > currentPoint.y()) {
-                           #ifdef K_DEBUG
-                                  tDebug() << "    -> InkTool::move() - Going up";
-                                  tDebug() << "";
-                           #endif
-                           if (x0 > x1) {
-                               left = QPointF(x0, y0);
-                               right = QPointF(x1, y1);
-                           } else {
-                               left = QPointF(x1, y1);
-                               right = QPointF(x0, y0);
-                           }
-
-                           qreal endX = currentPoint.x();
-                           qreal endY = currentPoint.y() - k->arrowSize;
-                           k->connector = QPoint(endX, endY);
-                       } else {
-                           #ifdef K_DEBUG
-                                  tDebug() << "    -> InkTool::move() - Going down";
-                                  tDebug() << "";
-                           #endif
-                           if (x0 > x1) {
-                               right = QPointF(x0, y0);
-                               left = QPointF(x1, y1);
-                           } else {
-                               right = QPointF(x1, y1);
-                               left = QPointF(x0, y0);
-                           }
-
-                           qreal endX = currentPoint.x();
-                           qreal endY = currentPoint.y() + k->arrowSize;
-                           k->connector = QPoint(endX, endY);
-                       }
-            }
-
-            k->inkPath.moveTo(k->oldPosRight);
-            k->inkPath.lineTo(right);
-            k->oldPosRight = right;
-
-            k->oldPosLeft = left;
-            k->leftPoints << left;
-
-            k->oldPos = currentPoint;
-        }
-    }
-
-    k->previewPoint = currentPoint;
-}
-
-void InkTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(scene);
-
-    QPointF currentPoint = input->pos();
-    qreal radius = brushManager->pen().width();
-
-    if (k->firstPoint == currentPoint && k->inkPath.elementCount() == 1)
-        k->inkPath.addEllipse(input->pos().x() - (radius/2), input->pos().y()-(radius/2), radius, radius);
-
-    k->path.moveTo(k->oldPos);
-    k->path.lineTo(k->connector);
-    k->inkPath.moveTo(k->oldPosRight);
-    k->inkPath.lineTo(k->connector);
-
-    k->leftPoints << k->connector; 
-
-    scene->removeItem(k->item);
-
-    QPen inkPen(brushManager->penColor(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-
-    if (k->firstPoint != currentPoint) {
-
-        for (int i = k->leftPoints.size()-1; i > 0; i--) {
-             k->inkPath.moveTo(k->leftPoints.at(i));
-             k->inkPath.lineTo(k->leftPoints.at(i-1));
-        }
-
-        k->inkPath.moveTo(k->leftPoints.at(0));
-        k->inkPath.lineTo(QPointF(0, 0));
-
-        smoothPath(k->inkPath, k->configurator->smoothness());
-
-        TupPathItem *line = new TupPathItem();
-        line->setPen(inkPen);
-        line->setBrush(brushManager->penBrush());
-        line->setPath(k->inkPath);
-        scene->includeObject(line);
-
-        QDomDocument doc;
-        doc.appendChild(line->toXml(doc));
-        TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
-                                                                         0, QPointF(), scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
-                                                                         doc.toString());
-        emit requested(&request);
-
-    } else {
-        QPointF distance((radius + 2)/2, (radius + 2)/2);
-        TupEllipseItem *blackEllipse = new TupEllipseItem(QRectF(k->connector - distance, QSize(radius + 2, radius + 2)));
-        blackEllipse->setPen(inkPen);
-        blackEllipse->setBrush(brushManager->penBrush());
-        scene->includeObject(blackEllipse);
-
-        QDomDocument doc;
-        doc.appendChild(blackEllipse->toXml(doc));
-        TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
-                                                                         0, currentPoint, scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
-                                                                         doc.toString());
-        emit requested(&request);
-    }
-}
-
-void InkTool::setupActions()
-{
-    TAction *inkPen = new TAction(QPixmap(kAppProp->themeDir() + "icons/ink.png"), tr("Ink"), this);
-    inkPen->setShortcut(QKeySequence(tr("K")));
-    inkPen->setCursor(k->cursor);
-
-    k->actions.insert(tr("Ink"), inkPen);
-}
-
-QMap<QString, TAction *> InkTool::actions() const
-{
-    return k->actions;
-}
-
-int InkTool::toolType() const
-{
-    return TupToolInterface::Brush;
-}
-
-QWidget *InkTool::configurator() 
-{
-    if (! k->configurator) {
-        k->configurator = new Configurator;
-        connect(k->configurator, SIGNAL(updateSpacing(int)), this, SLOT(updateSpacingVar(int)));
-        connect(k->configurator, SIGNAL(updateSizeTolerance(int)), this, SLOT(updateSizeToleranceVar(int)));
-    }
-
-    return k->configurator;
-}
-
-void InkTool::aboutToChangeTool() 
-{
-}
-
-void InkTool::saveConfig()
-{
-}
-
-void InkTool::updateSpacingVar(int value)
-{
-    k->spacing = value;
-}
-
-void InkTool::updateSizeToleranceVar(int value)
-{
-    k->tolerance = (qreal)value/(qreal)100;
-}
-
-void InkTool::smoothPath(QPainterPath &path, double smoothness, int from, int to)
-{
-    QPolygonF pol;
-    QList<QPolygonF> polygons = path.toSubpathPolygons();
-
-    QList<QPolygonF>::iterator it = polygons.begin();
-
-    QPolygonF::iterator pointIt;
-
-    while (it != polygons.end()) {
-           pointIt = (*it).begin();
-
-           while (pointIt <= (*it).end()-2) {
-                  pol << (*pointIt);
-                  pointIt += 2;
-           }
-           ++it;
-    }
-
-    if (smoothness > 0) {
-        path = TupGraphicalAlgorithm::bezierFit(pol, smoothness, from, to);
-    } else {
-        path = QPainterPath();
-        path.addPolygon(pol);
-    }
-}
-
-void InkTool::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
-        emit closeHugeCanvas();
-    } else {
-        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-        if (flags.first != -1 && flags.second != -1)
-            emit callForPlugin(flags.first, flags.second);
-    }
-}
-
-QCursor InkTool::cursor() const
-{
-    return k->cursor;
-}
-
-Q_EXPORT_PLUGIN2(tup_brush, InkTool);
diff -Nru tupi-0.2+git04/src/plugins/tools/inktool/inktool.h tupi-0.2+git05/src/plugins/tools/inktool/inktool.h
--- tupi-0.2+git04/src/plugins/tools/inktool/inktool.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/inktool/inktool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez                                                     *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SCHEMETOOL_H
-#define SCHEMETOOL_H
-
-#include "tuptoolplugin.h"
-#include "configurator.h"
-#include "tuppathitem.h"
-
-#include <QObject>
-#include <QSpinBox>
-#include <QTimer>
-
-class QKeySequence;
-
-/**
- * @author David Cuadrado
-*/
-
-class InkTool : public TupToolPlugin
-{
-    Q_OBJECT
-    
-    public:
-        InkTool();
-        virtual ~InkTool();
-        
-        virtual void init(TupGraphicsScene *scene);
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-        virtual QWidget *configurator();
-        virtual void aboutToChangeTool();
-        virtual void saveConfig();
-        virtual void keyPressEvent(QKeyEvent *event);
-        virtual QCursor cursor() const;
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
-        
-    private:
-        void setupActions();
-        void smoothPath(QPainterPath &path, double smoothness, int from = 0, int to = -1);
-
-    private slots:
-        void updateSpacingVar(int value);
-        void updateSizeToleranceVar(int value);
-
-    private:
-        struct Private;
-        Private *const k;
-
-    /*        
-    private:
-        QPointF m_firstPoint;
-        QPointF m_oldPos;
-        QPointF previewPoint;
-        QPointF oldPosRight;
-        QPointF oldPosLeft;
-        QPointF connector;
-        QPainterPath m_path;
-        QPainterPath pathRight; 
-        QPainterPath pathLeft;
-        Configurator *m_configurator;
-        QMap<QString, TAction *> m_actions;
-        TupPathItem *m_item;
-        TupPathItem *itemRight;
-        TupPathItem *itemLeft;
-        int dotsCounter;
-        qreal penWidth;
-        qreal oldSlope;
-        int spacing;
-        qreal tolerance;
-        qreal widthVar; 
-        int arrowSize;
-        int firstArrow;
-    */
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/inktool/inktool.json tupi-0.2+git05/src/plugins/tools/inktool/inktool.json
--- tupi-0.2+git04/src/plugins/tools/inktool/inktool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/inktool/inktool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "InkTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/inktool/inktool.pro tupi-0.2+git05/src/plugins/tools/inktool/inktool.pro
--- tupi-0.2+git04/src/plugins/tools/inktool/inktool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/inktool/inktool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# Subdir relative project main directory: ./src/plugins/tools/inktool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += inktool.h \
-           configurator.h
-SOURCES += inktool.cpp \
-           configurator.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib 
-TARGET = tupiinktool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/inktool/ink.xpm tupi-0.2+git05/src/plugins/tools/inktool/ink.xpm
--- tupi-0.2+git04/src/plugins/tools/inktool/ink.xpm	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/inktool/ink.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,296 +0,0 @@
-/* XPM */
-const char *brush_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"33 33 257 2",
-"   c #040302",
-".  c #090301",
-"X  c #090909",
-"o  c #120400",
-"O  c #130801",
-"+  c #120D08",
-"@  c #1B0600",
-"#  c #1B0900",
-"$  c #1E0E08",
-"%  c #1E1005",
-"&  c #1C1A16",
-"*  c #250B00",
-"=  c #2B0C00",
-"-  c #200700",
-";  c #2B1105",
-":  c #340D00",
-">  c #3D0D00",
-",  c #3A1200",
-"<  c #361808",
-"1  c #301F16",
-"2  c #26221C",
-"3  c #33312E",
-"4  c #490F00",
-"5  c #441401",
-"6  c #4C1A00",
-"7  c #531D00",
-"8  c #5E1B00",
-"9  c #551602",
-"0  c #4A2409",
-"q  c #402516",
-"w  c #522400",
-"e  c #562A07",
-"r  c #502917",
-"t  c #6A1A00",
-"y  c #731D00",
-"u  c #652806",
-"i  c #6D3A00",
-"p  c #693C08",
-"a  c #693519",
-"s  c #742300",
-"d  c #7B2A00",
-"f  c #723500",
-"g  c #753A00",
-"h  c #763808",
-"j  c #46423A",
-"k  c #7B4501",
-"l  c #7D4A03",
-"z  c #724414",
-"x  c #74511A",
-"c  c #654F31",
-"v  c #7B4825",
-"b  c #474640",
-"n  c #56524B",
-"m  c #62554A",
-"M  c #665E52",
-"N  c #715C50",
-"B  c #626056",
-"V  c #6E6B63",
-"C  c #7A786E",
-"Z  c #842D00",
-"A  c #833303",
-"S  c #873A03",
-"D  c #953803",
-"F  c #8C4B09",
-"G  c #864819",
-"H  c #8B5006",
-"J  c #8A5213",
-"K  c #964605",
-"L  c #954C11",
-"P  c #995B0A",
-"I  c #94540A",
-"U  c #945816",
-"Y  c #964E20",
-"T  c #835535",
-"R  c #8E6012",
-"E  c #9E6116",
-"W  c #996127",
-"Q  c #A64A03",
-"!  c #A85208",
-"~  c #AB5A11",
-"^  c #B15306",
-"/  c #AC620B",
-"(  c #A7670A",
-")  c #A7631B",
-"_  c #B86608",
-"`  c #B76717",
-"'  c #B8781A",
-"]  c #A76C25",
-"[  c #AF762D",
-"{  c #A37531",
-"}  c #B46C27",
-"|  c #B67424",
-" . c #B7783C",
-".. c #826F46",
-"X. c #886A55",
-"o. c #817A54",
-"O. c #857E59",
-"+. c #94754C",
-"@. c #927856",
-"#. c #807D73",
-"$. c #927565",
-"%. c #A77740",
-"&. c #CB6D03",
-"*. c #C56E01",
-"=. c #C36D1D",
-"-. c #CB7400",
-";. c #CB7807",
-":. c #CC7B13",
-">. c #C57819",
-",. c #D67A00",
-"<. c #D17F1C",
-"1. c #C27320",
-"2. c #C17F37",
-"3. c #B48234",
-"4. c #88825D",
-"5. c #988657",
-"6. c #8B8461",
-"7. c #828074",
-"8. c #938D6A",
-"9. c #928864",
-"0. c #968B74",
-"q. c #96906D",
-"w. c #97927C",
-"e. c #9A9473",
-"r. c #99957C",
-"t. c #9E9877",
-"y. c #9E987B",
-"u. c #969175",
-"i. c #A68658",
-"p. c #B98048",
-"a. c #B98A55",
-"s. c #B99554",
-"d. c #A48D65",
-"f. c #A68F7A",
-"g. c #A9956A",
-"h. c #A49375",
-"j. c #A39A7D",
-"k. c #B49462",
-"l. c #B89E73",
-"z. c #CC8307",
-"x. c #C78319",
-"c. c #D38502",
-"v. c #DB8B08",
-"b. c #D58818",
-"n. c #DE940A",
-"m. c #D99119",
-"M. c #C98227",
-"N. c #CA8C3B",
-"B. c #C2933A",
-"V. c #D28429",
-"C. c #D58934",
-"Z. c #DA8E3D",
-"A. c #DC9C25",
-"S. c #DA932A",
-"D. c #D99635",
-"F. c #CC972B",
-"G. c #DCA033",
-"H. c #E29C17",
-"J. c #E59309",
-"K. c #E7A937",
-"L. c #CB8746",
-"P. c #C4954B",
-"I. c #CA935C",
-"U. c #DA9C5B",
-"Y. c #C69B68",
-"T. c #CEA559",
-"R. c #DBA149",
-"E. c #CCAD76",
-"W. c #DCAC73",
-"Q. c #E6AC48",
-"!. c #E1AA52",
-"~. c #EBB54A",
-"^. c #EAB756",
-"/. c #EDB961",
-"(. c #E2B57D",
-"). c #ECC16C",
-"_. c #999580",
-"`. c #9D9984",
-"'. c #939082",
-"]. c #A09C85",
-"[. c #A19D89",
-"{. c #A4A18B",
-"}. c #A9A58D",
-"|. c #AEA98C",
-" X c #AAA593",
-".X c #ACA59C",
-"XX c #ADA994",
-"oX c #ADAA99",
-"OX c #A6A392",
-"+X c #B0AA8D",
-"@X c #B0AC9C",
-"#X c #B1AA96",
-"$X c #B6B195",
-"%X c #B4B19C",
-"&X c #B8B39A",
-"*X c #BDB89E",
-"=X c #A9A7A0",
-"-X c #B1AEA1",
-";X c #B5B3A2",
-":X c #B9B4A2",
-">X c #B8B5AA",
-",X c #BCB9A5",
-"<X c #BDBAAB",
-"1X c #BEBCB1",
-"2X c #C3BB9D",
-"3X c #C1BDA4",
-"4X c #C0BDAB",
-"5X c #C0BEB3",
-"6X c #E3B587",
-"7X c #E9BD92",
-"8X c #D3C09D",
-"9X c #C5C1AC",
-"0X c #C9C5AC",
-"qX c #C8C3A6",
-"wX c #C3C1B5",
-"eX c #C5C2B8",
-"rX c #C9C5B2",
-"tX c #CDC9B4",
-"yX c #CDCBBC",
-"uX c #D1CDB2",
-"iX c #D2CEB9",
-"pX c #DECFBA",
-"aX c #D6D1B5",
-"sX c #D8D3B6",
-"dX c #DAD5BA",
-"fX c #DED9BE",
-"gX c #EBC198",
-"hX c #EDCAA7",
-"jX c #E8D0A9",
-"kX c #F0D2B6",
-"lX c #CCCBC2",
-"zX c #D0CEC5",
-"xX c #D3D2CA",
-"cX c #DEDAC4",
-"vX c #D9D6C4",
-"bX c #DAD9D3",
-"nX c #DBDBD4",
-"mX c #E0DBC2",
-"MX c #E1DDCA",
-"NX c #E0DFD9",
-"BX c #F0DAC3",
-"VX c #E5E1CC",
-"CX c #EAE0CA",
-"ZX c #E7E3D0",
-"AX c #E9E5D3",
-"SX c #EBE8D6",
-"DX c #EEEBDC",
-"FX c #E1E0DB",
-"GX c #F0E1CF",
-"HX c #F3EADC",
-"JX c #EFEDE1",
-"KX c #F0EEE1",
-"LX c #F9EDE4",
-"PX c #F2F0E4",
-"IX c #F4F2E8",
-"UX c gray100",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXuXj.4.o.8.q.8.8.q.q.8.8.8.8.8.8.8.8.V g.,XYXYXYXYXYXYX",
-"YXYXYXYX0Xy.e.2XfXfXfXfXfXfXfXfXfXfXfXfXfXfXdXaXuX$Xt.8.*XYXYXYXYX",
-"YXYXYX$X4.qXcXfXfXMXVXAXAXSXAXSXSXSXSXAXAXZXVXcX8X0XqX&X8.+XYXYXYX",
-"YXYX&X8.sXfXfXSXIXIXIXIXPXPXPXIXPXPXPXPXIXIXPXJXW.dX0X,X%X8.|.YXYX",
-"YX0X4.aXfXVXPXIXPXPXPXPXPXPXPXPXPXPXLXKXKXKXHXBX{ Y.xXyX>X%X6.$XYX",
-"YXt.qXfXVXIXPXPXPXPXPXDXKXPXDXPXPXDXKXKXKXKXhXx.R x *XyX5X:XoX4.cX",
-"tXe.fXcXPXPXPXDXPXDXPXDXDXKXPXDXDXPXDXHXhXZ.&._ P q c <X5X>X-Xw.$X",
-"y.2XdXSXPXPXPXDXDXDXDXPXDXDXDXDXDXkX!.<.&.-.-._ J < < #.5X:X>X.X6.",
-"O.sXdXIXPXKXHXDXDXDXDXDXHXDXLX7XC.&.;.:.n.n.z.( W e < 3 >X>X1X>X6.",
-"o.dXmXPXKXKXDXDXDXPXDXDXHX6XV.,.:.b.D.Q.G.A.x.' U p 5 2 C >X1X<Xu.",
-"q.dXVXPXKXKXDXDXDXDXDXGXU.,.c.` D.Q.^.^.K.D.| | F h , X V >XeX1Xr.",
-"q.sXAXPXKXDXDXDXDXHXHX(.c.c.>.R.^.^.~.~.S.| M.| I e , X n :XeXeX].",
-"q.sXZXPXDXDXSXDXDXDXjXv.c.z.!.)./.~.Q.N.] V.C.~ F 6 * X b ;XeXeX].",
-"q.sXAXPXDXDXDXDXDXDX!.c.' G.^./.^.Q.[ | C.V.' H f w ; X b -XeXeX].",
-"q.sXZXDXDXDXDXDXSXSX!.( _ A.Q.^.G.] E D.C.>.( g g 8 # X `.;XwXeX].",
-"q.sXAXPXDXDXDXSXDXAXT.l P m.K.D.U I V.Z.:.( i g s :   & >XoXeXeX].",
-"8.aXAXJXDXDXSXSXDXSXE.g I x.Z.G z ` C.;.( l f y 4 o   #.,X@XeXeXy.",
-"8.aXZXHXDXSXSXSXCXGXI.H p I Y p G ` ~ H l w > : @ o < w. X@X5X5X{.",
-"8.aXMXDXCX6XW.L.} F A F g u e e u w w w 5 > = o   0 |.:X%XoX5XwX].",
-"8.uXMXZXU.| Q ! ! K K K g w ; O % = , 4 4 = . . 1 uX5X,XoX X1X5Xy.",
-"9.qXdXL.` L D ^ _ b.c.*.K 7 ; * * # * @ o   X M tXrX4X%XXX{.5XeX{.",
-"8.2XI. .] ~ ` :.m.m.J.&.Q Z 5 # O       X j  XtXrX4X&XXX{.{.eX1Xj.",
-"8.l.a.%.} 1.V.S.A.m.&.^ D d 9 - % n M '.wXiXtXrX4X&XoX X`.OXeXeXt.",
-"o.g.a.p.3.N.D.A.m.*.^ D A y 8 @ O @.iXiXtX0X9X4X*XoX X{.`.-XlXlX8.",
-"$.g.i.a.P.P.F.z.` Q Q Z d y 4 - O X.9X9X9X,X,X%XXX}.{.`.`.eXlXzXC ",
-"}.+.8.k.s.B.x./ Q L D Z y 8 : @ O h.,X*X&X&XXX X}.`.`.w.oXxXxX1X9.",
-"dXO.h.g.s.3.) L D S Z y t > - X + ].XXXX|.}.{.`.`._._.OXlXnXnXw.2X",
-"YX|.5.g.i.%.W G A a a u 9 ; $ + j {.{.{.{.`.`._.w.w. XlXFXNX<Xq.YX",
-"YXcXt.5.g.i.+.T Y a a r 1 1 & 2 y.`.`.`._._._.w.`.<XxXFXFXlX6.qXYX",
-"YXYX0Xe.@.h.].f.$.$.X.N N n n 0.XX X XoXoX;X>XeXxXnXFXFXeX6.&XYXYX",
-"YXYXYXtXj.0.f. X.X.X=X=X=X=X1XlXlXlXlXlXzXzXxXxXnXnXxX X9.*XYXYXYX",
-"YXYXYXYXAX&XO...0.].-X>X>X5XlXlXlXlXlXlXlXlXlX<X:X{.O.+XvXYXYXYXYX",
-"YXYXYXYXYXYXYX3Xj.q.4.o.o.o.o.o.o.o.V 4...4.o.8.t.$XVXYXYXYXYXYXYX"
-};
diff -Nru tupi-0.2+git04/src/plugins/tools/nodes/nodes.pro tupi-0.2+git05/src/plugins/tools/nodes/nodes.pro
--- tupi-0.2+git04/src/plugins/tools/nodes/nodes.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/nodes/nodes.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,34 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += nodestool.h
+SOURCES += nodestool.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupinodestool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/nodes/nodestool.cpp tupi-0.2+git05/src/plugins/tools/nodes/nodestool.cpp
--- tupi-0.2+git04/src/plugins/tools/nodes/nodestool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/nodes/nodestool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,419 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "nodestool.h"
+
+struct NodesTool::Private
+{
+    QMap<QString, TAction *> actions;
+    TNodeGroup *nodeGroup;
+    TupGraphicsScene *scene;
+    int baseZValue;
+    qreal realFactor;
+    bool activeSelection;
+};
+
+NodesTool::NodesTool(): k(new Private)
+{
+    setupActions();
+}
+
+NodesTool::~NodesTool()
+{
+    delete k;
+}
+
+void NodesTool::init(TupGraphicsScene *scene)
+{
+    k->activeSelection = false;
+
+    k->scene = scene;
+    if (k->scene->selectedItems().count() > 0)
+        k->scene->clearSelection();
+
+    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
+
+    int zBottomLimit = (scene->currentLayerIndex() + 2)*10000;
+    int zTopLimit = zBottomLimit + 10000;
+
+    if (k->activeSelection)
+        k->nodeGroup->clear();
+
+    foreach (QGraphicsView * view, scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      if (!qgraphicsitem_cast<TControlNode *>(item)) {
+                          if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                              int zValue = item->zValue();
+                              // if (zValue >= 20000 && qgraphicsitem_cast<TupPathItem *>(item) && (item->toolTip().length()==0)) {
+                              if ((zValue >= zBottomLimit) && (zValue < zTopLimit) && (item->toolTip().length()==0)) {
+                                  item->setFlags(QGraphicsItem::ItemIsSelectable);
+                              } else {
+                                  item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                              }
+                          } else {
+                              item->setFlags(QGraphicsItem::ItemIsSelectable);
+                          }
+                      }
+
+             }
+    }
+}
+
+QStringList NodesTool::keys() const
+{
+    return QStringList() << tr("Nodes Selection") ;
+}
+
+void NodesTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+void NodesTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+void NodesTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (scene->selectedItems().count() > 0) {
+        QList<QGraphicsItem *> currentSelection = scene->selectedItems();
+        QGraphicsItem *item = currentSelection.at(0);
+
+        if (k->activeSelection) { 
+            int index1 = scene->currentFrame()->indexOf(k->nodeGroup->parentItem());
+            int index2 = scene->currentFrame()->indexOf(item);
+            if (index1 == index2 || index2 < 0)
+                return;
+            else
+                k->nodeGroup->clear();
+        }
+
+        k->nodeGroup = new TNodeGroup(item, scene, TNodeGroup::LineSelection, k->baseZValue);
+        k->nodeGroup->show();
+        k->activeSelection = true;
+        k->nodeGroup->resizeNodes(k->realFactor);
+
+        if (!k->nodeGroup->changedNodes().isEmpty()) {
+            int position = scene->currentFrame()->indexOf(k->nodeGroup->parentItem());
+            if (position >= 0 && qgraphicsitem_cast<QGraphicsPathItem *>(k->nodeGroup->parentItem())) {
+                QDomDocument doc;
+                doc.appendChild(qgraphicsitem_cast<TupPathItem *>(k->nodeGroup->parentItem())->toXml(doc));
+                    
+                TupProjectRequest event = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), 
+                                            scene->currentLayerIndex(), scene->currentFrameIndex(), position, 
+                                            QPointF(), scene->spaceMode(), TupLibraryObject::Item, 
+                                            TupProjectRequest::EditNodes, doc.toString());
+                emit requested(&event);
+            } else {
+                #ifdef K_DEBUG
+                    QString msg = "NodesTool::release() - Fatal Error: Invalid position [ " + QString::number(position) + " ]";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
+                #endif
+                return;
+            }
+            k->nodeGroup->clearChangesNodes();
+        }
+    } else {
+        if (k->activeSelection) {
+            k->nodeGroup->clear();
+            k->nodeGroup = 0;
+            k->activeSelection = false;
+        }
+    } 
+}
+
+void NodesTool::itemResponse(const TupItemResponse *response)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[NodesTool::itemResponse()]";
+        #else
+            T_FUNCINFOX("NodesTool");
+        #endif
+    #endif
+
+    TupProject *project = k->scene->scene()->project();
+    QGraphicsItem *item = 0;
+    TupScene *scene = 0;
+    TupLayer *layer = 0;
+    TupFrame *frame = 0;
+
+    if (project) {
+        scene = project->scene(response->sceneIndex());
+        if (scene) {
+            if (project->spaceContext() == TupProject::FRAMES_EDITION) {
+                layer = scene->layer(response->layerIndex());
+                if (layer) {
+                    frame = layer->frame(response->frameIndex());
+                    if (frame) {
+                        item = frame->item(response->itemIndex());
+                    } else {
+                        #ifdef K_DEBUG
+                            QString msg = "NodesTool::itemResponse() - Fatal Error: Frame variable is NULL!";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
+                        #endif
+                    }
+                } else {
+                    #ifdef K_DEBUG
+                        QString msg = "NodesTool::itemResponse() - Fatal Error: Layer variable is NULL!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif
+                }
+            } else {
+                TupBackground *bg = scene->background();
+                if (bg) {
+                    if (project->spaceContext() == TupProject::STATIC_BACKGROUND_EDITION) {
+                        TupFrame *frame = bg->staticFrame();
+                        if (frame) {
+                            item = frame->item(response->itemIndex());
+                        } else {
+                            #ifdef K_DEBUG
+                                QString msg = "NodesTool::itemResponse() - Fatal Error: Static frame variable is NULL!";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
+                            #endif
+                        }
+                    } else if (project->spaceContext() == TupProject::DYNAMIC_BACKGROUND_EDITION) { 
+                               TupFrame *frame = bg->dynamicFrame();
+                               if (frame) {
+                                   item = frame->item(response->itemIndex());
+                               } else {
+                                   #ifdef K_DEBUG
+                                       QString msg = "NodesTool::itemResponse() - Fatal Error: Dynamic frame variable is NULL!";
+                                       #ifdef Q_OS_WIN32
+                                           qDebug() << msg;
+                                       #else
+                                           tError() << msg;
+                                       #endif
+                                   #endif
+                               }
+                    } else {
+                        #ifdef K_DEBUG
+                            QString msg = "NodesTool::itemResponse() - Fatal Error: Invalid spaceMode!";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
+                        #endif
+                    }
+                } else {
+                    #ifdef K_DEBUG
+                        QString msg = "NodesTool::itemResponse() - Fatal Error: Scene background is NULL!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif
+                }
+            }
+        } else {
+            #ifdef K_DEBUG
+                QString msg = "NodesTool::itemResponse() - Fatal Error: Scene variable is NULL";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+        }
+    } else {
+        #ifdef K_DEBUG
+            QString msg = "NodesTool::itemResponse() - Fatal Error: Project variable is NULL";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+    }
+    
+    switch (response->action()) {
+            case TupProjectRequest::Convert:
+            {
+                 if (item) {
+                     k->nodeGroup = new TNodeGroup(item, k->scene, TNodeGroup::LineSelection, k->baseZValue);
+                 } else {
+                     #ifdef K_DEBUG
+                         QString msg = "NodesTool::itemResponse() - Fatal Error: No item was found";
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError() << msg;
+                         #endif
+                     #endif
+                 }
+            }
+            break;
+            case TupProjectRequest::EditNodes:
+            {
+                 if (item) {
+                     if (qgraphicsitem_cast<QGraphicsPathItem *>(k->nodeGroup->parentItem()) == item) {
+                         k->nodeGroup->show();
+                         k->nodeGroup->syncNodesFromParent();
+                         k->nodeGroup->saveParentProperties();
+                         break;
+                     }
+                 } else {
+                     #ifdef K_DEBUG
+                         QString msg = "NodesTool::itemResponse() - Fatal Error: No item was found";
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError() << msg;
+                         #endif
+                     #endif
+                 }
+            }
+            break;
+            case TupProjectRequest::Remove:
+            {
+                 return;
+            }
+            break;
+            default:
+            {
+                 if (k->activeSelection) {
+                     k->nodeGroup->show();
+                     if (k->nodeGroup->parentItem()) {
+                         k->nodeGroup->parentItem()->setSelected(true);
+                         k->nodeGroup->syncNodesFromParent();
+                     }
+                 }
+            }
+            break;
+    }
+}
+
+void NodesTool::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
+        emit closeHugeCanvas();
+    } else {
+        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+        if (flags.first != -1 && flags.second != -1)
+            emit callForPlugin(flags.first, flags.second);
+    }
+}
+
+void NodesTool::setupActions()
+{
+    k->activeSelection = false;
+    TAction *nodes = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "nodes.png"), tr("Nodes Selection"), this);
+    nodes->setShortcut(QKeySequence(tr("N")));
+    nodes->setToolTip(tr("Nodes Selection") + " - " + "N");
+
+    k->actions.insert(tr("Nodes Selection"), nodes);
+}
+
+QMap<QString, TAction *> NodesTool::actions() const
+{
+    return k->actions;
+}
+
+int NodesTool::toolType() const
+{
+    return TupToolInterface::Selection;
+}
+
+QWidget *NodesTool::configurator() 
+{
+    return 0;
+}
+
+void NodesTool::aboutToChangeScene(TupGraphicsScene *scene)
+{
+    init(scene);
+}
+
+void NodesTool::aboutToChangeTool()
+{
+    if (k->activeSelection) {
+        if (k->nodeGroup)
+            k->nodeGroup->clear();
+    }
+
+    foreach (QGraphicsView *view, k->scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+void NodesTool::saveConfig()
+{
+}
+
+QCursor NodesTool::cursor() const
+{
+    return QCursor(Qt::ArrowCursor);
+}
+
+void NodesTool::resizeNodes(qreal scaleFactor)
+{
+    k->realFactor = scaleFactor;
+    if (k->activeSelection)
+        k->nodeGroup->resizeNodes(scaleFactor);
+}
+
+void NodesTool::updateZoomFactor(qreal scaleFactor)
+{
+    k->realFactor = scaleFactor;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/nodes/nodestool.h tupi-0.2+git05/src/plugins/tools/nodes/nodestool.h
--- tupi-0.2+git04/src/plugins/tools/nodes/nodestool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/nodes/nodestool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,121 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef NODESTOOL_H
+#define NODESTOOL_H
+
+#include "tglobal.h"
+#include "tuppathitem.h"
+#include "tcontrolnode.h"
+#include "tnodegroup.h"
+#include "tuptoolplugin.h"
+#include "taction.h"
+#include "talgorithm.h"
+#include "tnodegroup.h"
+#include "tupgraphicalgorithm.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+#include "tupserializer.h"
+#include "tupinputdeviceinformation.h"
+#include "tupgraphicsscene.h"
+#include "tupprojectrequest.h"
+#include "tupprojectresponse.h"
+#include "tuprequestbuilder.h"
+#include "tupproxyitem.h"
+#include "tuplibraryobject.h"
+
+#include <QObject>
+#include <QSpinBox>
+#include <QGraphicsView>
+#include <QPointF>
+#include <QKeySequence>
+#include <QList>
+#include <QDebug>
+#include <QTimer>
+#include <QDir>
+
+class TupItemResponse;
+class TupGraphicsScene;
+
+/**
+ * @author Jorge Cuadrado
+ */
+
+class TUPI_PLUGIN NodesTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "nodestool.json")
+    
+    public:
+        NodesTool();
+        virtual ~NodesTool();
+        
+        virtual void init(TupGraphicsScene *scene);
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        
+        virtual QMap<QString, TAction *>actions() const;
+        
+        int toolType() const;
+        
+        virtual QWidget *configurator();
+        
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+        
+        virtual void itemResponse(const TupItemResponse *event);
+        virtual void keyPressEvent(QKeyEvent *event);
+        virtual void saveConfig();
+        virtual QCursor cursor() const;
+
+        void resizeNodes(qreal scaleFactor);
+        void updateZoomFactor(qreal scaleFactor);
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+ 
+    private:
+        void setupActions();
+        
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
+
diff -Nru tupi-0.2+git04/src/plugins/tools/nodes/nodestool.json tupi-0.2+git05/src/plugins/tools/nodes/nodestool.json
--- tupi-0.2+git04/src/plugins/tools/nodes/nodestool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/nodes/nodestool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "Nodes" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/opacity/configurator.cpp tupi-0.2+git05/src/plugins/tools/opacity/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/opacity/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacity/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,310 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+#include "tweenmanager.h"
+#include "buttonspanel.h"
+#include "tupitemtweener.h"
+#include "tosd.h"
+
+struct Configurator::Private
+{
+    QBoxLayout *layout;
+    QBoxLayout *settingsLayout;
+    Settings *settingsPanel;
+    TweenManager *tweenManager;
+    ButtonsPanel *controlPanel;
+
+    TupItemTweener *currentTween;
+
+    int framesTotal;
+    int currentFrame;
+
+    TupToolPlugin::Mode mode;
+    GuiState state;
+};
+
+Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
+{
+    k->framesTotal = 1;
+    k->currentFrame = 0;
+
+    k->mode = TupToolPlugin::View;
+    k->state = Manager;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    QLabel *title = new QLabel(tr("Opacity Tween"));
+    title->setAlignment(Qt::AlignHCenter);
+    title->setFont(QFont("Arial", 8, QFont::Bold));
+
+    k->layout->addWidget(title);
+
+    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    k->settingsLayout->setMargin(0);
+    k->settingsLayout->setSpacing(0);
+
+    setTweenManagerPanel();
+    setButtonsPanel();
+    setPropertiesPanel();
+
+    k->layout->addLayout(k->settingsLayout);
+    k->layout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    delete k;
+}
+
+void Configurator::loadTweenList(QList<QString> tweenList)
+{
+    k->tweenManager->loadTweenList(tweenList);
+    if (tweenList.count() > 0)
+        activeButtonsPanel(true);
+}
+
+void Configurator::setPropertiesPanel()
+{
+    k->settingsPanel = new Settings(this);
+
+    connect(k->settingsPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int)));
+    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
+    connect(k->settingsPanel, SIGNAL(clickedDefineProperties()), this, SIGNAL(clickedDefineProperties()));
+    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
+    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
+
+    k->settingsLayout->addWidget(k->settingsPanel);
+
+    activePropertiesPanel(false);
+}
+
+void Configurator::activePropertiesPanel(bool enable)
+{
+    if (enable)
+        k->settingsPanel->show();
+    else
+        k->settingsPanel->hide();
+}
+
+void Configurator::setCurrentTween(TupItemTweener *currentTween)
+{
+    k->currentTween = currentTween;
+}
+
+void Configurator::setTweenManagerPanel()
+{
+    k->tweenManager = new TweenManager(this);
+    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
+    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
+
+    k->settingsLayout->addWidget(k->tweenManager);
+    k->state = Manager;
+}
+
+void Configurator::activeTweenManagerPanel(bool enable)
+{
+    if (enable)
+        k->tweenManager->show();
+    else
+        k->tweenManager->hide();
+
+    if (k->tweenManager->listSize() > 0)
+        activeButtonsPanel(enable);
+}
+
+void Configurator::setButtonsPanel()
+{
+    k->controlPanel = new ButtonsPanel(this);
+    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
+    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
+
+    k->settingsLayout->addWidget(k->controlPanel);
+
+    activeButtonsPanel(false);
+}
+
+void Configurator::activeButtonsPanel(bool enable)
+{
+    if (enable)
+        k->controlPanel->show();
+    else
+        k->controlPanel->hide();
+}
+
+void Configurator::initStartCombo(int framesTotal, int currentFrame)
+{
+    k->framesTotal = framesTotal;
+    k->currentFrame = currentFrame;
+    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
+}
+
+void Configurator::setStartFrame(int currentIndex)
+{
+    k->currentFrame = currentIndex;
+    k->settingsPanel->setStartFrame(currentIndex);
+}
+
+int Configurator::startFrame()
+{
+    return k->settingsPanel->startFrame();
+}
+
+int Configurator::startComboSize()
+{
+    return k->settingsPanel->startComboSize();
+}
+
+QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame)
+{
+    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame);
+}
+
+int Configurator::totalSteps()
+{
+    return k->settingsPanel->totalSteps();
+}
+
+void Configurator::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->settingsPanel->activateMode(mode);
+}
+
+void Configurator::addTween(const QString &name)
+{
+    activeTweenManagerPanel(false);
+
+    k->mode = TupToolPlugin::Add;
+    k->state = Properties;
+
+    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
+    activePropertiesPanel(true);
+
+    emit setMode(k->mode);
+}
+
+void Configurator::editTween()
+{
+    activeTweenManagerPanel(false);
+
+    k->mode = TupToolPlugin::Edit;
+    k->state = Properties;
+
+    k->settingsPanel->notifySelection(true);
+    k->settingsPanel->setParameters(k->currentTween);
+    activePropertiesPanel(true);
+
+    emit setMode(k->mode);
+}
+
+void Configurator::removeTween()
+{
+    QString name = k->tweenManager->currentTweenName();
+    k->tweenManager->removeItemFromList();
+
+    removeTween(name);
+}
+
+void Configurator::removeTween(const QString &name)
+{
+    if (k->tweenManager->listSize() == 0)
+        activeButtonsPanel(false);
+
+    emit clickedRemoveTween(name);
+}
+
+QString Configurator::currentTweenName() const
+{
+    QString oldName = k->tweenManager->currentTweenName();
+    QString newName = k->settingsPanel->currentTweenName();
+
+    if (oldName.compare(newName) != 0)
+        k->tweenManager->updateTweenName(newName);
+
+    return newName;
+}
+
+void Configurator::notifySelection(bool flag)
+{
+    k->settingsPanel->notifySelection(flag);
+}
+
+void Configurator::closeTweenProperties()
+{
+    if (k->mode == TupToolPlugin::Add)
+        k->tweenManager->removeItemFromList();
+
+    emit clickedResetInterface();
+
+    closeSettingsPanel();
+}
+
+void Configurator::closeSettingsPanel()
+{
+    if (k->state == Properties) {
+        activeTweenManagerPanel(true);
+        activePropertiesPanel(false);
+        k->mode = TupToolPlugin::View;
+        k->state = Manager;
+    }
+}
+
+TupToolPlugin::Mode Configurator::mode()
+{
+    return k->mode;
+}
+
+void Configurator::applyItem()
+{
+     k->mode = TupToolPlugin::Edit;
+     emit clickedApplyTween();
+}
+
+void Configurator::resetUI()
+{
+    k->tweenManager->resetUI();
+    closeSettingsPanel();
+    k->settingsPanel->notifySelection(false);
+}
+
+void Configurator::updateTweenData(const QString &name)
+{
+    emit getTweenData(name);
+}
+
diff -Nru tupi-0.2+git04/src/plugins/tools/opacity/configurator.h tupi-0.2+git05/src/plugins/tools/opacity/configurator.h
--- tupi-0.2+git04/src/plugins/tools/opacity/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacity/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,111 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "settings.h"
+
+#include <QFrame>
+#include <QLabel>
+#include <QBoxLayout>
+
+class QGraphicsPathItem;
+class QListWidgetItem;
+class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Configurator : public QFrame
+{
+    Q_OBJECT
+
+    public:
+        enum GuiState { Manager = 1, Properties };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+
+        void loadTweenList(QList<QString> tweenList);
+
+        void initStartCombo(int framesTotal, int currentFrame);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+
+        int totalSteps();
+        void activateMode(TupToolPlugin::EditMode mode);
+        void setCurrentTween(TupItemTweener *currentTween);
+        QString currentTweenName() const;
+        void notifySelection(bool flag);
+        int startComboSize();
+        void closeSettingsPanel();
+        TupToolPlugin::Mode mode();
+        void resetUI();
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame);
+        
+    private slots:
+        void applyItem();
+        void addTween(const QString &name);
+        void editTween();
+        void removeTween();
+        void removeTween(const QString &name);
+        void closeTweenProperties();
+        void updateTweenData(const QString &name);
+        
+    signals:
+        void startingPointChanged(int index);
+        void clickedSelect();
+        void clickedDefineProperties();
+        void clickedRemoveTween(const QString &name);
+        void setMode(TupToolPlugin::Mode mode);
+        void clickedApplyTween();
+        void clickedResetInterface();
+        void getTweenData(const QString &name);
+        
+    private:
+        void setPropertiesPanel();
+        void activePropertiesPanel(bool enable);
+        void setTweenManagerPanel();
+        void activeTweenManagerPanel(bool enable);
+        void setButtonsPanel();
+        void activeButtonsPanel(bool enable);
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/opacity/opacity.pro tupi-0.2+git05/src/plugins/tools/opacity/opacity.pro
--- tupi-0.2+git04/src/plugins/tools/opacity/opacity.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacity/opacity.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,39 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += tweener.h \
+           configurator.h \
+           settings.h
+
+SOURCES += tweener.cpp \
+           configurator.cpp \
+           settings.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupiopacitytool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/opacity/opacitytool.json tupi-0.2+git05/src/plugins/tools/opacity/opacitytool.json
--- tupi-0.2+git04/src/plugins/tools/opacity/opacitytool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacity/opacitytool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "OpacityTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/opacity/settings.cpp tupi-0.2+git05/src/plugins/tools/opacity/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/opacity/settings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacity/settings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,533 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "settings.h"
+#include "tradiobuttongroup.h"
+#include "tupitemtweener.h"
+#include "tuptweenerstep.h"
+#include "timagebutton.h"
+#include "tseparator.h"
+#include "tosd.h"
+
+struct Settings::Private
+{
+    QWidget *innerPanel;
+    QBoxLayout *layout;
+    TupToolPlugin::Mode mode;
+
+    QLineEdit *input;
+
+    QSpinBox *comboInit;
+    QSpinBox *comboEnd;
+
+    TRadioButtonGroup *options;
+
+    QDoubleSpinBox *comboInitFactor;
+    QDoubleSpinBox *comboEndFactor;
+
+    QSpinBox *comboIterations;
+
+    QCheckBox *loopBox;
+    QCheckBox *reverseLoopBox;
+
+    QLabel *totalLabel;
+    int totalSteps;
+
+    bool selectionDone;
+    bool propertiesDone;
+
+    TImageButton *apply;
+    TImageButton *remove;
+};
+
+Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    k->selectionDone = false;
+    k->totalSteps = 0;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    setFont(QFont("Arial", 8, QFont::Normal, false));
+
+    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
+    k->input = new QLineEdit;
+
+    QHBoxLayout *nameLayout = new QHBoxLayout;
+    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    nameLayout->setMargin(0);
+    nameLayout->setSpacing(0);
+    nameLayout->addWidget(nameLabel);
+    nameLayout->addWidget(k->input);
+
+    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
+    k->options->addItem(tr("Select object"), 0);
+    k->options->addItem(tr("Set Properties"), 1);
+    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
+
+    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
+    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
+
+    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
+    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(10);
+    buttonsLayout->addWidget(k->apply);
+    buttonsLayout->addWidget(k->remove);
+
+    k->layout->addLayout(nameLayout);
+    k->layout->addWidget(k->options);
+
+    setInnerForm();
+
+    k->layout->addSpacing(10);
+    k->layout->addLayout(buttonsLayout);
+    k->layout->setSpacing(5);
+
+    activateMode(TupToolPlugin::Selection);
+}
+
+Settings::~Settings()
+{
+    delete k;
+}
+
+void Settings::setInnerForm()
+{
+    k->innerPanel = new QWidget;
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
+    startingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboInit = new QSpinBox;
+    k->comboInit->setEnabled(false);
+    k->comboInit->setMaximum(999);
+    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(updateLastFrame()));
+
+    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
+    endingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboEnd = new QSpinBox;
+    k->comboEnd->setEnabled(true);
+    k->comboEnd->setMaximum(999);
+    k->comboEnd->setValue(1);
+    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(startingLabel);
+    startLayout->addWidget(k->comboInit);
+
+    QHBoxLayout *endLayout = new QHBoxLayout;
+    endLayout->setAlignment(Qt::AlignHCenter);
+    endLayout->setMargin(0);
+    endLayout->setSpacing(0);
+    endLayout->addWidget(endingLabel);
+    endLayout->addWidget(k->comboEnd);
+
+    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
+    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    QHBoxLayout *totalLayout = new QHBoxLayout;
+    totalLayout->setAlignment(Qt::AlignHCenter);
+    totalLayout->setMargin(0);
+    totalLayout->setSpacing(0);
+    totalLayout->addWidget(k->totalLabel);
+
+    k->comboInitFactor = new QDoubleSpinBox;
+    k->comboInitFactor->setMinimum(0.00);
+    k->comboInitFactor->setMaximum(1.00);
+    k->comboInitFactor->setDecimals(2);
+    k->comboInitFactor->setSingleStep(0.05);
+    k->comboInitFactor->setValue(1.00);
+
+    QLabel *opacityInitLabel = new QLabel(tr("Initial Opacity") + ": ");
+    opacityInitLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *opacityInitLayout = new QHBoxLayout;
+    opacityInitLayout->setAlignment(Qt::AlignHCenter);
+    opacityInitLayout->setMargin(0);
+    opacityInitLayout->setSpacing(0);
+    opacityInitLayout->addWidget(opacityInitLabel);
+    opacityInitLayout->addWidget(k->comboInitFactor);
+
+    k->comboEndFactor = new QDoubleSpinBox;
+    k->comboEndFactor->setMinimum(0.00);
+    k->comboEndFactor->setMaximum(1.00);
+    k->comboEndFactor->setDecimals(2);
+    k->comboEndFactor->setSingleStep(0.05);
+    k->comboEndFactor->setValue(0.00);
+
+    QLabel *opacityEndLabel = new QLabel(tr("Ending Opacity") + ": ");
+    opacityEndLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *opacityEndLayout = new QHBoxLayout;
+    opacityEndLayout->setAlignment(Qt::AlignHCenter);
+    opacityEndLayout->setMargin(0);
+    opacityEndLayout->setSpacing(0);
+    opacityEndLayout->addWidget(opacityEndLabel);
+    opacityEndLayout->addWidget(k->comboEndFactor);
+
+    k->comboIterations = new QSpinBox;
+    k->comboIterations->setEnabled(true);
+    k->comboIterations->setMinimum(1);
+
+    QLabel *iterationsLabel = new QLabel(tr("Iterations") + ": ");
+    iterationsLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *iterationsLayout = new QHBoxLayout;
+    iterationsLayout->setAlignment(Qt::AlignHCenter);
+    iterationsLayout->setMargin(0);
+    iterationsLayout->setSpacing(0);
+    iterationsLayout->addWidget(iterationsLabel);
+    iterationsLayout->addWidget(k->comboIterations);
+
+    k->loopBox = new QCheckBox(tr("Loop"), k->innerPanel);
+    connect(k->loopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
+
+    QVBoxLayout *loopLayout = new QVBoxLayout;
+    loopLayout->setAlignment(Qt::AlignHCenter);
+    loopLayout->setMargin(0);
+    loopLayout->setSpacing(0);
+    loopLayout->addWidget(k->loopBox);
+
+    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->innerPanel);
+    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateLoopCheckbox(int)));
+
+    QVBoxLayout *reverseLayout = new QVBoxLayout;
+    reverseLayout->setAlignment(Qt::AlignHCenter);
+    reverseLayout->setMargin(0);
+    reverseLayout->setSpacing(0);
+    reverseLayout->addWidget(k->reverseLoopBox);
+
+    innerLayout->addLayout(startLayout);
+    innerLayout->addLayout(endLayout);
+    innerLayout->addLayout(totalLayout);
+
+    innerLayout->addSpacing(10);
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    innerLayout->addLayout(opacityInitLayout);
+    innerLayout->addLayout(opacityEndLayout);
+
+    innerLayout->addLayout(iterationsLayout);
+    innerLayout->addLayout(loopLayout);
+    innerLayout->addLayout(reverseLayout);
+
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    k->layout->addWidget(k->innerPanel);
+
+    activeInnerForm(false);
+}
+
+void Settings::activeInnerForm(bool enable)
+{
+    if (enable && !k->innerPanel->isVisible()) {
+        k->propertiesDone = true;
+        k->innerPanel->show();
+    } else {
+        k->propertiesDone = false;
+        k->innerPanel->hide();
+    }
+}
+
+void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
+{
+    k->mode = TupToolPlugin::Add;
+    k->input->setText(name);
+
+    activateMode(TupToolPlugin::Selection);
+    k->apply->setToolTip(tr("Save Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
+    k->remove->setToolTip(tr("Cancel Tween"));
+
+    initStartCombo(framesTotal, initFrame);
+}
+
+void Settings::setParameters(TupItemTweener *currentTween)
+{
+    setEditMode();
+    activateMode(TupToolPlugin::Properties);
+
+    k->input->setText(currentTween->name());
+
+    k->comboInit->setEnabled(true);
+    k->comboInit->setValue(currentTween->initFrame() + 1);
+    k->comboEnd->setValue(currentTween->initFrame() + currentTween->frames());
+
+    checkFramesRange();
+
+    k->comboInitFactor->setValue(currentTween->tweenOpacityInitialFactor());
+    k->comboEndFactor->setValue(currentTween->tweenOpacityEndingFactor());
+    k->comboIterations->setValue(currentTween->tweenOpacityIterations());
+    k->loopBox->setChecked(currentTween->tweenOpacityLoop());
+    k->reverseLoopBox->setChecked(currentTween->tweenOpacityReverseLoop());
+}
+
+void Settings::initStartCombo(int framesTotal, int currentIndex)
+{
+    k->comboInit->clear();
+    k->comboEnd->clear();
+
+    k->comboInit->setMinimum(1);
+    k->comboInit->setMaximum(framesTotal);
+    k->comboInit->setValue(currentIndex + 1);
+
+    k->comboEnd->setMinimum(1);
+    k->comboEnd->setValue(framesTotal);
+}
+
+void Settings::setStartFrame(int currentIndex)
+{
+    k->comboInit->setValue(currentIndex + 1);
+    int end = k->comboEnd->value();
+    if (end < currentIndex+1)
+        k->comboEnd->setValue(currentIndex + 1);
+}
+
+int Settings::startFrame()
+{
+    return k->comboInit->value() - 1;
+}
+
+int Settings::startComboSize()
+{
+    return k->comboInit->maximum();
+}
+
+int Settings::totalSteps()
+{
+    return k->comboEnd->value() - (k->comboInit->value() - 1);
+}
+
+void Settings::setEditMode()
+{
+    k->mode = TupToolPlugin::Edit;
+    k->apply->setToolTip(tr("Update Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
+    k->remove->setToolTip(tr("Close Tween properties"));
+}
+
+void Settings::applyTween()
+{
+    if (!k->selectionDone) {
+        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
+        return;
+    }
+
+    if (!k->propertiesDone) {
+        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
+        return;
+    }
+
+    // SQA: Verify Tween is really well applied before call setEditMode!
+    setEditMode();
+
+    if (!k->comboInit->isEnabled())
+        k->comboInit->setEnabled(true);
+
+    emit clickedApplyTween();
+}
+
+void Settings::notifySelection(bool flag)
+{
+    k->selectionDone = flag;
+}
+
+QString Settings::currentTweenName() const
+{
+    QString tweenName = k->input->text();
+    if (tweenName.length() > 0)
+        k->input->setFocus();
+
+    return tweenName;
+}
+
+void Settings::emitOptionChanged(int option)
+{
+    switch (option) {
+            case 0:
+             {
+                 activeInnerForm(false);
+                 emit clickedSelect();
+             }
+            break;
+            case 1:
+             {
+                 if (k->selectionDone) {
+                     activeInnerForm(true);
+                     emit clickedDefineProperties();
+                 } else {
+                     k->options->setCurrentIndex(0);
+                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
+                 }
+             }
+    }
+}
+
+QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame)
+{
+    QDomDocument doc;
+
+    QDomElement root = doc.createElement("tweening");
+    root.setAttribute("name", currentTweenName());
+    root.setAttribute("type", TupItemTweener::Opacity);
+    root.setAttribute("initFrame", currentFrame);
+    root.setAttribute("initLayer", currentLayer);
+    root.setAttribute("initScene", currentScene);
+  
+    checkFramesRange();
+    root.setAttribute("frames", k->totalSteps);
+    root.setAttribute("origin", "0,0");
+
+    double initFactor = k->comboInitFactor->value();
+    root.setAttribute("initOpacityFactor", initFactor);
+
+    double endFactor = k->comboEndFactor->value();
+    root.setAttribute("endOpacityFactor", endFactor);
+
+    int iterations = k->comboIterations->value();
+    if (iterations == 0) {
+        iterations = 1;
+        k->comboIterations->setValue(1);
+    }
+    root.setAttribute("opacityIterations", iterations);
+
+    bool loop = k->loopBox->isChecked();
+    if (loop)
+        root.setAttribute("opacityLoop", "1");
+    else
+        root.setAttribute("opacityLoop", "0");
+
+    bool reverse = k->reverseLoopBox->isChecked();
+    if (reverse)
+        root.setAttribute("opacityReverseLoop", "1");
+    else
+        root.setAttribute("opacityReverseLoop", "0");
+
+    double delta = (double)(initFactor - endFactor)/(double)(iterations - 1);
+    double reference = 0;
+
+    int cycle = 1;
+    int reverseTop = (iterations*2)-2;
+
+    for (int i=0; i < k->totalSteps; i++) {
+         if (cycle <= iterations) {
+             if (cycle == 1) {
+                 reference = initFactor;
+             } else if (cycle == iterations) {
+                        reference = endFactor;
+             } else {
+                 reference -= delta;
+             }
+             cycle++;
+         } else {
+             // if repeat option is enabled
+             if (loop) {
+                 cycle = 2;
+                 reference = initFactor;
+             } else if (reverse) { // if reverse option is enabled
+                        reference += delta;
+                        if (cycle < reverseTop)
+                            cycle++;
+                        else
+                            cycle = 1;
+
+             } else { // If cycle is done and no loop and no reverse
+                 reference = initFactor;
+             }
+         }
+
+         TupTweenerStep *step = new TupTweenerStep(i);
+         step->setOpacity(reference);
+         root.appendChild(step->toXml(doc));
+    }
+
+    doc.appendChild(root);
+
+    return doc.toString();
+}
+
+void Settings::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->options->setCurrentIndex(mode);
+}
+
+void Settings::updateLastFrame()
+{
+    int end = k->comboInit->value() + k->totalSteps - 1;
+    k->comboEnd->setValue(end);
+}
+
+void Settings::checkTopLimit(int index)
+{
+    Q_UNUSED(index);
+    checkFramesRange();
+}
+
+void Settings::checkFramesRange()
+{
+    int begin = k->comboInit->value();
+    int end = k->comboEnd->value();
+
+    if (begin > end) {
+        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
+        end = k->comboEnd->value();
+    }
+
+    k->totalSteps = end - begin + 1;
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
+}
+
+void Settings::updateLoopCheckbox(int state)
+{
+    Q_UNUSED(state);
+
+    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
+        k->loopBox->setChecked(false);
+}
+
+void Settings::updateReverseCheckbox(int state)
+{
+    Q_UNUSED(state);
+
+    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
+        k->reverseLoopBox->setChecked(false);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/opacity/settings.h tupi-0.2+git05/src/plugins/tools/opacity/settings.h
--- tupi-0.2+git04/src/plugins/tools/opacity/settings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacity/settings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,104 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+
+#include <QWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QBoxLayout>
+#include <QSpinBox>
+#include <QDoubleSpinBox>
+#include <QCheckBox>
+#include <QDir>
+
+class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Settings : public QWidget 
+{
+    Q_OBJECT
+
+    public:
+        Settings(QWidget *parent = 0);
+        ~Settings();
+
+        void setParameters(const QString &name, int framesTotal, int startFrame);
+        void setParameters(TupItemTweener *currentTween);
+        void initStartCombo(int totalFrames, int currentIndex);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+
+        int totalSteps();
+
+        QString currentTweenName() const;
+        void activateMode(TupToolPlugin::EditMode mode);
+        void notifySelection(bool flag);
+        int startComboSize();
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame);
+
+    private slots:
+        void applyTween();
+        void emitOptionChanged(int option);
+        void checkTopLimit(int index);
+        void updateLoopCheckbox(int state);
+        void updateReverseCheckbox(int state);
+        void updateLastFrame();
+        
+    signals:
+        void clickedSelect();
+        void clickedDefineProperties();
+        void clickedApplyTween();
+        void clickedResetTween();
+        void startingPointChanged(int index);
+        
+    private:
+        void setInnerForm();
+        void activeInnerForm(bool enable);
+        void setEditMode();
+        void checkFramesRange();
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/opacity/tweener.cpp tupi-0.2+git05/src/plugins/tools/opacity/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/opacity/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacity/tweener.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,560 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tweener.h"
+#include "configurator.h"
+#include "taction.h"
+#include "tosd.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicsscene.h"
+#include "tupgraphicobject.h"
+#include "tupsvgitem.h"
+#include "tupitemtweener.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+
+struct Tweener::Private
+{
+    QMap<QString, TAction *> actions;
+    Configurator *configurator;
+
+    TupGraphicsScene *scene;
+    QList<QGraphicsItem *> objects;
+
+    TupItemTweener *currentTween;
+    int initFrame;
+    int initLayer;
+    int initScene;
+
+    TupToolPlugin::Mode mode;
+    TupToolPlugin::EditMode editMode;
+};
+
+Tweener::Tweener() : TupToolPlugin(), k(new Private)
+{
+    setupActions();
+
+    k->configurator = 0;
+    k->initFrame = 0;
+}
+
+Tweener::~Tweener()
+{
+    delete k;
+}
+
+/* This method initializes the plugin */
+
+void Tweener::init(TupGraphicsScene *scene)
+{
+    k->scene = scene;
+    k->objects.clear();
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+
+    k->configurator->resetUI();
+
+    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Opacity);
+    if (tweenList.size() > 0) {
+        k->configurator->loadTweenList(tweenList);
+        setCurrentTween(tweenList.at(0));
+    }
+
+    int total = framesTotal();
+    k->configurator->initStartCombo(total, k->initFrame);
+}
+
+void Tweener::updateStartPoint(int index)
+{
+     if (k->initFrame != index && index >= 0)
+         k->initFrame = index;
+}
+
+/* This method returns the plugin name */
+
+QStringList Tweener::keys() const
+{
+    return QStringList() << tr("Opacity Tween");
+}
+
+/* This method makes an action when the mouse is pressed on the workspace 
+ * depending on the active mode: Selecting an object or Creating a path  
+*/
+
+void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::press()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method is executed while the mouse is pressed and on movement */
+
+void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method finishes the action started on the press method depending
+ * on the active mode: Selecting an object or Creating a path
+*/
+
+void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::release()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (scene->currentFrameIndex() == k->initFrame) {
+        if (k->editMode == TupToolPlugin::Selection) {
+            if (scene->selectedItems().size() > 0) {
+                k->objects = scene->selectedItems();
+                k->configurator->notifySelection(true);
+            }
+        }
+    }
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+QMap<QString, TAction *> Tweener::actions() const
+{
+    return k->actions;
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+int Tweener::toolType() const
+{
+    return TupToolInterface::Tweener;
+}
+
+/* This method returns the tool panel associated to this plugin */
+
+QWidget *Tweener::configurator()
+{
+    if (!k->configurator) {
+        k->mode = TupToolPlugin::View;
+
+        k->configurator = new Configurator;
+        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
+        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
+        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
+        connect(k->configurator, SIGNAL(clickedDefineProperties()), this, SLOT(setPropertiesMode()));
+        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
+        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode))); 
+        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
+        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    } 
+
+    return k->configurator;
+}
+
+/* This method is called when there's a change on/of scene */
+void Tweener::aboutToChangeScene(TupGraphicsScene *)
+{
+}
+
+/* This method is called when this plugin is off */
+
+void Tweener::aboutToChangeTool()
+{
+}
+
+/* This method defines the actions contained in this plugin */
+
+void Tweener::setupActions()
+{
+    TAction *action = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "opacity_tween.png"), 
+                                      tr("Opacity Tween"), this);
+    action->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
+    action->setShortcut(QKeySequence(tr("Shift+O")));
+
+    k->actions.insert(tr("Opacity Tween"), action);
+}
+
+/* This method saves the settings of this plugin */
+
+void Tweener::saveConfig()
+{
+}
+
+/* This method updates the workspace when the plugin changes the scene */
+
+void Tweener::updateScene(TupGraphicsScene *scene)
+{
+    k->mode = k->configurator->mode();
+
+    if (k->mode == TupToolPlugin::Edit) {
+        int framesNumber = framesTotal();
+
+        if (k->configurator->startComboSize() < framesNumber)
+            k->configurator->initStartCombo(framesNumber, k->initFrame);
+    } else if (k->mode == TupToolPlugin::Add) {
+               int total = framesTotal();
+
+               if (k->editMode == TupToolPlugin::Properties) {
+                   if (total > k->configurator->startComboSize()) {
+                       k->configurator->activateMode(TupToolPlugin::Selection);
+                       clearSelection();
+                       setSelection();
+                   }
+               } else if (k->editMode == TupToolPlugin::Selection) {
+                          if (scene->currentFrameIndex() != k->initFrame)
+                              clearSelection();
+                          k->initFrame = scene->currentFrameIndex();
+                          setSelection();
+               }
+
+               if (k->configurator->startComboSize() < total) {
+                   k->configurator->initStartCombo(total, k->initFrame);
+               } else {
+                   if (scene->currentFrameIndex() != k->initFrame)
+                       k->configurator->setStartFrame(scene->currentFrameIndex());
+               }
+
+    } else {
+        if (scene->currentFrameIndex() != k->initFrame)
+            k->configurator->setStartFrame(scene->currentFrameIndex());
+    }
+}
+
+void Tweener::setCurrentTween(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    k->currentTween = scene->tween(name, TupItemTweener::Opacity);
+    if (k->currentTween)
+        k->configurator->setCurrentTween(k->currentTween);
+}
+
+int Tweener::framesTotal()
+{
+    int total = 1;
+    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
+    if (layer)
+        total = layer->framesTotal();
+
+    return total;
+}
+
+/* This method clears selection */
+
+void Tweener::clearSelection()
+{
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 if (item->isSelected())
+                     item->setSelected(false);
+        }
+        k->objects.clear();
+        k->configurator->notifySelection(false);
+    }
+}
+
+/* This method disables object selection */
+
+void Tweener::disableSelection()
+{
+    foreach (QGraphicsView *view, k->scene->views()) {
+             view->setDragMode (QGraphicsView::NoDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+void Tweener::setSelection()
+{
+    k->editMode = TupToolPlugin::Selection;
+
+    int bottomBoundary = 20000 + (k->initLayer*10000);
+    int topBoundary = bottomBoundary + 10000;
+
+    foreach (QGraphicsView *view, k->scene->views()) {
+             view->setDragMode(QGraphicsView::RubberBandDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
+                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+             }
+    }
+
+    // When Object selection is enabled, previous selection is set
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                 item->setSelected(true);
+        }
+        k->configurator->notifySelection(true);
+    }
+}
+
+void Tweener::setPropertiesMode()
+{
+    k->editMode = TupToolPlugin::Properties;
+    disableSelection();
+}
+
+/* This method resets this plugin */
+
+void Tweener::applyReset()
+{
+    disableSelection();
+    clearSelection();
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+}
+
+/* This method applies to the project, the Tween created from this plugin */
+
+void Tweener::applyTween()
+{
+    QString name = k->configurator->currentTweenName();
+
+    if (name.length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
+        return;
+    }
+
+    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Opacity)) {
+        k->initFrame = k->scene->currentFrameIndex();
+        k->initLayer = k->scene->currentLayerIndex();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 int objectIndex = -1;
+
+                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = k->scene->currentFrame()->indexOf(svg);
+                 } else {
+                     objectIndex = k->scene->currentFrame()->indexOf(item);
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex, QPointF(), k->scene->spaceMode(), 
+                                             type, TupProjectRequest::SetTween,
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame));
+                 emit requested(&request);
+        }
+    } else {
+        removeTweenFromProject(name);
+        QList<QGraphicsItem *> newList;
+
+        k->initFrame = k->configurator->startFrame();
+        k->initLayer = k->currentTween->initLayer();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 TupProject *project = k->scene->scene()->project();
+                 TupScene *scene = project->scene(k->initScene);
+                 TupLayer *layer = scene->layer(k->initLayer);
+                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
+                 int objectIndex = -1;
+                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
+
+                 if (svg) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = frame->indexOf(svg);
+                 } else {
+                     objectIndex = frame->indexOf(item);
+                 }
+
+                 if (k->initFrame != k->currentTween->initFrame()) {
+                     QDomDocument dom;
+                     if (type == TupLibraryObject::Svg)
+                         dom.appendChild(svg->toXml(dom));
+                     else
+                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
+
+                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame,
+                                                                                      0, QPointF(), k->scene->spaceMode(),
+                                                                                      type, TupProjectRequest::Add,
+                                                                                      dom.toString());
+                     emit requested(&request);
+
+                     request = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(),
+                                                                   k->scene->currentLayerIndex(),
+                                                                   k->currentTween->initFrame(),
+                                                                   objectIndex, QPointF(),    
+                                                                   k->scene->spaceMode(), type,
+                                                                   TupProjectRequest::Remove);
+                     emit requested(&request);
+
+                     frame = layer->frame(k->initFrame);
+                     if (type == TupLibraryObject::Item) {
+                         objectIndex = frame->graphicItemsCount() - 1;
+                         newList.append(frame->graphic(objectIndex)->item());
+                     } else {
+                         objectIndex = frame->svgItemsCount() - 1;
+                         newList.append(frame->svg(objectIndex));
+                     }
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex, QPointF(), k->scene->spaceMode(), 
+                                             type, TupProjectRequest::SetTween, 
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame));
+                 emit requested(&request);
+        }
+
+        if (newList.size() > 0)
+            k->objects = newList;
+    }
+
+    int total = k->initFrame + k->configurator->totalSteps();
+    int framesNumber = framesTotal();
+    int layersTotal = k->scene->scene()->layersTotal();
+    TupProjectRequest request;
+
+    if (total >= framesNumber) {
+        for (int i = framesNumber; i < total; i++) {
+             for (int j = 0; j < layersTotal; j++) {
+                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i,
+                                                                  TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
+                  emit requested(&request);
+             }
+        }
+    }
+
+    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
+                                                    TupProjectRequest::Select, "1");
+    emit requested(&request);
+
+    setCurrentTween(name);
+    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
+}
+
+void Tweener::removeTweenFromProject(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    scene->removeTween(name, TupItemTweener::Opacity);
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      QString tip = item->toolTip();
+                      if (tip.startsWith(tr("Opacity Tween") + ": " + name))
+                          item->setToolTip("");
+             }
+    }
+}
+
+void Tweener::removeTween(const QString &name)
+{
+    removeTweenFromProject(name);
+    applyReset();
+}
+
+void Tweener::updateMode(TupToolPlugin::Mode mode)
+{
+    k->mode = mode;
+
+    if (k->mode == TupToolPlugin::Edit) {
+        k->initScene = k->currentTween->initScene();
+        k->initLayer = k->currentTween->initLayer();
+        k->initFrame = k->currentTween->initFrame();
+
+        if (k->initFrame != k->scene->currentFrameIndex() || k->initLayer != k->scene->currentLayerIndex()) {
+            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame, 
+                                                                              TupProjectRequest::Select, "1");
+            emit requested(&request);
+
+            if (k->objects.isEmpty())
+                k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Opacity);
+        }
+    }
+}
+
+void Tweener::sceneResponse(const TupSceneResponse *event)
+{
+    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
+        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
+        init(k->scene);
+    }
+
+    if (event->action() == TupProjectRequest::Select)
+        init(k->scene);
+}
+
+void Tweener::layerResponse(const TupLayerResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove)
+        init(k->scene);
+}
+
+void Tweener::frameResponse(const TupFrameResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
+        init(k->scene);
+
+    if (event->action() == TupProjectRequest::Select) {
+        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
+            init(k->scene);
+    }
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/opacity/tweener.h tupi-0.2+git05/src/plugins/tools/opacity/tweener.h
--- tupi-0.2+git04/src/plugins/tools/opacity/tweener.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacity/tweener.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,107 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef OPACITYTWEENER_H
+#define OPACITYTWEENER_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "settings.h"
+#include "tupprojectresponse.h"
+
+#include <QPointF>
+#include <QKeySequence>
+#include <QMatrix>
+#include <QGraphicsView>
+#include <QDomDocument>
+#include <QDir>
+
+/**
+ * @author Gustav Gonzalez 
+ * 
+*/
+
+class TUPI_PLUGIN Tweener : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "opacitytool.json")
+
+    public:
+        Tweener();
+        virtual ~Tweener();
+        virtual void init(TupGraphicsScene *scene);
+
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+
+        virtual void updateScene(TupGraphicsScene *scene);
+        virtual void saveConfig();
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+        virtual void layerResponse(const TupLayerResponse *event);
+        virtual void frameResponse(const TupFrameResponse *event);
+
+    private:
+        void setupActions();
+        int framesTotal();
+        void clearSelection();
+        void disableSelection();
+        void removeTweenFromProject(const QString &name);
+
+    private:
+        struct Private;
+        Private *const k;
+
+    private slots:
+        void setCurrentTween(const QString &name);
+        void setSelection();
+        void setPropertiesMode(); 
+        void updateMode(TupToolPlugin::Mode mode);
+        void updateStartPoint(int index);
+        void applyReset();
+        void applyTween();
+        void removeTween(const QString &name);
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/opacitytool/configurator.cpp tupi-0.2+git05/src/plugins/tools/opacitytool/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/opacitytool/configurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacitytool/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,317 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "configurator.h"
-#include "tweenmanager.h"
-#include "buttonspanel.h"
-
-#include "tupitemtweener.h"
-#include "tosd.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QBoxLayout>
-
-struct Configurator::Private
-{
-    QBoxLayout *layout;
-    QBoxLayout *settingsLayout;
-    Settings *settingsPanel;
-    TweenManager *tweenManager;
-    ButtonsPanel *controlPanel;
-
-    TupItemTweener *currentTween;
-
-    int framesTotal;
-    int currentFrame;
-
-    TupToolPlugin::Mode mode;
-    GuiState state;
-};
-
-Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
-{
-    k->framesTotal = 1;
-    k->currentFrame = 0;
-
-    k->mode = TupToolPlugin::View;
-    k->state = Manager;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-
-    QLabel *title = new QLabel(tr("Opacity Tween"));
-    title->setAlignment(Qt::AlignHCenter);
-    title->setFont(QFont("Arial", 8, QFont::Bold));
-
-    k->layout->addWidget(title);
-
-    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    k->settingsLayout->setMargin(0);
-    k->settingsLayout->setSpacing(0);
-
-    setTweenManagerPanel();
-    setButtonsPanel();
-    setPropertiesPanel();
-
-    k->layout->addLayout(k->settingsLayout);
-    k->layout->addStretch(2);
-}
-
-Configurator::~Configurator()
-{
-    delete k;
-}
-
-void Configurator::loadTweenList(QList<QString> tweenList)
-{
-    k->tweenManager->loadTweenList(tweenList);
-    if (tweenList.count() > 0)
-        activeButtonsPanel(true);
-}
-
-void Configurator::setPropertiesPanel()
-{
-    tFatal() << "Configurator::setPropertiesPanel() - Just tracing!";
-
-    k->settingsPanel = new Settings(this);
-
-    connect(k->settingsPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int)));
-    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
-    connect(k->settingsPanel, SIGNAL(clickedDefineProperties()), this, SIGNAL(clickedDefineProperties()));
-    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
-    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
-
-    k->settingsLayout->addWidget(k->settingsPanel);
-
-    activePropertiesPanel(false);
-}
-
-void Configurator::activePropertiesPanel(bool enable)
-{
-    if (enable)
-        k->settingsPanel->show();
-    else
-        k->settingsPanel->hide();
-}
-
-void Configurator::setCurrentTween(TupItemTweener *currentTween)
-{
-    k->currentTween = currentTween;
-}
-
-void Configurator::setTweenManagerPanel()
-{
-    k->tweenManager = new TweenManager(this);
-    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
-    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
-
-    k->settingsLayout->addWidget(k->tweenManager);
-    k->state = Manager;
-}
-
-void Configurator::activeTweenManagerPanel(bool enable)
-{
-    if (enable)
-        k->tweenManager->show();
-    else
-        k->tweenManager->hide();
-
-    if (k->tweenManager->listSize() > 0)
-        activeButtonsPanel(enable);
-}
-
-void Configurator::setButtonsPanel()
-{
-    k->controlPanel = new ButtonsPanel(this);
-    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
-    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
-
-    k->settingsLayout->addWidget(k->controlPanel);
-
-    activeButtonsPanel(false);
-}
-
-void Configurator::activeButtonsPanel(bool enable)
-{
-    if (enable)
-        k->controlPanel->show();
-    else
-        k->controlPanel->hide();
-}
-
-void Configurator::initStartCombo(int framesTotal, int currentFrame)
-{
-    k->framesTotal = framesTotal;
-    k->currentFrame = currentFrame;
-    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
-}
-
-void Configurator::setStartFrame(int currentIndex)
-{
-    k->currentFrame = currentIndex;
-    k->settingsPanel->setStartFrame(currentIndex);
-}
-
-int Configurator::startFrame()
-{
-    return k->settingsPanel->startFrame();
-}
-
-int Configurator::startComboSize()
-{
-    return k->settingsPanel->startComboSize();
-}
-
-QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame)
-{
-    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame);
-}
-
-int Configurator::totalSteps()
-{
-    return k->settingsPanel->totalSteps();
-}
-
-void Configurator::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->settingsPanel->activateMode(mode);
-}
-
-void Configurator::addTween(const QString &name)
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Add;
-    k->state = Properties;
-
-    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
-    activePropertiesPanel(true);
-
-    emit setMode(k->mode);
-}
-
-void Configurator::editTween()
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Edit;
-    k->state = Properties;
-
-    k->settingsPanel->notifySelection(true);
-    k->settingsPanel->setParameters(k->currentTween);
-    activePropertiesPanel(true);
-
-    emit setMode(k->mode);
-}
-
-void Configurator::removeTween()
-{
-    QString name = k->tweenManager->currentTweenName();
-    k->tweenManager->removeItemFromList();
-
-    removeTween(name);
-}
-
-void Configurator::removeTween(const QString &name)
-{
-    if (k->tweenManager->listSize() == 0)
-        activeButtonsPanel(false);
-
-    emit clickedRemoveTween(name);
-}
-
-QString Configurator::currentTweenName() const
-{
-    QString oldName = k->tweenManager->currentTweenName();
-    QString newName = k->settingsPanel->currentTweenName();
-
-    if (oldName.compare(newName) != 0)
-        k->tweenManager->updateTweenName(newName);
-
-    return newName;
-}
-
-void Configurator::notifySelection(bool flag)
-{
-    k->settingsPanel->notifySelection(flag);
-}
-
-void Configurator::closeTweenProperties()
-{
-    if (k->mode == TupToolPlugin::Add)
-        k->tweenManager->removeItemFromList();
-
-    emit clickedResetInterface();
-
-    closeSettingsPanel();
-}
-
-void Configurator::closeSettingsPanel()
-{
-    if (k->state == Properties) {
-        activeTweenManagerPanel(true);
-        activePropertiesPanel(false);
-        k->mode = TupToolPlugin::View;
-        k->state = Manager;
-    }
-}
-
-TupToolPlugin::Mode Configurator::mode()
-{
-    return k->mode;
-}
-
-void Configurator::applyItem()
-{
-     k->mode = TupToolPlugin::Edit;
-     emit clickedApplyTween();
-}
-
-void Configurator::resetUI()
-{
-    k->tweenManager->resetUI();
-    closeSettingsPanel();
-    k->settingsPanel->notifySelection(false);
-}
-
-void Configurator::updateTweenData(const QString &name)
-{
-    emit getTweenData(name);
-}
-
diff -Nru tupi-0.2+git04/src/plugins/tools/opacitytool/configurator.h tupi-0.2+git05/src/plugins/tools/opacitytool/configurator.h
--- tupi-0.2+git04/src/plugins/tools/opacitytool/configurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacitytool/configurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONFIGURATOR_H
-#define CONFIGURATOR_H
-
-#include "settings.h"
-#include <QFrame>
-
-class QGraphicsPathItem;
-class QListWidgetItem;
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Configurator : public QFrame
-{
-    Q_OBJECT
-
-    public:
-        enum GuiState { Manager = 1, Properties };
-
-        Configurator(QWidget *parent = 0);
-        ~Configurator();
-
-        void loadTweenList(QList<QString> tweenList);
-
-        void initStartCombo(int framesTotal, int currentFrame);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-
-        int totalSteps();
-        void activateMode(TupToolPlugin::EditMode mode);
-        void setCurrentTween(TupItemTweener *currentTween);
-        QString currentTweenName() const;
-        void notifySelection(bool flag);
-        int startComboSize();
-        void closeSettingsPanel();
-        TupToolPlugin::Mode mode();
-        void resetUI();
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame);
-        
-    private slots:
-        void applyItem();
-        void addTween(const QString &name);
-        void editTween();
-        void removeTween();
-        void removeTween(const QString &name);
-        void closeTweenProperties();
-        void updateTweenData(const QString &name);
-        
-    signals:
-        void startingPointChanged(int index);
-        void clickedSelect();
-        void clickedDefineProperties();
-        void clickedRemoveTween(const QString &name);
-        void setMode(TupToolPlugin::Mode mode);
-        void clickedApplyTween();
-        void clickedResetInterface();
-        void getTweenData(const QString &name);
-        
-    private:
-        void setPropertiesPanel();
-        void activePropertiesPanel(bool enable);
-        void setTweenManagerPanel();
-        void activeTweenManagerPanel(bool enable);
-        void setButtonsPanel();
-        void activeButtonsPanel(bool enable);
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/opacitytool/opacitytool.json tupi-0.2+git05/src/plugins/tools/opacitytool/opacitytool.json
--- tupi-0.2+git04/src/plugins/tools/opacitytool/opacitytool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacitytool/opacitytool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "OpacityTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/opacitytool/opacitytool.pro tupi-0.2+git05/src/plugins/tools/opacitytool/opacitytool.pro
--- tupi-0.2+git04/src/plugins/tools/opacitytool/opacitytool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacitytool/opacitytool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/opacitytool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += tweener.h \
-           configurator.h \
-           settings.h
-
-SOURCES += tweener.cpp \
-           configurator.cpp \
-           settings.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupiopacitytool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/opacitytool/settings.cpp tupi-0.2+git05/src/plugins/tools/opacitytool/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/opacitytool/settings.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacitytool/settings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,541 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "settings.h"
-#include "tdebug.h"
-#include "tradiobuttongroup.h"
-#include "tupitemtweener.h"
-#include "tuptweenerstep.h"
-#include "timagebutton.h"
-#include "tseparator.h"
-#include "tosd.h"
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QBoxLayout>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
-#include <QCheckBox>
-#include <QDir>
-
-struct Settings::Private
-{
-    QWidget *innerPanel;
-    QBoxLayout *layout;
-    TupToolPlugin::Mode mode;
-
-    QLineEdit *input;
-
-    QSpinBox *comboInit;
-    QSpinBox *comboEnd;
-
-    TRadioButtonGroup *options;
-
-    QDoubleSpinBox *comboInitFactor;
-    QDoubleSpinBox *comboEndFactor;
-
-    QSpinBox *comboIterations;
-
-    QCheckBox *loopBox;
-    QCheckBox *reverseLoopBox;
-
-    QLabel *totalLabel;
-    int totalSteps;
-
-    bool selectionDone;
-    bool propertiesDone;
-
-    TImageButton *apply;
-    TImageButton *remove;
-};
-
-Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    k->selectionDone = false;
-    k->totalSteps = 0;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    setFont(QFont("Arial", 8, QFont::Normal, false));
-
-    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
-    k->input = new QLineEdit;
-
-    QHBoxLayout *nameLayout = new QHBoxLayout;
-    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    nameLayout->setMargin(0);
-    nameLayout->setSpacing(0);
-    nameLayout->addWidget(nameLabel);
-    nameLayout->addWidget(k->input);
-
-    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
-    k->options->addItem(tr("Select object"), 0);
-    k->options->addItem(tr("Set Properties"), 1);
-    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
-
-    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
-    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
-
-    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
-    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    buttonsLayout->setMargin(0);
-    buttonsLayout->setSpacing(10);
-    buttonsLayout->addWidget(k->apply);
-    buttonsLayout->addWidget(k->remove);
-
-    k->layout->addLayout(nameLayout);
-    k->layout->addWidget(k->options);
-
-    setInnerForm();
-
-    k->layout->addSpacing(10);
-    k->layout->addLayout(buttonsLayout);
-    k->layout->setSpacing(5);
-
-    activateMode(TupToolPlugin::Selection);
-}
-
-Settings::~Settings()
-{
-    delete k;
-}
-
-void Settings::setInnerForm()
-{
-    k->innerPanel = new QWidget;
-
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
-    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
-    startingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboInit = new QSpinBox;
-    k->comboInit->setEnabled(false);
-    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(updateLastFrame()));
-
-    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
-    endingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboEnd = new QSpinBox;
-    k->comboEnd->setEnabled(true);
-    k->comboEnd->setValue(1);
-    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
-
-    QHBoxLayout *startLayout = new QHBoxLayout;
-    startLayout->setAlignment(Qt::AlignHCenter);
-    startLayout->setMargin(0);
-    startLayout->setSpacing(0);
-    startLayout->addWidget(startingLabel);
-    startLayout->addWidget(k->comboInit);
-
-    QHBoxLayout *endLayout = new QHBoxLayout;
-    endLayout->setAlignment(Qt::AlignHCenter);
-    endLayout->setMargin(0);
-    endLayout->setSpacing(0);
-    endLayout->addWidget(endingLabel);
-    endLayout->addWidget(k->comboEnd);
-
-    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
-    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    QHBoxLayout *totalLayout = new QHBoxLayout;
-    totalLayout->setAlignment(Qt::AlignHCenter);
-    totalLayout->setMargin(0);
-    totalLayout->setSpacing(0);
-    totalLayout->addWidget(k->totalLabel);
-
-    k->comboInitFactor = new QDoubleSpinBox;
-    k->comboInitFactor->setMinimum(0.00);
-    k->comboInitFactor->setMaximum(1.00);
-    k->comboInitFactor->setDecimals(2);
-    k->comboInitFactor->setSingleStep(0.05);
-    k->comboInitFactor->setValue(1.00);
-
-    QLabel *opacityInitLabel = new QLabel(tr("Initial Opacity") + ": ");
-    opacityInitLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *opacityInitLayout = new QHBoxLayout;
-    opacityInitLayout->setAlignment(Qt::AlignHCenter);
-    opacityInitLayout->setMargin(0);
-    opacityInitLayout->setSpacing(0);
-    opacityInitLayout->addWidget(opacityInitLabel);
-    opacityInitLayout->addWidget(k->comboInitFactor);
-
-    k->comboEndFactor = new QDoubleSpinBox;
-    k->comboEndFactor->setMinimum(0.00);
-    k->comboEndFactor->setMaximum(1.00);
-    k->comboEndFactor->setDecimals(2);
-    k->comboEndFactor->setSingleStep(0.05);
-    k->comboEndFactor->setValue(0.00);
-
-    QLabel *opacityEndLabel = new QLabel(tr("Ending Opacity") + ": ");
-    opacityEndLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *opacityEndLayout = new QHBoxLayout;
-    opacityEndLayout->setAlignment(Qt::AlignHCenter);
-    opacityEndLayout->setMargin(0);
-    opacityEndLayout->setSpacing(0);
-    opacityEndLayout->addWidget(opacityEndLabel);
-    opacityEndLayout->addWidget(k->comboEndFactor);
-
-    k->comboIterations = new QSpinBox;
-    k->comboIterations->setEnabled(true);
-    k->comboIterations->setMinimum(1);
-
-    QLabel *iterationsLabel = new QLabel(tr("Iterations") + ": ");
-    iterationsLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *iterationsLayout = new QHBoxLayout;
-    iterationsLayout->setAlignment(Qt::AlignHCenter);
-    iterationsLayout->setMargin(0);
-    iterationsLayout->setSpacing(0);
-    iterationsLayout->addWidget(iterationsLabel);
-    iterationsLayout->addWidget(k->comboIterations);
-
-    k->loopBox = new QCheckBox(tr("Loop"), k->innerPanel);
-    connect(k->loopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
-
-    QVBoxLayout *loopLayout = new QVBoxLayout;
-    loopLayout->setAlignment(Qt::AlignHCenter);
-    loopLayout->setMargin(0);
-    loopLayout->setSpacing(0);
-    loopLayout->addWidget(k->loopBox);
-
-    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->innerPanel);
-    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateLoopCheckbox(int)));
-
-    QVBoxLayout *reverseLayout = new QVBoxLayout;
-    reverseLayout->setAlignment(Qt::AlignHCenter);
-    reverseLayout->setMargin(0);
-    reverseLayout->setSpacing(0);
-    reverseLayout->addWidget(k->reverseLoopBox);
-
-    innerLayout->addLayout(startLayout);
-    innerLayout->addLayout(endLayout);
-    innerLayout->addLayout(totalLayout);
-
-    innerLayout->addSpacing(10);
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    innerLayout->addLayout(opacityInitLayout);
-    innerLayout->addLayout(opacityEndLayout);
-
-    innerLayout->addLayout(iterationsLayout);
-    innerLayout->addLayout(loopLayout);
-    innerLayout->addLayout(reverseLayout);
-
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    k->layout->addWidget(k->innerPanel);
-
-    activeInnerForm(false);
-}
-
-void Settings::activeInnerForm(bool enable)
-{
-    if (enable && !k->innerPanel->isVisible()) {
-        k->propertiesDone = true;
-        k->innerPanel->show();
-    } else {
-        k->propertiesDone = false;
-        k->innerPanel->hide();
-    }
-}
-
-void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
-{
-    k->mode = TupToolPlugin::Add;
-    k->input->setText(name);
-
-    activateMode(TupToolPlugin::Selection);
-    k->apply->setToolTip(tr("Save Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
-    k->remove->setToolTip(tr("Cancel Tween"));
-
-    initStartCombo(framesTotal, initFrame);
-}
-
-void Settings::setParameters(TupItemTweener *currentTween)
-{
-    setEditMode();
-    activateMode(TupToolPlugin::Properties);
-
-    k->input->setText(currentTween->name());
-
-    k->comboInit->setEnabled(true);
-    k->comboInit->setValue(currentTween->initFrame() + 1);
-    k->comboEnd->setValue(currentTween->initFrame() + currentTween->frames());
-
-    checkFramesRange();
-
-    k->comboInitFactor->setValue(currentTween->tweenOpacityInitialFactor());
-    k->comboEndFactor->setValue(currentTween->tweenOpacityEndingFactor());
-    k->comboIterations->setValue(currentTween->tweenOpacityIterations());
-    k->loopBox->setChecked(currentTween->tweenOpacityLoop());
-    k->reverseLoopBox->setChecked(currentTween->tweenOpacityReverseLoop());
-}
-
-void Settings::initStartCombo(int framesTotal, int currentIndex)
-{
-    k->comboInit->clear();
-    k->comboEnd->clear();
-
-    k->comboInit->setMinimum(1);
-    k->comboInit->setMaximum(framesTotal);
-    k->comboInit->setValue(currentIndex + 1);
-
-    k->comboEnd->setMinimum(1);
-    k->comboEnd->setValue(framesTotal);
-}
-
-void Settings::setStartFrame(int currentIndex)
-{
-    k->comboInit->setValue(currentIndex + 1);
-    int end = k->comboEnd->value();
-    if (end < currentIndex+1)
-        k->comboEnd->setValue(currentIndex + 1);
-}
-
-int Settings::startFrame()
-{
-    return k->comboInit->value() - 1;
-}
-
-int Settings::startComboSize()
-{
-    return k->comboInit->maximum();
-}
-
-int Settings::totalSteps()
-{
-    return k->comboEnd->value() - (k->comboInit->value() - 1);
-}
-
-void Settings::setEditMode()
-{
-    k->mode = TupToolPlugin::Edit;
-    k->apply->setToolTip(tr("Update Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
-    k->remove->setToolTip(tr("Close Tween properties"));
-}
-
-void Settings::applyTween()
-{
-    if (!k->selectionDone) {
-        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
-        return;
-    }
-
-    if (!k->propertiesDone) {
-        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
-        return;
-    }
-
-    // SQA: Verify Tween is really well applied before call setEditMode!
-    setEditMode();
-
-    if (!k->comboInit->isEnabled())
-        k->comboInit->setEnabled(true);
-
-    emit clickedApplyTween();
-}
-
-void Settings::notifySelection(bool flag)
-{
-    k->selectionDone = flag;
-}
-
-QString Settings::currentTweenName() const
-{
-    QString tweenName = k->input->text();
-    if (tweenName.length() > 0)
-        k->input->setFocus();
-
-    return tweenName;
-}
-
-void Settings::emitOptionChanged(int option)
-{
-    switch (option) {
-            case 0:
-             {
-                 activeInnerForm(false);
-                 emit clickedSelect();
-             }
-            break;
-            case 1:
-             {
-                 if (k->selectionDone) {
-                     activeInnerForm(true);
-                     emit clickedDefineProperties();
-                 } else {
-                     k->options->setCurrentIndex(0);
-                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
-                 }
-             }
-    }
-}
-
-QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame)
-{
-    QDomDocument doc;
-
-    QDomElement root = doc.createElement("tweening");
-    root.setAttribute("name", currentTweenName());
-    root.setAttribute("type", TupItemTweener::Opacity);
-    root.setAttribute("initFrame", currentFrame);
-    root.setAttribute("initLayer", currentLayer);
-    root.setAttribute("initScene", currentScene);
-  
-    checkFramesRange();
-    root.setAttribute("frames", k->totalSteps);
-    root.setAttribute("origin", "0,0");
-
-    double initFactor = k->comboInitFactor->value();
-    root.setAttribute("initOpacityFactor", initFactor);
-
-    double endFactor = k->comboEndFactor->value();
-    root.setAttribute("endOpacityFactor", endFactor);
-
-    int iterations = k->comboIterations->value();
-    if (iterations == 0) {
-        iterations = 1;
-        k->comboIterations->setValue(1);
-    }
-    root.setAttribute("opacityIterations", iterations);
-
-    bool loop = k->loopBox->isChecked();
-    if (loop)
-        root.setAttribute("opacityLoop", "1");
-    else
-        root.setAttribute("opacityLoop", "0");
-
-    bool reverse = k->reverseLoopBox->isChecked();
-    if (reverse)
-        root.setAttribute("opacityReverseLoop", "1");
-    else
-        root.setAttribute("opacityReverseLoop", "0");
-
-    double delta = (double)(initFactor - endFactor)/(double)(iterations - 1);
-    double reference = 0;
-
-    int cycle = 1;
-    int reverseTop = (iterations*2)-2;
-
-    for (int i=0; i < k->totalSteps; i++) {
-         if (cycle <= iterations) {
-             if (cycle == 1) {
-                 reference = initFactor;
-             } else if (cycle == iterations) {
-                        reference = endFactor;
-             } else {
-                 reference -= delta;
-             }
-             cycle++;
-         } else {
-             // if repeat option is enabled
-             if (loop) {
-                 cycle = 2;
-                 reference = initFactor;
-             } else if (reverse) { // if reverse option is enabled
-                        reference += delta;
-
-                        if (cycle < reverseTop)
-                            cycle++;
-                        else
-                            cycle = 1;
-
-             } else { // If cycle is done and no loop and no reverse
-                 reference = initFactor;
-             }
-         }
-
-         TupTweenerStep *step = new TupTweenerStep(i);
-         step->setOpacity(reference);
-         root.appendChild(step->toXml(doc));
-    }
-
-    doc.appendChild(root);
-
-    return doc.toString();
-}
-
-void Settings::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->options->setCurrentIndex(mode);
-}
-
-void Settings::updateLastFrame()
-{
-    int end = k->comboInit->value() + k->totalSteps - 1;
-    k->comboEnd->setValue(end);
-}
-
-void Settings::checkTopLimit(int index)
-{
-    Q_UNUSED(index);
-    checkFramesRange();
-}
-
-void Settings::checkFramesRange()
-{
-    int begin = k->comboInit->value();
-    int end = k->comboEnd->value();
-
-    if (begin > end) {
-        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
-        end = k->comboEnd->value();
-    }
-
-    k->totalSteps = end - begin + 1;
-    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
-}
-
-void Settings::updateLoopCheckbox(int state)
-{
-    Q_UNUSED(state);
-
-    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
-        k->loopBox->setChecked(false);
-}
-
-void Settings::updateReverseCheckbox(int state)
-{
-    Q_UNUSED(state);
-
-    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
-        k->reverseLoopBox->setChecked(false);
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/opacitytool/settings.h tupi-0.2+git05/src/plugins/tools/opacitytool/settings.h
--- tupi-0.2+git04/src/plugins/tools/opacitytool/settings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacitytool/settings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
-#include "tuptoolplugin.h"
-#include <QWidget>
-
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Settings : public QWidget 
-{
-    Q_OBJECT
-
-    public:
-        Settings(QWidget *parent = 0);
-        ~Settings();
-
-        void setParameters(const QString &name, int framesTotal, int startFrame);
-        void setParameters(TupItemTweener *currentTween);
-        void initStartCombo(int totalFrames, int currentIndex);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-
-        int totalSteps();
-
-        QString currentTweenName() const;
-        void activateMode(TupToolPlugin::EditMode mode);
-        void notifySelection(bool flag);
-        int startComboSize();
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame);
-
-    private slots:
-        void applyTween();
-        void emitOptionChanged(int option);
-        void checkTopLimit(int index);
-        void updateLoopCheckbox(int state);
-        void updateReverseCheckbox(int state);
-        void updateLastFrame();
-        
-    signals:
-        void clickedSelect();
-        void clickedDefineProperties();
-        void clickedApplyTween();
-        void clickedResetTween();
-        void startingPointChanged(int index);
-        
-    private:
-        void setInnerForm();
-        void activeInnerForm(bool enable);
-        void setEditMode();
-        void checkFramesRange();
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/opacitytool/tweener.cpp tupi-0.2+git05/src/plugins/tools/opacitytool/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/opacitytool/tweener.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacitytool/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,563 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tweener.h"
-#include "configurator.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "taction.h"
-#include "tosd.h"
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicsscene.h"
-#include "tupgraphicobject.h"
-#include "tupsvgitem.h"
-#include "tupitemtweener.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QMatrix>
-#include <QGraphicsView>
-#include <QDomDocument>
-#include <QDir>
-
-struct Tweener::Private
-{
-    QMap<QString, TAction *> actions;
-    Configurator *configurator;
-
-    TupGraphicsScene *scene;
-    QList<QGraphicsItem *> objects;
-
-    TupItemTweener *currentTween;
-    int initFrame;
-    int initLayer;
-    int initScene;
-
-    TupToolPlugin::Mode mode;
-    TupToolPlugin::EditMode editMode;
-};
-
-Tweener::Tweener() : TupToolPlugin(), k(new Private)
-{
-    setupActions();
-
-    k->configurator = 0;
-    k->initFrame = 0;
-}
-
-Tweener::~Tweener()
-{
-    delete k;
-}
-
-/* This method initializes the plugin */
-
-void Tweener::init(TupGraphicsScene *scene)
-{
-    k->scene = scene;
-    k->objects.clear();
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-
-    k->configurator->resetUI();
-
-    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Opacity);
-    if (tweenList.size() > 0) {
-        k->configurator->loadTweenList(tweenList);
-        setCurrentTween(tweenList.at(0));
-    }
-
-    int total = framesTotal();
-    k->configurator->initStartCombo(total, k->initFrame);
-}
-
-void Tweener::updateStartPoint(int index)
-{
-     if (k->initFrame != index && index >= 0)
-         k->initFrame = index;
-}
-
-/* This method returns the plugin name */
-
-QStringList Tweener::keys() const
-{
-    return QStringList() << tr("Opacity Tween");
-}
-
-/* This method makes an action when the mouse is pressed on the workspace 
- * depending on the active mode: Selecting an object or Creating a path  
-*/
-
-void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method is executed while the mouse is pressed and on movement */
-
-void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method finishes the action started on the press method depending
- * on the active mode: Selecting an object or Creating a path
-*/
-
-void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (scene->currentFrameIndex() == k->initFrame) {
-        if (k->editMode == TupToolPlugin::Selection) {
-            if (scene->selectedItems().size() > 0) {
-                k->objects = scene->selectedItems();
-                k->configurator->notifySelection(true);
-            }
-        }
-    }
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-QMap<QString, TAction *> Tweener::actions() const
-{
-    return k->actions;
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-int Tweener::toolType() const
-{
-    return TupToolInterface::Tweener;
-}
-
-/* This method returns the tool panel associated to this plugin */
-
-QWidget *Tweener::configurator()
-{
-    if (!k->configurator) {
-        k->mode = TupToolPlugin::View;
-
-        k->configurator = new Configurator;
-        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
-        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
-        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
-        connect(k->configurator, SIGNAL(clickedDefineProperties()), this, SLOT(setPropertiesMode()));
-        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
-        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode))); 
-        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
-        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    } 
-
-    return k->configurator;
-}
-
-/* This method is called when there's a change on/of scene */
-void Tweener::aboutToChangeScene(TupGraphicsScene *)
-{
-}
-
-/* This method is called when this plugin is off */
-
-void Tweener::aboutToChangeTool()
-{
-}
-
-/* This method defines the actions contained in this plugin */
-
-void Tweener::setupActions()
-{
-    TAction *action = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "opacity_tween.png"), 
-                                      tr("Opacity Tween"), this);
-    action->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
-    action->setShortcut(QKeySequence(tr("Shift+O")));
-
-    k->actions.insert(tr("Opacity Tween"), action);
-}
-
-/* This method saves the settings of this plugin */
-
-void Tweener::saveConfig()
-{
-}
-
-/* This method updates the workspace when the plugin changes the scene */
-
-void Tweener::updateScene(TupGraphicsScene *scene)
-{
-    k->mode = k->configurator->mode();
-
-    if (k->mode == TupToolPlugin::Edit) {
-        int framesNumber = framesTotal();
-
-        if (k->configurator->startComboSize() < framesNumber)
-            k->configurator->initStartCombo(framesNumber, k->initFrame);
-    } else if (k->mode == TupToolPlugin::Add) {
-               int total = framesTotal();
-
-               if (k->editMode == TupToolPlugin::Properties) {
-                   if (total > k->configurator->startComboSize()) {
-                       k->configurator->activateMode(TupToolPlugin::Selection);
-                       clearSelection();
-                       setSelection();
-                   }
-               } else if (k->editMode == TupToolPlugin::Selection) {
-                          if (scene->currentFrameIndex() != k->initFrame)
-                              clearSelection();
-                          k->initFrame = scene->currentFrameIndex();
-                          setSelection();
-               }
-
-               if (k->configurator->startComboSize() < total) {
-                   k->configurator->initStartCombo(total, k->initFrame);
-               } else {
-                   if (scene->currentFrameIndex() != k->initFrame)
-                       k->configurator->setStartFrame(scene->currentFrameIndex());
-               }
-
-    } else {
-        if (scene->currentFrameIndex() != k->initFrame)
-            k->configurator->setStartFrame(scene->currentFrameIndex());
-    }
-}
-
-void Tweener::setCurrentTween(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    k->currentTween = scene->tween(name, TupItemTweener::Opacity);
-    if (k->currentTween)
-        k->configurator->setCurrentTween(k->currentTween);
-}
-
-int Tweener::framesTotal()
-{
-    int total = 1;
-    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
-    if (layer)
-        total = layer->framesTotal();
-
-    return total;
-}
-
-/* This method clears selection */
-
-void Tweener::clearSelection()
-{
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 if (item->isSelected())
-                     item->setSelected(false);
-        }
-        k->objects.clear();
-        k->configurator->notifySelection(false);
-    }
-}
-
-/* This method disables object selection */
-
-void Tweener::disableSelection()
-{
-    foreach (QGraphicsView *view, k->scene->views()) {
-             view->setDragMode (QGraphicsView::NoDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-void Tweener::setSelection()
-{
-    k->editMode = TupToolPlugin::Selection;
-
-    int bottomBoundary = 20000 + (k->initLayer*10000);
-    int topBoundary = bottomBoundary + 10000;
-
-    foreach (QGraphicsView *view, k->scene->views()) {
-             view->setDragMode(QGraphicsView::RubberBandDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
-                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-             }
-    }
-
-    // When Object selection is enabled, previous selection is set
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                 item->setSelected(true);
-        }
-        k->configurator->notifySelection(true);
-    }
-}
-
-void Tweener::setPropertiesMode()
-{
-    k->editMode = TupToolPlugin::Properties;
-    disableSelection();
-}
-
-/* This method resets this plugin */
-
-void Tweener::applyReset()
-{
-    disableSelection();
-    clearSelection();
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-}
-
-/* This method applies to the project, the Tween created from this plugin */
-
-void Tweener::applyTween()
-{
-    QString name = k->configurator->currentTweenName();
-
-    if (name.length() == 0) {
-        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
-        return;
-    }
-
-    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Opacity)) {
-        k->initFrame = k->scene->currentFrameIndex();
-        k->initLayer = k->scene->currentLayerIndex();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 int objectIndex = -1;
-
-                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = k->scene->currentFrame()->indexOf(svg);
-                 } else {
-                     objectIndex = k->scene->currentFrame()->indexOf(item);
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex, QPointF(), k->scene->spaceMode(), 
-                                             type, TupProjectRequest::SetTween,
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame));
-                 emit requested(&request);
-        }
-    } else {
-        removeTweenFromProject(name);
-        QList<QGraphicsItem *> newList;
-
-        k->initFrame = k->configurator->startFrame();
-        k->initLayer = k->currentTween->initLayer();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 TupProject *project = k->scene->scene()->project();
-                 TupScene *scene = project->scene(k->initScene);
-                 TupLayer *layer = scene->layer(k->initLayer);
-                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
-                 int objectIndex = -1;
-                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
-
-                 if (svg) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = frame->indexOf(svg);
-                 } else {
-                     objectIndex = frame->indexOf(item);
-                 }
-
-                 if (k->initFrame != k->currentTween->initFrame()) {
-                     QDomDocument dom;
-                     if (type == TupLibraryObject::Svg)
-                         dom.appendChild(svg->toXml(dom));
-                     else
-                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
-
-                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame,
-                                                                                      0, QPointF(), k->scene->spaceMode(),
-                                                                                      type, TupProjectRequest::Add,
-                                                                                      dom.toString());
-                     emit requested(&request);
-
-                     request = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(),
-                                                                   k->scene->currentLayerIndex(),
-                                                                   k->currentTween->initFrame(),
-                                                                   objectIndex, QPointF(),    
-                                                                   k->scene->spaceMode(), type,
-                                                                   TupProjectRequest::Remove);
-                     emit requested(&request);
-
-                     frame = layer->frame(k->initFrame);
-                     if (type == TupLibraryObject::Item) {
-                         objectIndex = frame->graphicItemsCount() - 1;
-                         newList.append(frame->graphic(objectIndex)->item());
-                     } else {
-                         objectIndex = frame->svgItemsCount() - 1;
-                         newList.append(frame->svg(objectIndex));
-                     }
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex, QPointF(), k->scene->spaceMode(), 
-                                             type, TupProjectRequest::SetTween, 
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame));
-                 emit requested(&request);
-        }
-
-        if (newList.size() > 0)
-            k->objects = newList;
-    }
-
-    int total = k->initFrame + k->configurator->totalSteps();
-    int framesNumber = framesTotal();
-    int layersTotal = k->scene->scene()->layersTotal();
-    TupProjectRequest request;
-
-    if (total >= framesNumber) {
-        for (int i = framesNumber; i < total; i++) {
-             for (int j = 0; j < layersTotal; j++) {
-                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i,
-                                                                  TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
-                  emit requested(&request);
-             }
-        }
-    }
-
-    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
-                                                    TupProjectRequest::Select, "1");
-    emit requested(&request);
-
-    setCurrentTween(name);
-    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
-}
-
-void Tweener::removeTweenFromProject(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    scene->removeTween(name, TupItemTweener::Opacity);
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      QString tip = item->toolTip();
-                      if (tip.startsWith(tr("Opacity Tween") + ": " + name))
-                          item->setToolTip("");
-             }
-    }
-}
-
-void Tweener::removeTween(const QString &name)
-{
-    removeTweenFromProject(name);
-    applyReset();
-}
-
-void Tweener::updateMode(TupToolPlugin::Mode mode)
-{
-    k->mode = mode;
-
-    if (k->mode == TupToolPlugin::Edit) {
-        k->initScene = k->currentTween->initScene();
-        k->initLayer = k->currentTween->initLayer();
-        k->initFrame = k->currentTween->initFrame();
-
-        if (k->initFrame != k->scene->currentFrameIndex() || k->initLayer != k->scene->currentLayerIndex()) {
-            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame, 
-                                                                              TupProjectRequest::Select, "1");
-            emit requested(&request);
-
-            if (k->objects.isEmpty())
-                k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Opacity);
-        }
-    }
-}
-
-void Tweener::sceneResponse(const TupSceneResponse *event)
-{
-    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
-        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
-        init(k->scene);
-    }
-
-    if (event->action() == TupProjectRequest::Select)
-        init(k->scene);
-}
-
-void Tweener::layerResponse(const TupLayerResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove)
-        init(k->scene);
-}
-
-void Tweener::frameResponse(const TupFrameResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
-        init(k->scene);
-
-    if (event->action() == TupProjectRequest::Select) {
-        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
-            init(k->scene);
-    }
-}
-
-Q_EXPORT_PLUGIN2(tup_tweener, Tweener);
diff -Nru tupi-0.2+git04/src/plugins/tools/opacitytool/tweener.h tupi-0.2+git05/src/plugins/tools/opacitytool/tweener.h
--- tupi-0.2+git04/src/plugins/tools/opacitytool/tweener.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/opacitytool/tweener.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef OPACITYTWEENER_H
-#define OPACITYTWEENER_H
-
-#include "tuptoolplugin.h"
-#include "settings.h"
-#include "tupprojectresponse.h"
-
-/**
- * @author Gustav Gonzalez 
- * 
-*/
-
-class Tweener : public TupToolPlugin
-{
-    Q_OBJECT
-
-    public:
-        Tweener();
-        virtual ~Tweener();
-        virtual void init(TupGraphicsScene *scene);
-
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-        virtual QWidget *configurator();
-
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-
-        virtual void updateScene(TupGraphicsScene *scene);
-        virtual void saveConfig();
-
-        virtual void sceneResponse(const TupSceneResponse *event);
-        virtual void layerResponse(const TupLayerResponse *event);
-        virtual void frameResponse(const TupFrameResponse *event);
-
-    private:
-        void setupActions();
-        int framesTotal();
-        void clearSelection();
-        void disableSelection();
-        void removeTweenFromProject(const QString &name);
-
-    private:
-        struct Private;
-        Private *const k;
-
-    private slots:
-        void setCurrentTween(const QString &name);
-        void setSelection();
-        void setPropertiesMode(); 
-        void updateMode(TupToolPlugin::Mode mode);
-        void updateStartPoint(int index);
-        void applyReset();
-        void applyTween();
-        void removeTween(const QString &name);
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/buttonspanel.cpp tupi-0.2+git05/src/plugins/tools/papagayo/buttonspanel.cpp
--- tupi-0.2+git04/src/plugins/tools/papagayo/buttonspanel.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/buttonspanel.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,63 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "buttonspanel.h"
+
+ButtonsPanel::ButtonsPanel(QWidget *parent) : QWidget(parent)
+{
+    TImageButton *editButton = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "tweening.png"), 22);
+    editButton->setToolTip(tr("Edit Tween"));
+    connect(editButton, SIGNAL(clicked()), this, SIGNAL(clickedEditTween()));
+
+    TImageButton *removeButton = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "minus_sign.png"), 22);
+    removeButton->setToolTip(tr("Remove Tween"));
+    connect(removeButton, SIGNAL(clicked()), this, SIGNAL(clickedRemoveTween()));
+
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QHBoxLayout *controlLayout = new QHBoxLayout;
+    controlLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    controlLayout->setMargin(1);
+    controlLayout->setSpacing(5);
+    controlLayout->addWidget(editButton);
+    controlLayout->addWidget(removeButton);
+
+    layout->addLayout(controlLayout);
+}
+
+ButtonsPanel::~ButtonsPanel()
+{
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/buttonspanel.h tupi-0.2+git05/src/plugins/tools/papagayo/buttonspanel.h
--- tupi-0.2+git04/src/plugins/tools/papagayo/buttonspanel.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/buttonspanel.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,67 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef BUTTONSPANEL_H
+#define BUTTONSPANEL_H
+
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+#include "timagebutton.h"
+
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QBoxLayout>
+#include <QDir>
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN ButtonsPanel: public QWidget 
+{
+    Q_OBJECT
+
+    public:
+
+        ButtonsPanel(QWidget *parent = 0);
+        ~ButtonsPanel();
+
+    signals:
+        void clickedEditTween();
+        void clickedRemoveTween();
+        
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/configurator.cpp tupi-0.2+git05/src/plugins/tools/papagayo/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/papagayo/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,156 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+#include "lipsyncmanager.h"
+
+struct Configurator::Private
+{
+    QBoxLayout *settingsLayout;
+    Settings *settingsPanel;
+    LipSyncManager *manager;
+};
+
+Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
+{
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    QLabel *title = new QLabel(tr("Papagayo LipSync Files"));
+    title->setAlignment(Qt::AlignHCenter);
+    title->setFont(QFont("Arial", 8, QFont::Bold));
+
+    layout->addWidget(title);
+
+    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    k->settingsLayout->setMargin(0);
+    k->settingsLayout->setSpacing(0);
+
+    setLipSyncManagerPanel();
+    setPropertiesPanel();
+
+    layout->addLayout(k->settingsLayout);
+    layout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    delete k;
+}
+
+void Configurator::loadLipSyncList(QList<QString> list)
+{
+    k->manager->loadLipSyncList(list);
+}
+
+void Configurator::setPropertiesPanel()
+{
+    k->settingsPanel = new Settings(this);
+    connect(k->settingsPanel, SIGNAL(selectMouth(const QString &, int)), this, SIGNAL(selectMouth(const QString &, int)));
+    connect(k->settingsPanel, SIGNAL(closeLipSyncProperties()), this, SLOT(closeSettingsPanel())); 
+    connect(k->settingsPanel, SIGNAL(initFrameHasChanged(int)), this, SIGNAL(initFrameHasChanged(int)));
+
+    k->settingsLayout->addWidget(k->settingsPanel);
+
+    activePropertiesPanel(false);
+}
+
+void Configurator::activePropertiesPanel(bool enable)
+{
+    if (enable)
+        k->settingsPanel->show();
+    else
+        k->settingsPanel->hide();
+}
+
+void Configurator::setLipSyncManagerPanel()
+{
+    k->manager = new LipSyncManager(this);
+    connect(k->manager, SIGNAL(importLipSync()), this, SIGNAL(importLipSync()));
+    connect(k->manager, SIGNAL(editCurrentLipSync(const QString &)), this, SLOT(editCurrentLipSync(const QString &)));
+    connect(k->manager, SIGNAL(removeCurrentLipSync(const QString &)), this, SIGNAL(removeCurrentLipSync(const QString &)));
+
+    k->settingsLayout->addWidget(k->manager);
+}
+
+void Configurator::activeLipSyncManagerPanel(bool enable)
+{
+    if (enable)
+        k->manager->show();
+    else
+        k->manager->hide();
+}
+
+void Configurator::addLipSyncRecord(const QString &name)
+{
+    k->manager->addNewRecord(name);
+}
+
+void Configurator::editCurrentLipSync(const QString &name)
+{
+    emit editLipSyncSelection(name);
+
+    activeLipSyncManagerPanel(false);
+    activePropertiesPanel(true);
+}
+
+void Configurator::openLipSyncProperties(TupLipSync *lipsync)
+{
+    k->settingsPanel->openLipSyncProperties(lipsync);
+}
+
+void Configurator::resetUI()
+{
+    k->manager->resetUI();
+    closeSettingsPanel();
+}
+
+void Configurator::closeSettingsPanel()
+{
+    emit closeLipSyncProperties();
+    closePanels();
+}
+
+void Configurator::closePanels()
+{
+    activeLipSyncManagerPanel(true);
+    activePropertiesPanel(false);
+}
+
+void Configurator::updateInterfaceRecords()
+{
+    k->settingsPanel->updateInterfaceRecords();
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/configurator.h tupi-0.2+git05/src/plugins/tools/papagayo/configurator.h
--- tupi-0.2+git04/src/plugins/tools/papagayo/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,95 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "tglobal.h"
+#include "settings.h"
+
+#include <QFrame>
+#include <QLabel>
+#include <QBoxLayout>
+#include <QListWidgetItem>
+
+class TupLipSync;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Configurator : public QFrame
+{
+    Q_OBJECT
+
+    public:
+        enum GuiState { Manager = 1, Properties };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+
+        void loadLipSyncList(QList<QString> list);
+        void openLipSyncProperties(TupLipSync *lipsync);
+
+        void addLipSyncRecord(const QString &name);
+        void updateInterfaceRecords();
+
+        void resetUI();
+        void closePanels();
+
+    private slots:
+        void editCurrentLipSync(const QString &name);
+        void closeSettingsPanel();
+        
+    signals:
+        void importLipSync();
+        void selectMouth(const QString &name, int index);
+        void closeLipSyncProperties();
+        void editLipSyncSelection(const QString &lipSyncName);
+        // void updateLipSyncSelection(const QString &lipSyncName);
+        void initFrameHasChanged(int index);
+        void removeCurrentLipSync(const QString &name);
+        
+    private:
+        void setPropertiesPanel();
+        void activePropertiesPanel(bool enable);
+        void setLipSyncManagerPanel();
+        void activeLipSyncManagerPanel(bool enable);
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/lipsyncmanager.cpp tupi-0.2+git05/src/plugins/tools/papagayo/lipsyncmanager.cpp
--- tupi-0.2+git04/src/plugins/tools/papagayo/lipsyncmanager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/lipsyncmanager.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,174 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "lipsyncmanager.h"
+
+struct LipSyncManager::Private
+{
+    QListWidget *lipSyncList;
+    TImageButton *addButton;
+    TImageButton *editButton;
+    TImageButton *delButton;
+
+    QString target;
+};
+
+LipSyncManager::LipSyncManager(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QFont f = font();
+    f.setPointSize(8);
+    setFont(f);
+
+    QBoxLayout *listLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    listLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    k->lipSyncList = new QListWidget;
+    k->lipSyncList->setContextMenuPolicy(Qt::CustomContextMenu);
+    k->lipSyncList->setViewMode(QListView::ListMode);
+    k->lipSyncList->setFlow(QListView::TopToBottom);
+    k->lipSyncList->setMovement(QListView::Static);
+    k->lipSyncList->setFixedHeight(68);
+
+    listLayout->addWidget(k->lipSyncList);
+
+    k->addButton = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "plus_sign.png"), 22);
+    k->addButton->setToolTip(tr("Import LipSync"));
+    connect(k->addButton, SIGNAL(clicked()), this, SIGNAL(importLipSync()));
+
+    k->editButton = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "edit_sign.png"), 22);
+    k->editButton->setToolTip(tr("Edit LipSync"));
+    connect(k->editButton, SIGNAL(clicked()), this, SLOT(editLipSync()));
+
+    k->delButton = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "minus_sign.png"), 22);
+    k->delButton->setToolTip(tr("Remove LipSync"));
+    connect(k->delButton, SIGNAL(clicked()), this, SLOT(removeLipSync()));
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    buttonLayout->setAlignment(Qt::AlignHCenter);
+    buttonLayout->setMargin(0);
+    buttonLayout->setSpacing(0);
+    buttonLayout->addWidget(k->addButton);
+    buttonLayout->addWidget(k->editButton);
+    buttonLayout->addWidget(k->delButton);
+
+    layout->addLayout(listLayout);
+    layout->addLayout(buttonLayout);
+}
+
+LipSyncManager::~LipSyncManager()
+{
+}
+
+void LipSyncManager::loadLipSyncList(QList<QString> list)
+{
+    k->lipSyncList->clear();
+    QFont f = font();
+    f.setPointSize(8);
+
+    int total = list.size();
+    for (int i=0; i < total; i++) {
+        QListWidgetItem *item = new QListWidgetItem(k->lipSyncList);
+        item->setFont(f);
+        item->setText(list.at(i));
+        item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+    }
+
+    k->lipSyncList->setCurrentRow(0);
+}
+
+bool LipSyncManager::itemExists(const QString &name)
+{
+    for (int i=0; i < k->lipSyncList->count(); i++) {
+         QListWidgetItem *item = k->lipSyncList->item(i);
+         if (name.compare(item->text()) == 0)
+             return true;
+    }
+
+     return false;
+}
+
+void LipSyncManager::editLipSync()
+{
+    if (k->lipSyncList->count() > 0) {
+        QListWidgetItem *item = k->lipSyncList->currentItem();
+        if (item)
+            emit editCurrentLipSync(item->text());
+    }
+}
+
+void LipSyncManager::removeLipSync()
+{
+    if (k->lipSyncList->count() > 0) {
+        QListWidgetItem *item = k->lipSyncList->currentItem();
+        if (item) {
+            k->lipSyncList->takeItem(k->lipSyncList->row(item));
+            k->target = item->text();
+            emit removeCurrentLipSync(k->target);
+        }
+    }
+}
+
+void LipSyncManager::resetUI()
+{
+    if (k->lipSyncList->count() > 0)
+        k->lipSyncList->clear();
+}
+
+QString LipSyncManager::currentLipSyncName() const
+{
+    QListWidgetItem *item = k->lipSyncList->currentItem();
+    return item->text();
+}
+
+int LipSyncManager::listSize()
+{
+    return k->lipSyncList->count();
+}
+
+void LipSyncManager::addNewRecord(const QString &name)
+{
+    QFont f = font();
+    f.setPointSize(8);
+
+    QListWidgetItem *item = new QListWidgetItem(k->lipSyncList);
+    item->setFont(f);
+    item->setText(name);
+    item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    k->lipSyncList->setCurrentItem(item);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/lipsyncmanager.h tupi-0.2+git05/src/plugins/tools/papagayo/lipsyncmanager.h
--- tupi-0.2+git04/src/plugins/tools/papagayo/lipsyncmanager.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/lipsyncmanager.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,85 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef LIPSYNCMANAGER_H
+#define LIPSYNCMANAGER_H
+
+#include "tglobal.h"
+#include "timagebutton.h"
+#include "tosd.h"
+
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QBoxLayout>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QMenu>
+#include <QDir>
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN LipSyncManager: public QWidget 
+{
+    Q_OBJECT
+
+    public:
+        LipSyncManager(QWidget *parent = 0);
+        ~LipSyncManager();
+        void loadLipSyncList(QList<QString> list);
+        void resetUI();
+        QString currentLipSyncName() const;
+        int listSize(); 
+        void addNewRecord(const QString &name);
+
+    signals:
+        void importLipSync();
+        void editCurrentLipSync(const QString &name);
+        void removeCurrentLipSync(const QString &name);
+
+    private slots:
+        void editLipSync();
+        void removeLipSync();
+
+    private:
+        bool itemExists(const QString &name);
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/mouthtarget.cpp tupi-0.2+git05/src/plugins/tools/papagayo/mouthtarget.cpp
--- tupi-0.2+git04/src/plugins/tools/papagayo/mouthtarget.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/mouthtarget.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,123 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "mouthtarget.h"
+
+/**
+ * This class defines the data structure for a node, and all the methods required to manipulate it.
+ * 
+ * @author Gustav Gonzalez 
+*/
+
+MouthTarget::MouthTarget(const QPointF & pos, int zLevel) : QGraphicsItem(0)
+{
+    QGraphicsItem::setCursor(QCursor(Qt::PointingHandCursor));
+    setFlag(ItemIsSelectable, false);
+    setFlag(ItemIsMovable, true);
+    setFlag(ItemIsFocusable, true);
+
+    setZValue(zLevel);
+    setPos(pos);
+}
+
+MouthTarget::~MouthTarget()
+{
+}
+
+void MouthTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *w)
+{
+    Q_UNUSED(w);
+    Q_UNUSED(option);
+    
+    QColor color;
+    color = QColor("green");
+    color.setAlpha(200);
+
+    QRectF square = boundingRect();
+    painter->setBrush(color);
+    painter->drawRoundRect(square);
+
+    painter->save();
+    color = QColor("white");
+    color.setAlpha(220); 
+    painter->setPen(color);
+    QPointF point1 = QPointF(square.topLeft().x() + 3, square.topLeft().y() + 3); 
+    QPointF point2 = QPointF(square.bottomRight().x() - 3, square.bottomRight().y() - 3);
+    QPointF point3 = QPointF(square.bottomLeft().x() + 3, square.bottomLeft().y() - 3);
+    QPointF point4 = QPointF(square.topRight().x() - 3, square.topRight().y() + 3);
+
+    painter->drawLine(point1, point2);
+    painter->drawLine(point3, point4);
+    painter->restore();
+}
+
+QRectF MouthTarget::boundingRect() const
+{
+    QSizeF size(10, 10);
+    QRectF rect(QPointF(-size.width()/2, -size.height()/2), size);
+
+    return rect;
+}
+
+void MouthTarget::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsItem::mousePressEvent(event);
+}
+
+void MouthTarget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[MouthTarget::mouseReleaseEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    emit positionUpdated(pos());
+
+    QGraphicsItem::mouseReleaseEvent(event);
+}
+
+void MouthTarget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsItem::mouseMoveEvent(event);
+}
+
+QPointF MouthTarget::currentPos()
+{
+    QPointF xy = pos();
+    return xy;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/mouthtarget.h tupi-0.2+git05/src/plugins/tools/papagayo/mouthtarget.h
--- tupi-0.2+git04/src/plugins/tools/papagayo/mouthtarget.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/mouthtarget.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,82 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef MOUTHTARGET_H
+#define MOUTHTARGET_H
+
+#include "tglobal.h"
+#include "tupgraphicalgorithm.h"
+#include "tupgraphicobject.h"
+
+#include <QGraphicsItem>
+#include <QObject>
+#include <QPointF>
+#include <QCursor>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QStyleOption>
+#include <QStyleOptionButton>
+#include <QApplication>
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN MouthTarget : public QObject, public QGraphicsItem
+// class TUPI_PLUGIN MouthTarget : public QGraphicsItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsItem)
+    
+    public: 
+        MouthTarget(const QPointF & pos = QPoint(0,0), int zLevel = 0);
+        ~MouthTarget();
+        
+        void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *);
+        QRectF boundingRect() const;
+
+        QPointF currentPos();
+
+    signals:
+        void positionUpdated(const QPointF &point);
+        
+    protected:
+        void mousePressEvent(QGraphicsSceneMouseEvent *event);
+        void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+        void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/papagayo.pro tupi-0.2+git05/src/plugins/tools/papagayo/papagayo.pro
--- tupi-0.2+git04/src/plugins/tools/papagayo/papagayo.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/papagayo.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,45 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += mouthtarget.h \
+           settings.h \
+           buttonspanel.h \
+           configurator.h \
+           lipsyncmanager.h \
+           papagayotool.h 
+
+SOURCES += mouthtarget.cpp \
+           settings.cpp \
+           buttonspanel.cpp \
+           configurator.cpp \
+           lipsyncmanager.cpp \
+           papagayotool.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupipapagayotool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+# COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+# include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/papagayotool.cpp tupi-0.2+git05/src/plugins/tools/papagayo/papagayotool.cpp
--- tupi-0.2+git04/src/plugins/tools/papagayo/papagayotool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/papagayotool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,359 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "papagayotool.h"
+#include "configurator.h"
+#include "mouthtarget.h"
+#include "taction.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicsscene.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tupscene.h"
+
+struct PapagayoTool::Private
+{
+    QMap<QString, TAction *> actions;
+    Configurator *configurator;
+
+    TupGraphicsScene *scene;
+
+    TupLipSync *currentLipSync;
+    int initScene;
+
+    QPointF origin;
+    MouthTarget *target;
+
+    TupToolPlugin::Mode mode;
+
+    int baseZValue;
+
+    QGraphicsItem *mouth;
+    QPointF mouthOffset;
+    QString currentMouth;
+    int currentMouthIndex;
+};
+
+PapagayoTool::PapagayoTool() : TupToolPlugin(), k(new Private)
+{
+    setupActions();
+    k->configurator = 0;
+    k->target = 0;
+}
+
+PapagayoTool::~PapagayoTool()
+{
+    delete k;
+}
+
+/* This method initializes the plugin */
+
+void PapagayoTool::init(TupGraphicsScene *scene)
+{
+    k->scene = scene;
+    k->mode = TupToolPlugin::View;
+    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
+
+    k->initScene = k->scene->currentSceneIndex();
+
+    removeTarget();
+
+    k->configurator->resetUI();
+
+    QList<QString> lipSyncList = k->scene->scene()->getLipSyncNames();
+    if (lipSyncList.size() > 0)
+        k->configurator->loadLipSyncList(lipSyncList);
+}
+
+/* This method returns the plugin name */
+
+QStringList PapagayoTool::keys() const
+{
+    return QStringList() << tr("Papagayo Lip-sync");
+}
+
+/* This method makes an action when the mouse is pressed on the workspace 
+ * depending on the active mode: Selecting an object or Creating a path  
+*/
+
+void PapagayoTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method is executed while the mouse is pressed and on movement */
+
+void PapagayoTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method finishes the action started on the press method depending
+ * on the active mode: Selecting an object or Creating a path
+*/
+
+void PapagayoTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+QMap<QString, TAction *> PapagayoTool::actions() const
+{
+    return k->actions;
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+int PapagayoTool::toolType() const
+{
+    return TupToolInterface::LipSync;
+}
+
+/* This method returns the tool panel associated to this plugin */
+
+QWidget *PapagayoTool::configurator()
+{
+    if (!k->configurator) {
+        k->mode = TupToolPlugin::View;
+
+        k->configurator = new Configurator;
+        connect(k->configurator, SIGNAL(importLipSync()), this, SIGNAL(importLipSync()));
+        connect(k->configurator, SIGNAL(editLipSyncSelection(const QString &)), this, SLOT(editLipSyncSelection(const QString &)));
+        connect(k->configurator, SIGNAL(removeCurrentLipSync(const QString &)), this, SLOT(removeCurrentLipSync(const QString &)));
+        connect(k->configurator, SIGNAL(selectMouth(const QString &, int)), this, SLOT(addTarget(const QString &, int)));
+        connect(k->configurator, SIGNAL(closeLipSyncProperties()), this, SLOT(resetCanvas()));
+        connect(k->configurator, SIGNAL(initFrameHasChanged(int)), this, SLOT(updateInitFrame(int)));
+    } 
+
+    return k->configurator;
+}
+
+void PapagayoTool::resetCanvas()
+{
+    k->mode = TupToolPlugin::View;
+    removeTarget();
+}
+
+/* This method is called when there's a change on/of scene */
+void PapagayoTool::aboutToChangeScene(TupGraphicsScene *)
+{
+}
+
+/* This method is called when this plugin is off */
+
+void PapagayoTool::aboutToChangeTool()
+{
+}
+
+/* This method defines the actions contained in this plugin */
+
+void PapagayoTool::setupActions()
+{
+    TAction *translater = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "papagayo.png"), 
+                                      tr("Papagayo Lip-sync"), this);
+    translater->setShortcut(QKeySequence(tr("Ctrl+Shift+P")));
+
+    k->actions.insert(tr("Papagayo Lip-sync"), translater);
+}
+
+/* This method saves the settings of this plugin */
+
+void PapagayoTool::saveConfig()
+{
+}
+
+/* This method updates the workspace when the plugin changes the scene */
+
+void PapagayoTool::updateScene(TupGraphicsScene *scene)
+{ 
+    Q_UNUSED(scene); 
+}
+
+void PapagayoTool::editLipSyncSelection(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    k->currentLipSync = scene->getLipSync(name);
+
+    k->configurator->openLipSyncProperties(k->currentLipSync);
+}
+
+void PapagayoTool::removeCurrentLipSync(const QString &name)
+{
+    QGraphicsView * view = k->scene->views().first();
+    foreach (QGraphicsItem *item, view->scene()->items()) {
+             QString tip = item->toolTip();
+             if (tip.length() > 0) {
+                 if (tip.startsWith(tr("lipsync:") + name))
+                     k->scene->removeItem(item);
+             }
+    }
+
+    TupProjectRequest request = TupRequestBuilder::createLayerRequest(k->initScene, 0, TupProjectRequest::RemoveLipSync, name);
+    emit requested(&request);
+}
+
+void PapagayoTool::updateOriginPoint(const QPointF &point)
+{
+    k->origin = point - k->mouthOffset;
+    k->mouth->setPos(k->origin);
+
+    k->currentLipSync->updateMouthPosition(k->currentMouthIndex, k->origin);
+
+    TupScene *scene = k->scene->scene();
+    scene->updateLipSync(k->currentLipSync);
+}
+
+void PapagayoTool::addTarget(const QString &id, int index)
+{
+    k->mode = TupToolPlugin::Edit;
+
+    k->currentMouth = id;
+    k->currentMouthIndex = index;
+
+    TupScene *scene = k->scene->scene();
+    int initLayer = scene->getLipSyncLayerIndex(k->currentLipSync->name());
+    int initFrame = k->currentLipSync->initFrame();
+
+    TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene, initLayer, initFrame,
+                                                                      TupProjectRequest::Select, "1");
+    emit requested(&request);
+
+    removeTarget();
+    setTargetEnvironment();
+}
+
+void PapagayoTool::setTargetEnvironment()
+{
+    QGraphicsView *view = k->scene->views().at(0);
+    foreach (QGraphicsItem *item, view->scene()->items()) {
+             QString tip = item->toolTip();
+             if (tip.length() > 0) {
+                 if (tip.compare(k->currentMouth) == 0) {
+                     k->mouthOffset = item->boundingRect().center();
+                     k->origin = item->pos() + k->mouthOffset;
+                     k->mouth = item;
+                 }
+             }
+    }
+
+    k->target = new MouthTarget(k->origin, k->baseZValue);
+    connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
+    k->scene->addItem(k->target);
+}
+
+void PapagayoTool::removeTarget()
+{
+    if (k->target) {
+        k->scene->removeItem(k->target);
+        k->target = 0;
+    }
+}
+
+void PapagayoTool::sceneResponse(const TupSceneResponse *event)
+{
+    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
+        && (k->scene->currentSceneIndex() == event->sceneIndex()))
+        init(k->scene);
+
+    if (event->action() == TupProjectRequest::Select)
+        init(k->scene);
+}
+
+void PapagayoTool::layerResponse(const TupLayerResponse *event)
+{
+    if (event->action() == TupProjectRequest::AddLipSync) {
+        QString xml = event->arg().toString();
+        k->currentLipSync = new TupLipSync();
+        k->currentLipSync->fromXml(xml);
+        k->configurator->addLipSyncRecord(k->currentLipSync->name());
+    } 
+}
+
+void PapagayoTool::frameResponse(const TupFrameResponse *event)
+{
+    Q_UNUSED(event);
+
+    if (event->action() == TupProjectRequest::Select) {
+        if (k->mode == TupToolPlugin::Edit) {
+            int frameIndex = event->frameIndex();
+            int lastFrame = k->currentLipSync->initFrame() + k->currentLipSync->framesTotal() - 1;
+            if (frameIndex >= k->currentLipSync->initFrame() && frameIndex <= lastFrame)
+                setTargetEnvironment();
+        }
+    }
+}
+
+void PapagayoTool::updateWorkSpaceContext()
+{
+    if (k->mode == TupToolPlugin::Edit)
+        k->configurator->closePanels();
+}
+
+void PapagayoTool::updateInitFrame(int index)
+{
+    removeTarget();
+    k->currentLipSync->setInitFrame(index);
+
+    TupScene *scene = k->scene->scene();
+    scene->updateLipSync(k->currentLipSync);
+
+    int sceneFrames = scene->framesTotal();
+    int lipSyncFrames = index + k->currentLipSync->framesTotal();
+    if (lipSyncFrames > sceneFrames) {
+        int layersTotal = scene->layersTotal();
+        for (int i = sceneFrames; i < lipSyncFrames; i++) {
+             for (int j = 0; j < layersTotal; j++) {
+                  TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene, j, i, TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
+                  emit requested(&request);
+             }
+        }
+    }
+
+    k->configurator->updateInterfaceRecords();
+
+    int initLayer = scene->getLipSyncLayerIndex(k->currentLipSync->name());
+    TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene, initLayer, index, TupProjectRequest::Select, "1");
+    emit requested(&request);
+}
+
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/papagayotool.h tupi-0.2+git05/src/plugins/tools/papagayo/papagayotool.h
--- tupi-0.2+git04/src/plugins/tools/papagayo/papagayotool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/papagayotool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,107 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef PAPAGAYOTOOL_H
+#define PAPAGAYOTOOL_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "settings.h"
+#include "tupprojectresponse.h"
+
+#include <QPointF>
+#include <QKeySequence>
+#include <QGraphicsView>
+#include <QDomDocument>
+
+/**
+ * @author Gustav Gonzalez 
+ * 
+*/
+
+class TUPI_PLUGIN PapagayoTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "papagayotool.json")
+
+    public:
+        PapagayoTool();
+        virtual ~PapagayoTool();
+        virtual void init(TupGraphicsScene *scene);
+
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+
+        virtual void updateScene(TupGraphicsScene *scene);
+        virtual void saveConfig();
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+        virtual void layerResponse(const TupLayerResponse *event);
+        virtual void frameResponse(const TupFrameResponse *event);
+
+        // virtual void addNewItem(const QString &name);
+        virtual void updateWorkSpaceContext();
+
+    signals:
+        void importLipSync();
+
+    private slots:
+        void editLipSyncSelection(const QString &name);
+        void removeCurrentLipSync(const QString &name);
+        // void setCurrentLipSync(const QString &name);
+        void updateOriginPoint(const QPointF &point);
+        void resetCanvas();
+        void addTarget(const QString &id, int index);
+        void updateInitFrame(int index);
+
+    private:
+        void setTargetEnvironment();
+        void setupActions();
+        void removeTarget();
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/papagayotool.json tupi-0.2+git05/src/plugins/tools/papagayo/papagayotool.json
--- tupi-0.2+git04/src/plugins/tools/papagayo/papagayotool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/papagayotool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "PapagayoTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/settings.cpp tupi-0.2+git05/src/plugins/tools/papagayo/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/papagayo/settings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/settings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,248 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "settings.h"
+#include "tuplipsync.h"
+#include "timagebutton.h"
+
+struct Settings::Private
+{
+    QWidget *innerPanel;
+    QBoxLayout *layout;
+
+    QLabel *lipSyncName;
+    QLabel *fpsLabel;
+    QSpinBox *comboInit;
+
+    QLabel *endingLabel;
+    QLabel *totalLabel;
+
+    QListWidget *mouthsList;
+    QList<TupVoice *> voices;
+
+    QTextEdit *textArea;
+
+    QString name;
+    int initFrame;
+    int framesTotal;
+};
+
+Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    setInnerForm();
+}
+
+Settings::~Settings()
+{
+    delete k;
+}
+
+void Settings::setInnerForm()
+{
+    k->innerPanel = new QWidget;
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QFont font = this->font();
+    font.setPointSize(8);
+    setFont(font);
+
+    QLabel *nameLabel = new QLabel(tr("Editing") + ": ");
+    k->lipSyncName = new QLabel;
+    font.setBold(true);
+    k->lipSyncName->setFont(font);
+
+    QHBoxLayout *nameLayout = new QHBoxLayout;
+    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    nameLayout->setMargin(0);
+    nameLayout->setSpacing(0);
+    nameLayout->addWidget(nameLabel);
+    nameLayout->addWidget(k->lipSyncName);
+
+    k->fpsLabel = new QLabel;
+
+    QHBoxLayout *fpsLayout = new QHBoxLayout;
+    fpsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    fpsLayout->setMargin(0);
+    fpsLayout->setSpacing(0);
+    fpsLayout->addWidget(k->fpsLabel);
+
+    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
+    startingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboInit = new QSpinBox();
+    k->comboInit->setEnabled(false);
+    k->comboInit->setMinimum(1);
+    k->comboInit->setMaximum(999);
+    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(updateInitFrame(int)));
+ 
+    k->endingLabel = new QLabel;
+    k->endingLabel->setAlignment(Qt::AlignVCenter);
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(startingLabel);
+    startLayout->addWidget(k->comboInit);
+
+    QHBoxLayout *endLayout = new QHBoxLayout;
+    endLayout->setAlignment(Qt::AlignHCenter);
+    endLayout->setMargin(0);
+    endLayout->setSpacing(0);
+    endLayout->addWidget(k->endingLabel);
+
+    k->totalLabel = new QLabel;
+    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    QHBoxLayout *totalLayout = new QHBoxLayout;
+    totalLayout->setAlignment(Qt::AlignHCenter);
+    totalLayout->setMargin(0);
+    totalLayout->setSpacing(0);
+    totalLayout->addWidget(k->totalLabel);
+
+    QBoxLayout *listLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    listLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    QLabel *mouthsLabel = new QLabel(tr("Mouths") + ": ");
+    mouthsLabel->setAlignment(Qt::AlignHCenter);
+
+    k->mouthsList = new QListWidget;
+    k->mouthsList->setContextMenuPolicy(Qt::CustomContextMenu);
+    k->mouthsList->setViewMode(QListView::ListMode);
+    k->mouthsList->setFlow(QListView::TopToBottom);
+    k->mouthsList->setMovement(QListView::Static);
+    k->mouthsList->setFixedHeight(68);
+
+    listLayout->addWidget(mouthsLabel);
+    listLayout->addWidget(k->mouthsList);
+
+    k->textArea = new QTextEdit;
+    k->textArea->setReadOnly(true);
+
+    TImageButton *remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"), 22);
+    remove->setToolTip(tr("Close properties"));
+    connect(remove, SIGNAL(clicked()), this, SIGNAL(closeLipSyncProperties()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(10);
+    buttonsLayout->addWidget(remove);
+
+    innerLayout->addLayout(nameLayout);
+    innerLayout->addLayout(fpsLayout);
+    innerLayout->addLayout(startLayout);
+    innerLayout->addLayout(endLayout);
+    innerLayout->addLayout(totalLayout);
+    innerLayout->addLayout(listLayout);
+    innerLayout->addWidget(k->textArea);
+    innerLayout->addSpacing(10);
+    innerLayout->addLayout(buttonsLayout);
+    innerLayout->addSpacing(5);
+
+    k->layout->addWidget(k->innerPanel);
+}
+
+// Editing new LipSync 
+
+void Settings::openLipSyncProperties(TupLipSync *lipsync)
+{
+    k->name = lipsync->name();
+    k->initFrame = lipsync->initFrame();
+    k->framesTotal = lipsync->framesTotal();
+
+    k->lipSyncName->setText(k->name);
+    k->fpsLabel->setText(tr("Lip-Sync FPS") + ": " + QString::number(lipsync->fps()));
+
+    k->comboInit->setEnabled(true);
+    k->comboInit->setValue(k->initFrame + 1);
+
+    int endIndex = k->initFrame + k->framesTotal;
+    k->endingLabel->setText(tr("Ending at frame") + ": " + QString::number(endIndex));
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->framesTotal));
+
+    disconnect(k->mouthsList, SIGNAL(currentRowChanged(int)), this, SLOT(setCurrentMouth(int)));
+    k->mouthsList->clear();
+    QFont f = font();
+    f.setPointSize(8);
+
+    k->voices = lipsync->voices();
+    int total = k->voices.size();
+    if (total > 0) {
+        for (int i=0; i < total; i++) {
+             QListWidgetItem *item = new QListWidgetItem(k->mouthsList);
+             item->setFont(f);
+             item->setText(tr("mouth") + "_" + QString::number(i));
+             item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+        }
+
+        TupVoice *voice = k->voices.at(0);
+        k->textArea->setText(voice->text());
+
+        connect(k->mouthsList, SIGNAL(currentRowChanged(int)), this, SLOT(setCurrentMouth(int)));
+        k->mouthsList->setCurrentRow(0);
+    }
+}
+
+void Settings::setCurrentMouth(int index) 
+{
+    QString tail = ":" + QString::number(index);
+    QString id = "lipsync:" + k->name + tail;
+
+    TupVoice *voice = k->voices.at(index);
+    k->textArea->setText(voice->text());
+
+    emit selectMouth(id, index);
+}
+
+void Settings::updateInitFrame(int index)
+{
+    int frame = index - 1;
+
+    if (frame != k->initFrame) {
+        k->initFrame = frame;
+        emit initFrameHasChanged(frame);
+    }
+}
+
+void Settings::updateInterfaceRecords()
+{
+    int endIndex = k->initFrame + k->framesTotal;
+    k->endingLabel->setText(tr("Ending at frame") + ": " + QString::number(endIndex));
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/papagayo/settings.h tupi-0.2+git05/src/plugins/tools/papagayo/settings.h
--- tupi-0.2+git04/src/plugins/tools/papagayo/settings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/papagayo/settings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,82 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+
+#include <QWidget>
+#include <QLabel>
+#include <QBoxLayout>
+#include <QSpinBox>
+#include <QListWidget>
+#include <QTextEdit>
+
+class TupLipSync;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Settings : public QWidget 
+{
+    Q_OBJECT
+
+    public:
+        Settings(QWidget *parent = 0);
+        ~Settings();
+
+        void openLipSyncProperties(TupLipSync *lipsync);
+        void updateInterfaceRecords();
+
+    private slots:
+        void setCurrentMouth(int index);
+        void updateInitFrame(int index);
+        
+    signals:
+        void initFrameHasChanged(int index);
+        void selectMouth(const QString &id, int index);
+        void closeLipSyncProperties();
+
+    private:
+        void setInnerForm();
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/pencil/pencil.pro tupi-0.2+git05/src/plugins/tools/pencil/pencil.pro
--- tupi-0.2+git04/src/plugins/tools/pencil/pencil.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/pencil/pencil.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,37 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += penciltool.h \
+           settings.h
+SOURCES += penciltool.cpp \
+           settings.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib 
+TARGET = tupipenciltool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
+~
diff -Nru tupi-0.2+git04/src/plugins/tools/pencil/penciltool.cpp tupi-0.2+git05/src/plugins/tools/pencil/penciltool.cpp
--- tupi-0.2+git04/src/plugins/tools/pencil/penciltool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/pencil/penciltool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,269 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "penciltool.h"
+
+/*
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicalgorithm.h"
+#include "tupgraphicsscene.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupellipseitem.h"
+#include "taction.h"
+#include "talgorithm.h"
+#include "tconfig.h"
+*/
+
+struct PencilTool::Private
+{
+    QPointF firstPoint;
+    QPointF oldPos;
+    QPainterPath path;
+    Settings *configurator;
+    QMap<QString, TAction *> actions;
+    TupPathItem *item;
+    QCursor cursor;
+    TupGraphicsScene *scene;
+};
+
+PencilTool::PencilTool() : TupToolPlugin(), k(new Private)
+{
+    k->configurator = 0;
+    k->item = 0;
+
+    setupActions();
+}
+
+PencilTool::~PencilTool()
+{
+}
+
+void PencilTool::setupActions()
+{
+    TAction *pencil = new TAction(QPixmap(kAppProp->themeDir() + "icons/pencil.png"), tr("Pencil"), this);
+    pencil->setShortcut(QKeySequence(tr("P")));
+    pencil->setToolTip(tr("Pencil") + " - " + "P");
+    k->cursor = QCursor(kAppProp->themeDir() + "cursors/pencil.png", 0, 16);
+    pencil->setCursor(k->cursor);
+
+    k->actions.insert(tr("Pencil"), pencil);
+}
+
+void PencilTool::init(TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[PencilTool::init()]";
+        #else
+            T_FUNCINFOX("tools");
+        #endif
+    #endif
+
+    k->scene = scene;
+
+    /*
+    foreach (QGraphicsView *view, scene->views()) {
+             view->setDragMode(QGraphicsView::NoDrag);
+             Q_CHECK_PTR(view->scene());
+             if (QGraphicsScene *scene = qobject_cast<QGraphicsScene *>(view->scene())) {
+                 foreach (QGraphicsItem *item, scene->items()) {
+                          item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                          item->setFlag(QGraphicsItem::ItemIsMovable, false);
+                 }
+             }
+    }
+
+    foreach (QGraphicsItem *item, scene->items()) {
+             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+             item->setFlag(QGraphicsItem::ItemIsMovable, false);
+    }
+    */
+
+    reset(k->scene);
+}
+
+void PencilTool::reset(TupGraphicsScene *scene)
+{
+    foreach (QGraphicsItem *item, scene->items()) {
+             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+             item->setFlag(QGraphicsItem::ItemIsMovable, false);
+    }
+}
+
+QStringList PencilTool::keys() const
+{
+    return QStringList() << tr("Pencil");
+}
+
+void PencilTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    k->firstPoint = input->pos();
+
+    k->path = QPainterPath();
+    k->path.moveTo(k->firstPoint);
+
+    k->oldPos = input->pos();
+
+    k->item = new TupPathItem();
+    k->item->setPen(brushManager->pen());
+
+    scene->includeObject(k->item);
+}
+
+void PencilTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(brushManager);
+    QPointF lastPoint = input->pos();
+
+    foreach (QGraphicsView * view, scene->views())
+             view->setDragMode(QGraphicsView::NoDrag);
+
+    k->path.moveTo(k->oldPos);
+    k->path.lineTo(lastPoint);
+
+    k->item->setPath(k->path);
+    k->oldPos = lastPoint;
+}
+
+void PencilTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(brushManager);
+
+    if (!k->item)
+        return;
+
+    double smoothness = k->configurator->exactness();
+
+    if (k->firstPoint == input->pos() && k->path.elementCount() == 1) {
+        smoothness = 0;
+        qreal radius = ((qreal) brushManager->pen().width()) / ((qreal) 2);
+        k->path.addEllipse(input->pos().x(), input->pos().y(), radius, radius);
+    } 
+
+    smoothPath(k->path, smoothness);
+
+    k->item->setBrush(brushManager->brush());
+    k->item->setPath(k->path);
+
+    QDomDocument doc;
+    doc.appendChild(k->item->toXml(doc));
+
+    TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(), 
+                                                                     0, QPoint(), scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
+                                                                     doc.toString());
+
+    emit requested(&request);
+}
+
+void PencilTool::smoothPath(QPainterPath &path, double smoothness, int from, int to)
+{
+    QPolygonF pol;
+    QList<QPolygonF> polygons = path.toSubpathPolygons();
+    QList<QPolygonF>::iterator it = polygons.begin();
+    QPolygonF::iterator pointIt;
+
+    while (it != polygons.end()) {
+           pointIt = (*it).begin();
+
+           while (pointIt <= (*it).end()-2) {
+                  pol << (*pointIt);
+                  pointIt += 2;
+           }
+           ++it;
+    }
+
+    if (smoothness > 0) {
+        path = TupGraphicalAlgorithm::bezierFit(pol, smoothness, from, to);
+    } else {
+        path = QPainterPath();
+        path.addPolygon(pol);
+    }
+}
+
+QMap<QString, TAction *> PencilTool::actions() const
+{
+    return k->actions;
+}
+
+int PencilTool::toolType() const
+{
+    return TupToolInterface::Brush;
+}
+
+QWidget *PencilTool::configurator() 
+{
+    if (! k->configurator)
+        k->configurator = new Settings;
+
+    return k->configurator;
+}
+
+void PencilTool::aboutToChangeTool() 
+{
+}
+
+void PencilTool::saveConfig()
+{
+    if (k->configurator) {
+        TCONFIG->beginGroup("PencilTool");
+        TCONFIG->setValue("Smoothness", k->configurator->exactness());
+    }
+}
+
+void PencilTool::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
+        emit closeHugeCanvas();
+        return;
+    }
+
+    QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+    if (flags.first != -1 && flags.second != -1)
+        emit callForPlugin(flags.first, flags.second);
+}
+
+QCursor PencilTool::cursor() const
+{
+    return k->cursor;
+}
+
+void PencilTool::sceneResponse(const TupSceneResponse *event)
+{
+    if (event->action() == TupProjectRequest::Select)
+        reset(k->scene);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/pencil/penciltool.h tupi-0.2+git05/src/plugins/tools/pencil/penciltool.h
--- tupi-0.2+git04/src/plugins/tools/pencil/penciltool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/pencil/penciltool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,108 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef PENCILTOOL_H
+#define PENCILTOOL_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "settings.h"
+#include "tuppathitem.h"
+#include "tupprojectresponse.h"
+
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicalgorithm.h"
+#include "tupgraphicsscene.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupellipseitem.h"
+#include "taction.h"
+#include "talgorithm.h"
+#include "tconfig.h"
+
+#include <QObject>
+#include <QSpinBox>
+#include <QPointF>
+#include <QKeySequence>
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QMatrix>
+#include <QGraphicsLineItem>
+#include <QGraphicsView>
+
+/**
+ * @author David Cuadrado
+*/
+
+class TUPI_PLUGIN PencilTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "penciltool.json")
+    
+    public:
+        PencilTool();
+        virtual ~PencilTool();
+        
+        virtual void init(TupGraphicsScene *scene);
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+        virtual void aboutToChangeTool();
+        virtual void saveConfig();
+        virtual void keyPressEvent(QKeyEvent *event);
+        virtual QCursor cursor() const;
+        virtual void sceneResponse(const TupSceneResponse *event);
+
+    private:
+        void setupActions();
+        void smoothPath(QPainterPath &path, double smoothness, int from = 0, int to = -1);
+        void reset(TupGraphicsScene *scene);
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/pencil/penciltool.json tupi-0.2+git05/src/plugins/tools/pencil/penciltool.json
--- tupi-0.2+git04/src/plugins/tools/pencil/penciltool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/pencil/penciltool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "PencilTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/pencil/penciltool.xpm tupi-0.2+git05/src/plugins/tools/pencil/penciltool.xpm
--- tupi-0.2+git04/src/plugins/tools/pencil/penciltool.xpm	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/pencil/penciltool.xpm	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,296 @@
+/* XPM */
+const char *brush_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"33 33 257 2",
+"   c #040302",
+".  c #090301",
+"X  c #090909",
+"o  c #120400",
+"O  c #130801",
+"+  c #120D08",
+"@  c #1B0600",
+"#  c #1B0900",
+"$  c #1E0E08",
+"%  c #1E1005",
+"&  c #1C1A16",
+"*  c #250B00",
+"=  c #2B0C00",
+"-  c #200700",
+";  c #2B1105",
+":  c #340D00",
+">  c #3D0D00",
+",  c #3A1200",
+"<  c #361808",
+"1  c #301F16",
+"2  c #26221C",
+"3  c #33312E",
+"4  c #490F00",
+"5  c #441401",
+"6  c #4C1A00",
+"7  c #531D00",
+"8  c #5E1B00",
+"9  c #551602",
+"0  c #4A2409",
+"q  c #402516",
+"w  c #522400",
+"e  c #562A07",
+"r  c #502917",
+"t  c #6A1A00",
+"y  c #731D00",
+"u  c #652806",
+"i  c #6D3A00",
+"p  c #693C08",
+"a  c #693519",
+"s  c #742300",
+"d  c #7B2A00",
+"f  c #723500",
+"g  c #753A00",
+"h  c #763808",
+"j  c #46423A",
+"k  c #7B4501",
+"l  c #7D4A03",
+"z  c #724414",
+"x  c #74511A",
+"c  c #654F31",
+"v  c #7B4825",
+"b  c #474640",
+"n  c #56524B",
+"m  c #62554A",
+"M  c #665E52",
+"N  c #715C50",
+"B  c #626056",
+"V  c #6E6B63",
+"C  c #7A786E",
+"Z  c #842D00",
+"A  c #833303",
+"S  c #873A03",
+"D  c #953803",
+"F  c #8C4B09",
+"G  c #864819",
+"H  c #8B5006",
+"J  c #8A5213",
+"K  c #964605",
+"L  c #954C11",
+"P  c #995B0A",
+"I  c #94540A",
+"U  c #945816",
+"Y  c #964E20",
+"T  c #835535",
+"R  c #8E6012",
+"E  c #9E6116",
+"W  c #996127",
+"Q  c #A64A03",
+"!  c #A85208",
+"~  c #AB5A11",
+"^  c #B15306",
+"/  c #AC620B",
+"(  c #A7670A",
+")  c #A7631B",
+"_  c #B86608",
+"`  c #B76717",
+"'  c #B8781A",
+"]  c #A76C25",
+"[  c #AF762D",
+"{  c #A37531",
+"}  c #B46C27",
+"|  c #B67424",
+" . c #B7783C",
+".. c #826F46",
+"X. c #886A55",
+"o. c #817A54",
+"O. c #857E59",
+"+. c #94754C",
+"@. c #927856",
+"#. c #807D73",
+"$. c #927565",
+"%. c #A77740",
+"&. c #CB6D03",
+"*. c #C56E01",
+"=. c #C36D1D",
+"-. c #CB7400",
+";. c #CB7807",
+":. c #CC7B13",
+">. c #C57819",
+",. c #D67A00",
+"<. c #D17F1C",
+"1. c #C27320",
+"2. c #C17F37",
+"3. c #B48234",
+"4. c #88825D",
+"5. c #988657",
+"6. c #8B8461",
+"7. c #828074",
+"8. c #938D6A",
+"9. c #928864",
+"0. c #968B74",
+"q. c #96906D",
+"w. c #97927C",
+"e. c #9A9473",
+"r. c #99957C",
+"t. c #9E9877",
+"y. c #9E987B",
+"u. c #969175",
+"i. c #A68658",
+"p. c #B98048",
+"a. c #B98A55",
+"s. c #B99554",
+"d. c #A48D65",
+"f. c #A68F7A",
+"g. c #A9956A",
+"h. c #A49375",
+"j. c #A39A7D",
+"k. c #B49462",
+"l. c #B89E73",
+"z. c #CC8307",
+"x. c #C78319",
+"c. c #D38502",
+"v. c #DB8B08",
+"b. c #D58818",
+"n. c #DE940A",
+"m. c #D99119",
+"M. c #C98227",
+"N. c #CA8C3B",
+"B. c #C2933A",
+"V. c #D28429",
+"C. c #D58934",
+"Z. c #DA8E3D",
+"A. c #DC9C25",
+"S. c #DA932A",
+"D. c #D99635",
+"F. c #CC972B",
+"G. c #DCA033",
+"H. c #E29C17",
+"J. c #E59309",
+"K. c #E7A937",
+"L. c #CB8746",
+"P. c #C4954B",
+"I. c #CA935C",
+"U. c #DA9C5B",
+"Y. c #C69B68",
+"T. c #CEA559",
+"R. c #DBA149",
+"E. c #CCAD76",
+"W. c #DCAC73",
+"Q. c #E6AC48",
+"!. c #E1AA52",
+"~. c #EBB54A",
+"^. c #EAB756",
+"/. c #EDB961",
+"(. c #E2B57D",
+"). c #ECC16C",
+"_. c #999580",
+"`. c #9D9984",
+"'. c #939082",
+"]. c #A09C85",
+"[. c #A19D89",
+"{. c #A4A18B",
+"}. c #A9A58D",
+"|. c #AEA98C",
+" X c #AAA593",
+".X c #ACA59C",
+"XX c #ADA994",
+"oX c #ADAA99",
+"OX c #A6A392",
+"+X c #B0AA8D",
+"@X c #B0AC9C",
+"#X c #B1AA96",
+"$X c #B6B195",
+"%X c #B4B19C",
+"&X c #B8B39A",
+"*X c #BDB89E",
+"=X c #A9A7A0",
+"-X c #B1AEA1",
+";X c #B5B3A2",
+":X c #B9B4A2",
+">X c #B8B5AA",
+",X c #BCB9A5",
+"<X c #BDBAAB",
+"1X c #BEBCB1",
+"2X c #C3BB9D",
+"3X c #C1BDA4",
+"4X c #C0BDAB",
+"5X c #C0BEB3",
+"6X c #E3B587",
+"7X c #E9BD92",
+"8X c #D3C09D",
+"9X c #C5C1AC",
+"0X c #C9C5AC",
+"qX c #C8C3A6",
+"wX c #C3C1B5",
+"eX c #C5C2B8",
+"rX c #C9C5B2",
+"tX c #CDC9B4",
+"yX c #CDCBBC",
+"uX c #D1CDB2",
+"iX c #D2CEB9",
+"pX c #DECFBA",
+"aX c #D6D1B5",
+"sX c #D8D3B6",
+"dX c #DAD5BA",
+"fX c #DED9BE",
+"gX c #EBC198",
+"hX c #EDCAA7",
+"jX c #E8D0A9",
+"kX c #F0D2B6",
+"lX c #CCCBC2",
+"zX c #D0CEC5",
+"xX c #D3D2CA",
+"cX c #DEDAC4",
+"vX c #D9D6C4",
+"bX c #DAD9D3",
+"nX c #DBDBD4",
+"mX c #E0DBC2",
+"MX c #E1DDCA",
+"NX c #E0DFD9",
+"BX c #F0DAC3",
+"VX c #E5E1CC",
+"CX c #EAE0CA",
+"ZX c #E7E3D0",
+"AX c #E9E5D3",
+"SX c #EBE8D6",
+"DX c #EEEBDC",
+"FX c #E1E0DB",
+"GX c #F0E1CF",
+"HX c #F3EADC",
+"JX c #EFEDE1",
+"KX c #F0EEE1",
+"LX c #F9EDE4",
+"PX c #F2F0E4",
+"IX c #F4F2E8",
+"UX c gray100",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXuXj.4.o.8.q.8.8.q.q.8.8.8.8.8.8.8.8.V g.,XYXYXYXYXYXYX",
+"YXYXYXYX0Xy.e.2XfXfXfXfXfXfXfXfXfXfXfXfXfXfXdXaXuX$Xt.8.*XYXYXYXYX",
+"YXYXYX$X4.qXcXfXfXMXVXAXAXSXAXSXSXSXSXAXAXZXVXcX8X0XqX&X8.+XYXYXYX",
+"YXYX&X8.sXfXfXSXIXIXIXIXPXPXPXIXPXPXPXPXIXIXPXJXW.dX0X,X%X8.|.YXYX",
+"YX0X4.aXfXVXPXIXPXPXPXPXPXPXPXPXPXPXLXKXKXKXHXBX{ Y.xXyX>X%X6.$XYX",
+"YXt.qXfXVXIXPXPXPXPXPXDXKXPXDXPXPXDXKXKXKXKXhXx.R x *XyX5X:XoX4.cX",
+"tXe.fXcXPXPXPXDXPXDXPXDXDXKXPXDXDXPXDXHXhXZ.&._ P q c <X5X>X-Xw.$X",
+"y.2XdXSXPXPXPXDXDXDXDXPXDXDXDXDXDXkX!.<.&.-.-._ J < < #.5X:X>X.X6.",
+"O.sXdXIXPXKXHXDXDXDXDXDXHXDXLX7XC.&.;.:.n.n.z.( W e < 3 >X>X1X>X6.",
+"o.dXmXPXKXKXDXDXDXPXDXDXHX6XV.,.:.b.D.Q.G.A.x.' U p 5 2 C >X1X<Xu.",
+"q.dXVXPXKXKXDXDXDXDXDXGXU.,.c.` D.Q.^.^.K.D.| | F h , X V >XeX1Xr.",
+"q.sXAXPXKXDXDXDXDXHXHX(.c.c.>.R.^.^.~.~.S.| M.| I e , X n :XeXeX].",
+"q.sXZXPXDXDXSXDXDXDXjXv.c.z.!.)./.~.Q.N.] V.C.~ F 6 * X b ;XeXeX].",
+"q.sXAXPXDXDXDXDXDXDX!.c.' G.^./.^.Q.[ | C.V.' H f w ; X b -XeXeX].",
+"q.sXZXDXDXDXDXDXSXSX!.( _ A.Q.^.G.] E D.C.>.( g g 8 # X `.;XwXeX].",
+"q.sXAXPXDXDXDXSXDXAXT.l P m.K.D.U I V.Z.:.( i g s :   & >XoXeXeX].",
+"8.aXAXJXDXDXSXSXDXSXE.g I x.Z.G z ` C.;.( l f y 4 o   #.,X@XeXeXy.",
+"8.aXZXHXDXSXSXSXCXGXI.H p I Y p G ` ~ H l w > : @ o < w. X@X5X5X{.",
+"8.aXMXDXCX6XW.L.} F A F g u e e u w w w 5 > = o   0 |.:X%XoX5XwX].",
+"8.uXMXZXU.| Q ! ! K K K g w ; O % = , 4 4 = . . 1 uX5X,XoX X1X5Xy.",
+"9.qXdXL.` L D ^ _ b.c.*.K 7 ; * * # * @ o   X M tXrX4X%XXX{.5XeX{.",
+"8.2XI. .] ~ ` :.m.m.J.&.Q Z 5 # O       X j  XtXrX4X&XXX{.{.eX1Xj.",
+"8.l.a.%.} 1.V.S.A.m.&.^ D d 9 - % n M '.wXiXtXrX4X&XoX X`.OXeXeXt.",
+"o.g.a.p.3.N.D.A.m.*.^ D A y 8 @ O @.iXiXtX0X9X4X*XoX X{.`.-XlXlX8.",
+"$.g.i.a.P.P.F.z.` Q Q Z d y 4 - O X.9X9X9X,X,X%XXX}.{.`.`.eXlXzXC ",
+"}.+.8.k.s.B.x./ Q L D Z y 8 : @ O h.,X*X&X&XXX X}.`.`.w.oXxXxX1X9.",
+"dXO.h.g.s.3.) L D S Z y t > - X + ].XXXX|.}.{.`.`._._.OXlXnXnXw.2X",
+"YX|.5.g.i.%.W G A a a u 9 ; $ + j {.{.{.{.`.`._.w.w. XlXFXNX<Xq.YX",
+"YXcXt.5.g.i.+.T Y a a r 1 1 & 2 y.`.`.`._._._.w.`.<XxXFXFXlX6.qXYX",
+"YXYX0Xe.@.h.].f.$.$.X.N N n n 0.XX X XoXoX;X>XeXxXnXFXFXeX6.&XYXYX",
+"YXYXYXtXj.0.f. X.X.X=X=X=X=X1XlXlXlXlXlXzXzXxXxXnXnXxX X9.*XYXYXYX",
+"YXYXYXYXAX&XO...0.].-X>X>X5XlXlXlXlXlXlXlXlXlX<X:X{.O.+XvXYXYXYXYX",
+"YXYXYXYXYXYXYX3Xj.q.4.o.o.o.o.o.o.o.V 4...4.o.8.t.$XVXYXYXYXYXYXYX"
+};
diff -Nru tupi-0.2+git04/src/plugins/tools/pencil/settings.cpp tupi-0.2+git05/src/plugins/tools/pencil/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/pencil/settings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/pencil/settings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,90 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "settings.h"
+#include "timagebutton.h"
+#include "tconfig.h"
+
+Settings::Settings(QWidget *parent) : QWidget(parent)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Settings()]";
+        #else
+            TINIT;
+        #endif
+    #endif
+
+    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *label = new QLabel(tr("Smoothness"));
+    label->setAlignment(Qt::AlignHCenter); 
+    layout->addWidget(label);
+    m_exactness = new QDoubleSpinBox();
+
+    m_exactness->setDecimals(2);
+    m_exactness->setSingleStep(0.1);
+    m_exactness->setMaximum(100);
+    layout->addWidget(m_exactness);
+
+    mainLayout->addLayout(layout);
+
+    mainLayout->addStretch(2);
+
+    TCONFIG->beginGroup("BrushTool");
+    double smoothness = TCONFIG->value("Smoothness", -1).toDouble();
+
+    if (smoothness > 0) 
+        m_exactness->setValue(smoothness);
+    else
+        m_exactness->setValue(4.0);
+}
+
+Settings::~Settings()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~Settings()]";
+        #else
+            TEND;
+        #endif
+    #endif
+}
+
+double Settings::exactness() const
+{
+    return m_exactness->value();
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/pencil/settings.h tupi-0.2+git05/src/plugins/tools/pencil/settings.h
--- tupi-0.2+git04/src/plugins/tools/pencil/settings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/pencil/settings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,67 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+
+#include <QDoubleSpinBox>
+#include <QLabel>
+#include <QBoxLayout>
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QHeaderView>
+#include <QPushButton>
+
+/**
+ * @author Jorge Cuadrado
+*/
+
+class TUPI_PLUGIN Settings : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        Settings(QWidget *parent = 0);
+        ~Settings();
+        double exactness() const;
+        
+    private:
+        QDoubleSpinBox *m_exactness;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.cpp tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.cpp
--- tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez                                                     *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "penciltool.h"
-// #include "penciltool.xpm"
-
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicalgorithm.h"
-#include "tupgraphicsscene.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupellipseitem.h"
-
-#include "taction.h"
-#include "talgorithm.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "tconfig.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QGraphicsPathItem>
-#include <QPainterPath>
-#include <QMatrix>
-#include <QGraphicsLineItem>
-#include <QGraphicsView>
-
-struct PencilTool::Private
-{
-    QPointF firstPoint;
-    QPointF oldPos;
-    QPainterPath path;
-    Settings *configurator;
-    QMap<QString, TAction *> actions;
-    TupPathItem *item;
-    QCursor cursor;
-    TupGraphicsScene *scene;
-};
-
-PencilTool::PencilTool() : k(new Private)
-{
-    k->configurator = 0;
-    k->item = 0;
-
-    setupActions();
-}
-
-PencilTool::~PencilTool()
-{
-}
-
-void PencilTool::setupActions()
-{
-    TAction *pencil = new TAction(QPixmap(kAppProp->themeDir() + "icons/pencil.png"), tr("Pencil"), this);
-    pencil->setShortcut(QKeySequence(tr("P")));
-    k->cursor = QCursor(kAppProp->themeDir() + "cursors/pencil.png", 0, 16);
-    pencil->setCursor(k->cursor);
-
-    k->actions.insert(tr("Pencil"), pencil);
-}
-
-void PencilTool::init(TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFOX("tools");
-    #endif
-
-    k->scene = scene;
-
-    /*
-    foreach (QGraphicsView *view, scene->views()) {
-             view->setDragMode(QGraphicsView::NoDrag);
-             Q_CHECK_PTR(view->scene());
-             if (QGraphicsScene *scene = qobject_cast<QGraphicsScene *>(view->scene())) {
-                 foreach (QGraphicsItem *item, scene->items()) {
-                          item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                          item->setFlag(QGraphicsItem::ItemIsMovable, false);
-                 }
-             }
-    }
-
-    foreach (QGraphicsItem *item, scene->items()) {
-             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-             item->setFlag(QGraphicsItem::ItemIsMovable, false);
-    }
-    */
-
-    reset(k->scene);
-}
-
-void PencilTool::reset(TupGraphicsScene *scene)
-{
-    foreach (QGraphicsItem *item, scene->items()) {
-             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-             item->setFlag(QGraphicsItem::ItemIsMovable, false);
-    }
-}
-
-QStringList PencilTool::keys() const
-{
-    return QStringList() << tr("Pencil");
-}
-
-void PencilTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    k->firstPoint = input->pos();
-
-    k->path = QPainterPath();
-    k->path.moveTo(k->firstPoint);
-
-    k->oldPos = input->pos();
-
-    k->item = new TupPathItem();
-    k->item->setPen(brushManager->pen());
-
-    scene->includeObject(k->item);
-}
-
-void PencilTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(brushManager);
-    QPointF lastPoint = input->pos();
-
-    foreach (QGraphicsView * view, scene->views())
-             view->setDragMode(QGraphicsView::NoDrag);
-
-    k->path.moveTo(k->oldPos);
-    k->path.lineTo(lastPoint);
-
-    k->item->setPath(k->path);
-    k->oldPos = lastPoint;
-}
-
-void PencilTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(brushManager);
-
-    if (!k->item)
-        return;
-
-    double smoothness = k->configurator->exactness();
-
-    if (k->firstPoint == input->pos() && k->path.elementCount() == 1) {
-        smoothness = 0;
-        qreal radius = ((qreal) brushManager->pen().width()) / ((qreal) 2);
-        k->path.addEllipse(input->pos().x(), input->pos().y(), radius, radius);
-    } 
-
-    smoothPath(k->path, smoothness);
-
-    k->item->setBrush(brushManager->brush());
-    k->item->setPath(k->path);
-
-    QDomDocument doc;
-    doc.appendChild(k->item->toXml(doc));
-
-    TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(), 
-                                                                     0, QPoint(), scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
-                                                                     doc.toString());
-
-    emit requested(&request);
-}
-
-void PencilTool::smoothPath(QPainterPath &path, double smoothness, int from, int to)
-{
-    QPolygonF pol;
-    QList<QPolygonF> polygons = path.toSubpathPolygons();
-    QList<QPolygonF>::iterator it = polygons.begin();
-    QPolygonF::iterator pointIt;
-
-    while (it != polygons.end()) {
-           pointIt = (*it).begin();
-
-           while (pointIt <= (*it).end()-2) {
-                  pol << (*pointIt);
-                  pointIt += 2;
-           }
-           ++it;
-    }
-
-    if (smoothness > 0) {
-        path = TupGraphicalAlgorithm::bezierFit(pol, smoothness, from, to);
-    } else {
-        path = QPainterPath();
-        path.addPolygon(pol);
-    }
-}
-
-QMap<QString, TAction *> PencilTool::actions() const
-{
-    return k->actions;
-}
-
-int PencilTool::toolType() const
-{
-    return TupToolInterface::Brush;
-}
-
-QWidget *PencilTool::configurator() 
-{
-    if (! k->configurator)
-        k->configurator = new Settings;
-
-    return k->configurator;
-}
-
-void PencilTool::aboutToChangeTool() 
-{
-}
-
-void PencilTool::saveConfig()
-{
-    if (k->configurator) {
-        TCONFIG->beginGroup("PencilTool");
-        TCONFIG->setValue("Smoothness", k->configurator->exactness());
-    }
-}
-
-void PencilTool::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
-        emit closeHugeCanvas();
-        return;
-    }
-
-    QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-    if (flags.first != -1 && flags.second != -1)
-        emit callForPlugin(flags.first, flags.second);
-}
-
-QCursor PencilTool::cursor() const
-{
-    return k->cursor;
-}
-
-void PencilTool::sceneResponse(const TupSceneResponse *event)
-{
-    if (event->action() == TupProjectRequest::Select)
-        reset(k->scene);
-}
-
-Q_EXPORT_PLUGIN2(tup_brush, PencilTool);
diff -Nru tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.h tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.h
--- tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez                                                     *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef PENCILTOOL_H
-#define PENCILTOOL_H
-
-#include "tuptoolplugin.h"
-#include "settings.h"
-#include "tuppathitem.h"
-#include "tupprojectresponse.h"
-
-#include <QObject>
-#include <QSpinBox>
-// #include <QTimer>
-
-class QKeySequence;
-
-/**
- * @author David Cuadrado
-*/
-
-class PencilTool : public TupToolPlugin
-{
-    Q_OBJECT
-    
-    public:
-        PencilTool();
-        virtual ~PencilTool();
-        
-        virtual void init(TupGraphicsScene *scene);
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-        virtual QWidget *configurator();
-        virtual void aboutToChangeTool();
-        virtual void saveConfig();
-        virtual void keyPressEvent(QKeyEvent *event);
-        virtual QCursor cursor() const;
-        virtual void sceneResponse(const TupSceneResponse *event);
-
-    private:
-        void setupActions();
-        void smoothPath(QPainterPath &path, double smoothness, int from = 0, int to = -1);
-        void reset(TupGraphicsScene *scene);
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
-
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.json tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.json
--- tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "PencilTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.pro tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.pro
--- tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/penciltool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += penciltool.h \
-           settings.h
-SOURCES += penciltool.cpp \
-           settings.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib 
-TARGET = tupipenciltool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.xpm tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.xpm
--- tupi-0.2+git04/src/plugins/tools/penciltool/penciltool.xpm	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/penciltool/penciltool.xpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,296 +0,0 @@
-/* XPM */
-const char *brush_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"33 33 257 2",
-"   c #040302",
-".  c #090301",
-"X  c #090909",
-"o  c #120400",
-"O  c #130801",
-"+  c #120D08",
-"@  c #1B0600",
-"#  c #1B0900",
-"$  c #1E0E08",
-"%  c #1E1005",
-"&  c #1C1A16",
-"*  c #250B00",
-"=  c #2B0C00",
-"-  c #200700",
-";  c #2B1105",
-":  c #340D00",
-">  c #3D0D00",
-",  c #3A1200",
-"<  c #361808",
-"1  c #301F16",
-"2  c #26221C",
-"3  c #33312E",
-"4  c #490F00",
-"5  c #441401",
-"6  c #4C1A00",
-"7  c #531D00",
-"8  c #5E1B00",
-"9  c #551602",
-"0  c #4A2409",
-"q  c #402516",
-"w  c #522400",
-"e  c #562A07",
-"r  c #502917",
-"t  c #6A1A00",
-"y  c #731D00",
-"u  c #652806",
-"i  c #6D3A00",
-"p  c #693C08",
-"a  c #693519",
-"s  c #742300",
-"d  c #7B2A00",
-"f  c #723500",
-"g  c #753A00",
-"h  c #763808",
-"j  c #46423A",
-"k  c #7B4501",
-"l  c #7D4A03",
-"z  c #724414",
-"x  c #74511A",
-"c  c #654F31",
-"v  c #7B4825",
-"b  c #474640",
-"n  c #56524B",
-"m  c #62554A",
-"M  c #665E52",
-"N  c #715C50",
-"B  c #626056",
-"V  c #6E6B63",
-"C  c #7A786E",
-"Z  c #842D00",
-"A  c #833303",
-"S  c #873A03",
-"D  c #953803",
-"F  c #8C4B09",
-"G  c #864819",
-"H  c #8B5006",
-"J  c #8A5213",
-"K  c #964605",
-"L  c #954C11",
-"P  c #995B0A",
-"I  c #94540A",
-"U  c #945816",
-"Y  c #964E20",
-"T  c #835535",
-"R  c #8E6012",
-"E  c #9E6116",
-"W  c #996127",
-"Q  c #A64A03",
-"!  c #A85208",
-"~  c #AB5A11",
-"^  c #B15306",
-"/  c #AC620B",
-"(  c #A7670A",
-")  c #A7631B",
-"_  c #B86608",
-"`  c #B76717",
-"'  c #B8781A",
-"]  c #A76C25",
-"[  c #AF762D",
-"{  c #A37531",
-"}  c #B46C27",
-"|  c #B67424",
-" . c #B7783C",
-".. c #826F46",
-"X. c #886A55",
-"o. c #817A54",
-"O. c #857E59",
-"+. c #94754C",
-"@. c #927856",
-"#. c #807D73",
-"$. c #927565",
-"%. c #A77740",
-"&. c #CB6D03",
-"*. c #C56E01",
-"=. c #C36D1D",
-"-. c #CB7400",
-";. c #CB7807",
-":. c #CC7B13",
-">. c #C57819",
-",. c #D67A00",
-"<. c #D17F1C",
-"1. c #C27320",
-"2. c #C17F37",
-"3. c #B48234",
-"4. c #88825D",
-"5. c #988657",
-"6. c #8B8461",
-"7. c #828074",
-"8. c #938D6A",
-"9. c #928864",
-"0. c #968B74",
-"q. c #96906D",
-"w. c #97927C",
-"e. c #9A9473",
-"r. c #99957C",
-"t. c #9E9877",
-"y. c #9E987B",
-"u. c #969175",
-"i. c #A68658",
-"p. c #B98048",
-"a. c #B98A55",
-"s. c #B99554",
-"d. c #A48D65",
-"f. c #A68F7A",
-"g. c #A9956A",
-"h. c #A49375",
-"j. c #A39A7D",
-"k. c #B49462",
-"l. c #B89E73",
-"z. c #CC8307",
-"x. c #C78319",
-"c. c #D38502",
-"v. c #DB8B08",
-"b. c #D58818",
-"n. c #DE940A",
-"m. c #D99119",
-"M. c #C98227",
-"N. c #CA8C3B",
-"B. c #C2933A",
-"V. c #D28429",
-"C. c #D58934",
-"Z. c #DA8E3D",
-"A. c #DC9C25",
-"S. c #DA932A",
-"D. c #D99635",
-"F. c #CC972B",
-"G. c #DCA033",
-"H. c #E29C17",
-"J. c #E59309",
-"K. c #E7A937",
-"L. c #CB8746",
-"P. c #C4954B",
-"I. c #CA935C",
-"U. c #DA9C5B",
-"Y. c #C69B68",
-"T. c #CEA559",
-"R. c #DBA149",
-"E. c #CCAD76",
-"W. c #DCAC73",
-"Q. c #E6AC48",
-"!. c #E1AA52",
-"~. c #EBB54A",
-"^. c #EAB756",
-"/. c #EDB961",
-"(. c #E2B57D",
-"). c #ECC16C",
-"_. c #999580",
-"`. c #9D9984",
-"'. c #939082",
-"]. c #A09C85",
-"[. c #A19D89",
-"{. c #A4A18B",
-"}. c #A9A58D",
-"|. c #AEA98C",
-" X c #AAA593",
-".X c #ACA59C",
-"XX c #ADA994",
-"oX c #ADAA99",
-"OX c #A6A392",
-"+X c #B0AA8D",
-"@X c #B0AC9C",
-"#X c #B1AA96",
-"$X c #B6B195",
-"%X c #B4B19C",
-"&X c #B8B39A",
-"*X c #BDB89E",
-"=X c #A9A7A0",
-"-X c #B1AEA1",
-";X c #B5B3A2",
-":X c #B9B4A2",
-">X c #B8B5AA",
-",X c #BCB9A5",
-"<X c #BDBAAB",
-"1X c #BEBCB1",
-"2X c #C3BB9D",
-"3X c #C1BDA4",
-"4X c #C0BDAB",
-"5X c #C0BEB3",
-"6X c #E3B587",
-"7X c #E9BD92",
-"8X c #D3C09D",
-"9X c #C5C1AC",
-"0X c #C9C5AC",
-"qX c #C8C3A6",
-"wX c #C3C1B5",
-"eX c #C5C2B8",
-"rX c #C9C5B2",
-"tX c #CDC9B4",
-"yX c #CDCBBC",
-"uX c #D1CDB2",
-"iX c #D2CEB9",
-"pX c #DECFBA",
-"aX c #D6D1B5",
-"sX c #D8D3B6",
-"dX c #DAD5BA",
-"fX c #DED9BE",
-"gX c #EBC198",
-"hX c #EDCAA7",
-"jX c #E8D0A9",
-"kX c #F0D2B6",
-"lX c #CCCBC2",
-"zX c #D0CEC5",
-"xX c #D3D2CA",
-"cX c #DEDAC4",
-"vX c #D9D6C4",
-"bX c #DAD9D3",
-"nX c #DBDBD4",
-"mX c #E0DBC2",
-"MX c #E1DDCA",
-"NX c #E0DFD9",
-"BX c #F0DAC3",
-"VX c #E5E1CC",
-"CX c #EAE0CA",
-"ZX c #E7E3D0",
-"AX c #E9E5D3",
-"SX c #EBE8D6",
-"DX c #EEEBDC",
-"FX c #E1E0DB",
-"GX c #F0E1CF",
-"HX c #F3EADC",
-"JX c #EFEDE1",
-"KX c #F0EEE1",
-"LX c #F9EDE4",
-"PX c #F2F0E4",
-"IX c #F4F2E8",
-"UX c gray100",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXuXj.4.o.8.q.8.8.q.q.8.8.8.8.8.8.8.8.V g.,XYXYXYXYXYXYX",
-"YXYXYXYX0Xy.e.2XfXfXfXfXfXfXfXfXfXfXfXfXfXfXdXaXuX$Xt.8.*XYXYXYXYX",
-"YXYXYX$X4.qXcXfXfXMXVXAXAXSXAXSXSXSXSXAXAXZXVXcX8X0XqX&X8.+XYXYXYX",
-"YXYX&X8.sXfXfXSXIXIXIXIXPXPXPXIXPXPXPXPXIXIXPXJXW.dX0X,X%X8.|.YXYX",
-"YX0X4.aXfXVXPXIXPXPXPXPXPXPXPXPXPXPXLXKXKXKXHXBX{ Y.xXyX>X%X6.$XYX",
-"YXt.qXfXVXIXPXPXPXPXPXDXKXPXDXPXPXDXKXKXKXKXhXx.R x *XyX5X:XoX4.cX",
-"tXe.fXcXPXPXPXDXPXDXPXDXDXKXPXDXDXPXDXHXhXZ.&._ P q c <X5X>X-Xw.$X",
-"y.2XdXSXPXPXPXDXDXDXDXPXDXDXDXDXDXkX!.<.&.-.-._ J < < #.5X:X>X.X6.",
-"O.sXdXIXPXKXHXDXDXDXDXDXHXDXLX7XC.&.;.:.n.n.z.( W e < 3 >X>X1X>X6.",
-"o.dXmXPXKXKXDXDXDXPXDXDXHX6XV.,.:.b.D.Q.G.A.x.' U p 5 2 C >X1X<Xu.",
-"q.dXVXPXKXKXDXDXDXDXDXGXU.,.c.` D.Q.^.^.K.D.| | F h , X V >XeX1Xr.",
-"q.sXAXPXKXDXDXDXDXHXHX(.c.c.>.R.^.^.~.~.S.| M.| I e , X n :XeXeX].",
-"q.sXZXPXDXDXSXDXDXDXjXv.c.z.!.)./.~.Q.N.] V.C.~ F 6 * X b ;XeXeX].",
-"q.sXAXPXDXDXDXDXDXDX!.c.' G.^./.^.Q.[ | C.V.' H f w ; X b -XeXeX].",
-"q.sXZXDXDXDXDXDXSXSX!.( _ A.Q.^.G.] E D.C.>.( g g 8 # X `.;XwXeX].",
-"q.sXAXPXDXDXDXSXDXAXT.l P m.K.D.U I V.Z.:.( i g s :   & >XoXeXeX].",
-"8.aXAXJXDXDXSXSXDXSXE.g I x.Z.G z ` C.;.( l f y 4 o   #.,X@XeXeXy.",
-"8.aXZXHXDXSXSXSXCXGXI.H p I Y p G ` ~ H l w > : @ o < w. X@X5X5X{.",
-"8.aXMXDXCX6XW.L.} F A F g u e e u w w w 5 > = o   0 |.:X%XoX5XwX].",
-"8.uXMXZXU.| Q ! ! K K K g w ; O % = , 4 4 = . . 1 uX5X,XoX X1X5Xy.",
-"9.qXdXL.` L D ^ _ b.c.*.K 7 ; * * # * @ o   X M tXrX4X%XXX{.5XeX{.",
-"8.2XI. .] ~ ` :.m.m.J.&.Q Z 5 # O       X j  XtXrX4X&XXX{.{.eX1Xj.",
-"8.l.a.%.} 1.V.S.A.m.&.^ D d 9 - % n M '.wXiXtXrX4X&XoX X`.OXeXeXt.",
-"o.g.a.p.3.N.D.A.m.*.^ D A y 8 @ O @.iXiXtX0X9X4X*XoX X{.`.-XlXlX8.",
-"$.g.i.a.P.P.F.z.` Q Q Z d y 4 - O X.9X9X9X,X,X%XXX}.{.`.`.eXlXzXC ",
-"}.+.8.k.s.B.x./ Q L D Z y 8 : @ O h.,X*X&X&XXX X}.`.`.w.oXxXxX1X9.",
-"dXO.h.g.s.3.) L D S Z y t > - X + ].XXXX|.}.{.`.`._._.OXlXnXnXw.2X",
-"YX|.5.g.i.%.W G A a a u 9 ; $ + j {.{.{.{.`.`._.w.w. XlXFXNX<Xq.YX",
-"YXcXt.5.g.i.+.T Y a a r 1 1 & 2 y.`.`.`._._._.w.`.<XxXFXFXlX6.qXYX",
-"YXYX0Xe.@.h.].f.$.$.X.N N n n 0.XX X XoXoX;X>XeXxXnXFXFXeX6.&XYXYX",
-"YXYXYXtXj.0.f. X.X.X=X=X=X=X1XlXlXlXlXlXzXzXxXxXnXnXxX X9.*XYXYXYX",
-"YXYXYXYXAX&XO...0.].-X>X>X5XlXlXlXlXlXlXlXlXlX<X:X{.O.+XvXYXYXYXYX",
-"YXYXYXYXYXYXYX3Xj.q.4.o.o.o.o.o.o.o.V 4...4.o.8.t.$XVXYXYXYXYXYXYX"
-};
diff -Nru tupi-0.2+git04/src/plugins/tools/penciltool/settings.cpp tupi-0.2+git05/src/plugins/tools/penciltool/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/penciltool/settings.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/penciltool/settings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "settings.h"
-#include "tglobal.h"
-#include "timagebutton.h"
-#include "tdebug.h"
-#include "tconfig.h"
-
-#include <QBoxLayout>
-#include <QTableWidget>
-#include <QTableWidgetItem>
-#include <QHeaderView>
-#include <QPushButton>
-
-Settings::Settings(QWidget *parent) :QWidget(parent)
-{
-    #ifdef K_DEBUG
-           TINIT;
-    #endif
-
-    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-
-    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *label = new QLabel(tr("Smoothness"));
-    label->setAlignment(Qt::AlignHCenter); 
-    layout->addWidget(label);
-    m_exactness = new QDoubleSpinBox();
-
-    m_exactness->setDecimals(2);
-    m_exactness->setSingleStep(0.1);
-    m_exactness->setMaximum(100);
-    layout->addWidget(m_exactness);
-
-    mainLayout->addLayout(layout);
-
-    mainLayout->addStretch(2);
-
-    TCONFIG->beginGroup("BrushTool");
-    double smoothness = TCONFIG->value("Smoothness", -1).toDouble();
-
-    if (smoothness > 0) 
-        m_exactness->setValue(smoothness);
-    else
-        m_exactness->setValue(4.0);
-}
-
-Settings::~Settings()
-{
-    #ifdef K_DEBUG
-           TEND;
-    #endif
-}
-
-double Settings::exactness() const
-{
-    return m_exactness->value();
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/penciltool/settings.h tupi-0.2+git05/src/plugins/tools/penciltool/settings.h
--- tupi-0.2+git04/src/plugins/tools/penciltool/settings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/penciltool/settings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
-#include "tapplicationproperties.h"
-
-#include <QDoubleSpinBox>
-#include <QLabel>
-
-class QTableWidget;
-class QTableWidgetItem;
-
-/**
- * @author Jorge Cuadrado
-*/
-
-class Settings : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        Settings(QWidget *parent = 0);
-        ~Settings();
-        double exactness() const;
-        
-    private:
-        QDoubleSpinBox *m_exactness;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/polyline/infopanel.cpp tupi-0.2+git05/src/plugins/tools/polyline/infopanel.cpp
--- tupi-0.2+git04/src/plugins/tools/polyline/infopanel.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polyline/infopanel.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,75 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "infopanel.h"
+
+InfoPanel::InfoPanel(QWidget *parent) :QWidget(parent)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[InfoPanel()]";
+        #else
+            TINIT;
+        #endif
+    #endif
+
+    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *label = new QLabel(tr("Tips"));
+    label->setAlignment(Qt::AlignHCenter); 
+    layout->addWidget(label);
+
+    mainLayout->addLayout(layout);
+
+    QTextEdit *textArea = new QTextEdit; 
+    textArea->setFixedHeight(250);
+    textArea->setHtml("<p><b>" + tr("Close line") + ":</b> " + tr("X key or Right mouse button") + "</p>"); 
+    mainLayout->addWidget(textArea);
+   
+    mainLayout->addStretch(2);
+}
+
+InfoPanel::~InfoPanel()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~InfoPanel()]";
+        #else
+            TEND;
+        #endif
+    #endif
+}
+
diff -Nru tupi-0.2+git04/src/plugins/tools/polyline/infopanel.h tupi-0.2+git05/src/plugins/tools/polyline/infopanel.h
--- tupi-0.2+git04/src/plugins/tools/polyline/infopanel.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polyline/infopanel.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,57 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef INFOPANEL_H
+#define INFOPANEL_H
+
+#include "tglobal.h"
+#include <QLabel>
+#include <QBoxLayout>
+#include <QTextEdit>
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN InfoPanel : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        InfoPanel(QWidget *parent = 0);
+        ~InfoPanel();
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/polyline/polyline.pro tupi-0.2+git05/src/plugins/tools/polyline/polyline.pro
--- tupi-0.2+git04/src/plugins/tools/polyline/polyline.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polyline/polyline.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,37 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target
+target.path = /plugins/
+
+HEADERS += polylinetool.h \
+           infopanel.h
+
+SOURCES += polylinetool.cpp \
+           infopanel.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupipolylinetool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/polyline/polylinetool.cpp tupi-0.2+git05/src/plugins/tools/polyline/polylinetool.cpp
--- tupi-0.2+git04/src/plugins/tools/polyline/polylinetool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polyline/polylinetool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,596 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "polylinetool.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+#include "tuprequestbuilder.h"
+#include "tuplibraryobject.h"
+#include "taction.h"
+#include "tupinputdeviceinformation.h"
+#include "tupgraphicsscene.h"
+#include "tupprojectrequest.h"
+#include "tupbrushmanager.h"
+#include "tupprojectresponse.h"
+
+struct PolyLineTool::Private
+{
+    bool begin;
+    QPointF center;
+    QPointF right;
+    QPointF mirror;
+    
+    TNodeGroup *nodeGroup;
+    QPainterPath path;
+    
+    QMap<QString, TAction *> actions;
+    
+    TupPathItem *item;
+    TupGraphicsScene *scene;
+    
+    QGraphicsLineItem *line1;
+    QGraphicsLineItem *line2;
+    InfoPanel *configurator;
+    QCursor cursor;
+
+    qreal realFactor;
+};
+
+PolyLineTool::PolyLineTool(): k(new Private)
+{
+    k->configurator = 0;
+    k->nodeGroup = 0;
+    k->item = 0;
+
+    k->cursor = QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "polyline.png");
+    
+    k->line1 = new QGraphicsLineItem(0, 0, 0, 0);
+    k->line1->setPen(QPen(QColor(55, 177, 50)));
+    k->line2 = new QGraphicsLineItem(0, 0, 0, 0);
+    k->line2->setPen(QPen(QColor(55, 177, 50)));
+    
+    setupActions();
+}
+
+PolyLineTool::~PolyLineTool()
+{
+}
+
+void PolyLineTool::setupActions()
+{
+    TAction *polyline = new TAction(QIcon(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "polyline.png"), tr("PolyLine"), this);
+    polyline->setShortcut(QKeySequence(tr("S")));
+    polyline->setToolTip(tr("PolyLine") + " - " + "S");
+    polyline->setCursor(k->cursor);
+
+    k->actions.insert(tr("PolyLine"), polyline);
+}
+
+QMap<QString, TAction *> PolyLineTool::actions() const
+{
+    return k->actions;
+}
+
+void PolyLineTool::init(TupGraphicsScene *scene)
+{
+    k->scene = scene;
+    initEnv();
+
+    foreach (QGraphicsView *view,  scene->views()) {
+             view->setDragMode(QGraphicsView::NoDrag);
+        
+             foreach (QGraphicsItem *item, scene->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+QStringList PolyLineTool::keys() const
+{
+    return QStringList() << tr("PolyLine");
+}
+
+void PolyLineTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[PolyLineTool::press()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    scene->clearSelection();
+
+    if (k->begin) {
+        k->path = QPainterPath();
+        k->path.moveTo(input->pos());
+
+        k->item = new TupPathItem();
+        k->item->setPath(k->path);
+        scene->includeObject(k->item);
+    } else {
+        if (!scene->items().contains(k->item))
+            scene->includeObject(k->item);
+        
+        k->path = k->item->path();
+
+        // SQA: What are the k->right/k->mirror initial values?
+        k->path.cubicTo(k->right, k->mirror, input->pos());
+    }
+    
+    k->center = input->pos();
+    k->item->setPen(brushManager->pen());
+    
+    if (!scene->items().contains(k->line1))
+        scene->includeObject(k->line1); 
+
+    if (!scene->items().contains(k->line2))
+        scene->includeObject(k->line2);
+}
+
+void PolyLineTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+
+    k->mirror = k->center - (input->pos() - k->center);
+
+    if (k->begin) {
+        k->right = input->pos();
+    } else {
+        for (int i=k->path.elementCount()-1; i>=0; i--) {
+             if (k->path.elementAt(i).type == QPainterPath::CurveToElement) {
+                 k->right = input->pos();
+                 if (k->path.elementAt(i+1).type == QPainterPath::CurveToDataElement)
+                     k->path.setElementPositionAt(i+1, k->mirror.x(), k->mirror.y());
+                 break;
+             }
+        }
+    }
+    
+    k->item->setPath(k->path);
+    k->line1->setLine(QLineF(k->mirror, k->center));
+    k->line2->setLine(QLineF(k->right, k->center));
+}
+
+void PolyLineTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[PolyLineTool::release()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (!k->nodeGroup) {
+        k->nodeGroup = new TNodeGroup(k->item, scene, TNodeGroup::Polyline, k->item->zValue()+1);
+        connect(k->nodeGroup, SIGNAL(nodeReleased()), this, SLOT(nodeChanged()));
+    } else {
+        k->nodeGroup->createNodes(k->item);
+    }
+
+    k->nodeGroup->show();
+    k->nodeGroup->resizeNodes(k->realFactor);
+    
+    if (k->begin) {
+        QDomDocument doc;
+        doc.appendChild(k->item->toXml(doc));
+        TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), 
+                                                       scene->currentLayerIndex(), 
+                                                       scene->currentFrameIndex(), 
+                                                       0, QPointF(), scene->spaceMode(), TupLibraryObject::Item, 
+                                                       TupProjectRequest::Add, doc.toString());
+        emit requested(&request);
+
+        k->begin = false;
+    } 
+}
+
+void PolyLineTool::itemResponse(const TupItemResponse *response)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[PolyLineTool::itemResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    TupProject *project = k->scene->scene()->project();
+    QGraphicsItem *item = 0;
+    TupScene *scene = 0;
+    TupLayer *layer = 0;
+    TupFrame *frame = 0;
+
+    if (project) {
+        scene = project->scene(response->sceneIndex());
+        if (scene) {
+            if (project->spaceContext() == TupProject::FRAMES_EDITION) {
+                layer = scene->layer(response->layerIndex());
+                if (layer) {
+                    frame = layer->frame(response->frameIndex());
+                    if (frame) {
+                        item = frame->item(response->itemIndex());
+                    } else {
+                        #ifdef K_DEBUG
+                            QString msg = "PolyLineTool::itemResponse() - Fatal Error: Frame variable is NULL!";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
+                        #endif
+                    }
+                } else {
+                    #ifdef K_DEBUG
+                        QString msg = "PolyLineTool::itemResponse() - Fatal Error: Layer variable is NULL!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif
+                }
+            } else {
+                TupBackground *bg = scene->background();
+                if (bg) {
+                    if (project->spaceContext() == TupProject::STATIC_BACKGROUND_EDITION) {
+                        TupFrame *frame = bg->staticFrame();
+                        if (frame) {
+                            item = frame->item(response->itemIndex());
+                        } else {
+                            #ifdef K_DEBUG
+                                QString msg = "PolyLineTool::itemResponse() - Fatal Error: Static bg frame variable is NULL!";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
+                            #endif
+                        }
+                    } else if (project->spaceContext() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                               TupFrame *frame = bg->dynamicFrame();
+                               if (frame) {
+                                   item = frame->item(response->itemIndex());
+                               } else {
+                                   #ifdef K_DEBUG
+                                       QString msg = "PolyLineTool::itemResponse() - Fatal Error: Dynamic bg frame variable is NULL!";
+                                       #ifdef Q_OS_WIN32
+                                           qDebug() << msg;
+                                       #else
+                                           tError() << msg;
+                                       #endif
+                                   #endif
+                               }
+                    } else {
+                        #ifdef K_DEBUG
+                            QString msg = "PolyLineTool::itemResponse() - Fatal Error: Invalid spaceMode!";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
+                        #endif
+                    }
+                } else {
+                    #ifdef K_DEBUG
+                        QString msg = "PolyLineTool::itemResponse() - Fatal Error: Scene bg variable is NULL!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif
+                }
+            }
+        } else {
+            #ifdef K_DEBUG
+                QString msg = "PolyLineTool::itemResponse() - Fatal Error: Scene variable is NULL!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+        }
+    } else {
+        #ifdef K_DEBUG
+            QString msg = "PolyLineTool::itemResponse() - Fatal Error: Project variable is NULL!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+    }
+        
+    switch (response->action()) {
+        case TupProjectRequest::Add:
+        {
+            if (TupPathItem *path = qgraphicsitem_cast<TupPathItem *>(item)) {
+                if (k->item != path) {
+                    k->item = path;
+                    if (k->nodeGroup)
+                        k->nodeGroup->setParentItem(path);
+                }
+            }
+        }
+        break;
+        case TupProjectRequest::Remove:
+        {
+            // SQA: Is this code doing something for real?
+            /*
+            if (item == k->item) {
+                k->path = QPainterPath();
+                delete k->item;
+                k->item = 0;
+                delete k->nodeGroup;
+                k->nodeGroup = 0;
+            }
+            */
+        }
+        break;
+        case TupProjectRequest::EditNodes:
+        {
+            if (item && k->nodeGroup) {
+                if (qgraphicsitem_cast<QGraphicsPathItem *>(k->nodeGroup->parentItem()) == item) {
+                    k->nodeGroup->show();
+                    k->nodeGroup->syncNodesFromParent();
+                    k->nodeGroup->saveParentProperties();
+                    break;
+                }
+            } else {
+                #ifdef K_DEBUG
+                    QString msg = "PolyLineTool::itemResponse() - Fatal Error: No item was found";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
+                #endif
+            }
+        }
+        break;
+        default: 
+        break;
+    }
+}
+
+void PolyLineTool::keyPressEvent(QKeyEvent *event)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[PolyLineTool::keyPressEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
+        emit closeHugeCanvas();
+    } else if (event->key() == Qt::Key_X) {
+               initEnv();
+    } else {
+        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+        if (flags.first != -1 && flags.second != -1)
+            emit callForPlugin(flags.first, flags.second);
+    }
+}
+
+void PolyLineTool::initEnv()
+{
+    k->begin = true;
+    k->path = QPainterPath();
+    k->item = 0;
+
+    if (k->nodeGroup) { 
+        k->nodeGroup->clear();
+        k->nodeGroup = 0;
+    }
+
+    if (k->line1) {
+        if (k->scene->items().contains(k->line1))
+            k->scene->removeItem(k->line1);
+    }
+    if (k->line2) {
+        if (k->scene->items().contains(k->line2))
+            k->scene->removeItem(k->line2);
+    }
+}
+
+void PolyLineTool::nodeChanged()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[PolyLineTool::nodeChanged()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    if (k->nodeGroup) {
+        if (!k->nodeGroup->changedNodes().isEmpty()) {
+            int position = -1;
+            TupProject *project = k->scene->scene()->project();
+            if (project->spaceContext() == TupProject::FRAMES_EDITION) {
+                position = k->scene->currentFrame()->indexOf(k->nodeGroup->parentItem());
+            } else {
+                TupBackground *bg = k->scene->scene()->background();
+                if (bg) {
+                    if (project->spaceContext() == TupProject::STATIC_BACKGROUND_EDITION) {
+                        TupFrame *frame = bg->staticFrame();
+                        if (frame) {
+                            position = frame->indexOf(k->nodeGroup->parentItem());
+                        } else {
+                            #ifdef K_DEBUG
+                                QString msg = "PolyLineTool::nodeChanged() - Fatal Error: Static bg frame is NULL!";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
+                            #endif
+                            return;
+                        }
+                    } else if (project->spaceContext() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                               TupFrame *frame = bg->dynamicFrame();
+                               if (frame) {
+                                   position = frame->indexOf(k->nodeGroup->parentItem());
+                               } else {
+                                   #ifdef K_DEBUG
+                                       QString msg = "PolyLineTool::nodeChanged() - Fatal Error: Dynamic bg frame is NULL!";
+                                       #ifdef Q_OS_WIN32
+                                           qDebug() << msg;
+                                       #else
+                                           tError() << msg;
+                                       #endif
+                                   #endif
+                                   return;
+                               }
+                    } else {
+                        #ifdef K_DEBUG
+                            QString msg = "PolyLineTool::nodeChanged() - Fatal Error: Invalid spaceMode!";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
+                        #endif
+                    }
+                } else {
+                    #ifdef K_DEBUG
+                        QString msg = "PolyLineTool::nodeChanged() - Fatal Error: Scene background variable is NULL!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif
+                }
+            }
+
+            if (position >= 0 && qgraphicsitem_cast<QGraphicsPathItem *>(k->nodeGroup->parentItem())) {
+                    QDomDocument doc;
+                    doc.appendChild(qgraphicsitem_cast<TupPathItem *>(k->nodeGroup->parentItem())->toXml(doc));
+                
+                    TupProjectRequest event = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(), k->scene->currentLayerIndex(), k->scene->currentFrameIndex(), 
+                                                                                 position, QPointF(), k->scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::EditNodes, 
+                                                                                 doc.toString());
+                    emit requested(&event);
+                    // k->nodeGroup->restoreItem();
+             } else {
+               #ifdef K_DEBUG
+                   QString msg = "PolyLineTool::nodeChanged() - Fatal Error: Invalid object index || No nodeGroup parent item";
+                   #ifdef Q_OS_WIN32
+                       qDebug() << msg;
+                   #else
+                       tError() << msg;
+                   #endif
+               #endif
+               return;
+             }
+        } else {
+          #ifdef K_DEBUG
+              QString msg = "PolyLineTool::nodeChanged() - Fatal Error: Array of changed nodes is empty!";
+              #ifdef Q_OS_WIN32
+                qDebug() << msg;
+              #else
+                tError() << msg;
+              #endif
+          #endif
+          return;
+        }
+    } else {
+        #ifdef K_DEBUG
+            QString msg = "PolyLineTool::nodeChanged() - Fatal Error: Array of nodes is empty!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return;
+    }
+}
+
+int PolyLineTool::toolType() const
+{
+    return TupToolInterface::Brush;
+}
+
+QWidget *PolyLineTool::configurator() 
+{
+    if (! k->configurator)
+        k->configurator = new InfoPanel;
+
+    return k->configurator;
+}
+
+void PolyLineTool::aboutToChangeScene(TupGraphicsScene *)
+{
+    initEnv();
+}
+
+void PolyLineTool::aboutToChangeTool()
+{
+    initEnv();
+}
+
+void PolyLineTool::saveConfig()
+{
+}
+
+QCursor PolyLineTool::cursor() const
+{
+    return k->cursor;
+}
+
+void PolyLineTool::resizeNodes(qreal scaleFactor)
+{
+    k->realFactor = scaleFactor;
+    if (k->nodeGroup)
+        k->nodeGroup->resizeNodes(scaleFactor);
+}
+
+void PolyLineTool::updateZoomFactor(qreal scaleFactor)
+{
+    k->realFactor = scaleFactor;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/polyline/polylinetool.h tupi-0.2+git05/src/plugins/tools/polyline/polylinetool.h
--- tupi-0.2+git04/src/plugins/tools/polyline/polylinetool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polyline/polylinetool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,103 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef POLYLINETOOL_H
+#define POLYLINETOOL_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "tuppathitem.h"
+#include "infopanel.h"
+#include "tcontrolnode.h"
+#include "tnodegroup.h"
+
+#include <QGraphicsView>
+#include <QGraphicsPathItem>
+#include <QGraphicsLineItem>
+#include <QPainterPath>
+#include <QMatrix>
+#include <QDir>
+
+/**
+ * @author Jorge Cuadrado
+ */
+
+class TUPI_PLUGIN PolyLineTool : public TupToolPlugin
+{    
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "polylinetool.json")
+    
+    public:
+        PolyLineTool();
+        virtual ~PolyLineTool();
+        
+        virtual void init(TupGraphicsScene *scene);
+        virtual QStringList keys() const;
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        
+        virtual void keyPressEvent(QKeyEvent *event);
+
+        virtual QWidget *configurator();
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+        virtual void saveConfig();
+        virtual QCursor cursor() const;
+
+        void resizeNodes(qreal scaleFactor);
+        void updateZoomFactor(qreal scaleFactor);
+
+    protected:
+        virtual void itemResponse(const TupItemResponse *response);
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+
+    private slots:
+        void nodeChanged();
+        void initEnv();
+        
+    private:
+        void setupActions();
+        struct Private;
+        Private * const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/polyline/polylinetool.json tupi-0.2+git05/src/plugins/tools/polyline/polylinetool.json
--- tupi-0.2+git04/src/plugins/tools/polyline/polylinetool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polyline/polylinetool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "PolyLineTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/polylinetool/infopanel.cpp tupi-0.2+git05/src/plugins/tools/polylinetool/infopanel.cpp
--- tupi-0.2+git04/src/plugins/tools/polylinetool/infopanel.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polylinetool/infopanel.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "infopanel.h"
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QBoxLayout>
-#include <QTextEdit>
-
-InfoPanel::InfoPanel(QWidget *parent) :QWidget(parent)
-{
-    #ifdef K_DEBUG
-           TINIT;
-    #endif
-
-    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-
-    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *label = new QLabel(tr("Tips"));
-    label->setAlignment(Qt::AlignHCenter); 
-    layout->addWidget(label);
-
-    mainLayout->addLayout(layout);
-
-    QTextEdit *textArea = new QTextEdit; 
-    textArea->setFixedHeight(250);
-    textArea->setHtml("<p><b>" + tr("Close line") + ":</b> " + tr("X key or Right mouse button") + "</p>"); 
-    mainLayout->addWidget(textArea);
-   
-    mainLayout->addStretch(2);
-}
-
-InfoPanel::~InfoPanel()
-{
-    #ifdef K_DEBUG
-           TEND;
-    #endif
-}
-
diff -Nru tupi-0.2+git04/src/plugins/tools/polylinetool/infopanel.h tupi-0.2+git05/src/plugins/tools/polylinetool/infopanel.h
--- tupi-0.2+git04/src/plugins/tools/polylinetool/infopanel.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polylinetool/infopanel.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef INFOPANEL_H
-#define INFOPANEL_H
-
-#include <QLabel>
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class InfoPanel : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        InfoPanel(QWidget *parent = 0);
-        ~InfoPanel();
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/polylinetool/polyline.cpp tupi-0.2+git05/src/plugins/tools/polylinetool/polyline.cpp
--- tupi-0.2+git04/src/plugins/tools/polylinetool/polyline.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polylinetool/polyline.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,488 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "polyline.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-#include "tuprequestbuilder.h"
-#include "tuplibraryobject.h"
-#include "tdebug.h"
-#include "tglobal.h"
-#include "taction.h"
-#include "tupinputdeviceinformation.h"
-#include "tupgraphicsscene.h"
-#include "tupprojectrequest.h"
-#include "tupbrushmanager.h"
-#include "tupprojectresponse.h"
-
-#include <QGraphicsView>
-#include <QGraphicsPathItem>
-#include <QGraphicsLineItem>
-#include <QPainterPath>
-#include <QMatrix>
-#include <QDir>
-
-struct PolyLine::Private
-{
-    bool begin;
-    QPointF center;
-    QPointF right;
-    QPointF mirror;
-    
-    TNodeGroup *nodegroup;
-    QPainterPath path;
-    
-    QMap<QString, TAction *> actions;
-    
-    TupPathItem *item;
-    TupGraphicsScene *scene;
-    
-    QGraphicsLineItem *line1;
-    QGraphicsLineItem *line2;
-    InfoPanel *configurator;
-    QCursor cursor;
-};
-
-PolyLine::PolyLine(): k(new Private)
-{
-    k->configurator = 0;
-    k->nodegroup = 0;
-    k->item = 0;
-
-    k->cursor = QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "polyline.png");
-    
-    k->line1 = new QGraphicsLineItem(0, 0, 0, 0);
-    k->line1->setPen(QPen(QColor(55, 177, 50)));
-    k->line2 = new QGraphicsLineItem(0, 0, 0, 0);
-    k->line2->setPen(QPen(QColor(55, 177, 50)));
-    
-    setupActions();
-}
-
-PolyLine::~PolyLine()
-{
-}
-
-void PolyLine::setupActions()
-{
-    TAction *polyline = new TAction(QIcon(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "polyline.png"), tr("PolyLine"), this);
-    polyline->setShortcut(QKeySequence(tr("S")));
-    polyline->setCursor(k->cursor);
-
-    k->actions.insert(tr("PolyLine"), polyline);
-}
-
-QMap<QString, TAction *> PolyLine::actions() const
-{
-    return k->actions;
-}
-
-void PolyLine::init(TupGraphicsScene *scene)
-{
-    k->scene = scene;
-    initEnv();
-
-    foreach (QGraphicsView *view,  scene->views()) {
-             view->setDragMode(QGraphicsView::NoDrag);
-        
-             foreach (QGraphicsItem *item, scene->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-QStringList PolyLine::keys() const
-{
-    return QStringList() << tr("PolyLine");
-}
-
-void PolyLine::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    scene->clearSelection();
-
-    if (k->begin) {
-        k->path = QPainterPath();
-        k->path.moveTo(input->pos());
-
-        k->item = new TupPathItem();
-        k->item->setPath(k->path);
-        scene->includeObject(k->item);
-    } else {
-        if (!scene->items().contains(k->item))
-            scene->includeObject(k->item);
-        
-        k->path = k->item->path();
-
-       // SQA: What are the k->right/k->mirror initial values?
-        k->path.cubicTo(k->right, k->mirror, input->pos());
-    }
-    
-    k->center = input->pos();
-    k->item->setPen(brushManager->pen());
-    
-    if (!scene->items().contains(k->line1))
-        scene->includeObject(k->line1); 
-
-    if (!scene->items().contains(k->line2))
-        scene->includeObject(k->line2);
-}
-
-void PolyLine::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-
-    k->mirror = k->center - (input->pos() - k->center);
-
-    if (k->begin) {
-        k->right = input->pos();
-    } else {
-        for (int i=k->path.elementCount()-1; i>=0; i--) {
-             if (k->path.elementAt(i).type == QPainterPath::CurveToElement) {
-                 k->right = input->pos();
-                 if (k->path.elementAt(i+1).type == QPainterPath::CurveToDataElement)
-                     k->path.setElementPositionAt(i+1, k->mirror.x(), k->mirror.y());
-                 break;
-             }
-        }
-    }
-    
-    k->item->setPath(k->path);
-    k->line1->setLine(QLineF(k->mirror, k->center));
-    k->line2->setLine(QLineF(k->right, k->center));
-}
-
-void PolyLine::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (!k->nodegroup) {
-        k->nodegroup = new TNodeGroup(k->item, scene, TNodeGroup::Polyline, k->item->zValue()+1);
-        connect(k->nodegroup, SIGNAL(nodeReleased()), this, SLOT(nodeChanged()));
-    } else {
-        k->nodegroup->createNodes(k->item);
-    }
-    
-    if (k->begin) {
-        QDomDocument doc;
-        doc.appendChild(k->item->toXml(doc));
-        TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), 
-                                                       scene->currentLayerIndex(), 
-                                                       scene->currentFrameIndex(), 
-                                                       0, QPointF(), scene->spaceMode(), TupLibraryObject::Item, 
-                                                       TupProjectRequest::Add, doc.toString());
-        emit requested(&request);
-
-        k->begin = false;
-    } 
-}
-
-void PolyLine::itemResponse(const TupItemResponse *response)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    TupProject *project = k->scene->scene()->project();
-    QGraphicsItem *item = 0;
-    TupScene *scene = 0;
-    TupLayer *layer = 0;
-    TupFrame *frame = 0;
-
-    if (project) {
-        scene = project->scene(response->sceneIndex());
-        if (scene) {
-            if (project->spaceContext() == TupProject::FRAMES_EDITION) {
-                layer = scene->layer(response->layerIndex());
-                if (layer) {
-                    frame = layer->frame(response->frameIndex());
-                    if (frame) {
-                        item = frame->item(response->itemIndex());
-                    } else {
-                        #ifdef K_DEBUG
-                               tError() << "PolyLine::itemResponse() - Fatal Error: Frame variable is NULL!";
-                        #endif
-                    }
-                } else {
-                    #ifdef K_DEBUG
-                           tError() << "PolyLine::itemResponse() - Fatal Error: Layer variable is NULL!";
-                    #endif
-                }
-            } else {
-                TupBackground *bg = scene->background();
-                if (bg) {
-                    if (project->spaceContext() == TupProject::STATIC_BACKGROUND_EDITION) {
-                        TupFrame *frame = bg->staticFrame();
-                        if (frame) {
-                            item = frame->item(response->itemIndex());
-                        } else {
-                            #ifdef K_DEBUG
-                                   tError() << "PolyLine::itemResponse() - Fatal Error: Static bg frame variable is NULL!";
-                            #endif
-                        }
-                    } else if (project->spaceContext() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                               TupFrame *frame = bg->dynamicFrame();
-                               if (frame) {
-                                   item = frame->item(response->itemIndex());
-                               } else {
-                                   #ifdef K_DEBUG
-                                          tError() << "PolyLine::itemResponse() - Fatal Error: Dynamic bg frame variable is NULL!";
-                                   #endif
-                               }
-                    } else {
-                        #ifdef K_DEBUG
-                               tError() << "PolyLine::itemResponse() - Fatal Error: Invalid spaceMode!";
-                        #endif
-                    }
-                } else {
-                    #ifdef K_DEBUG
-                           tError() << "PolyLine::itemResponse() - Fatal Error: Scene bg variable is NULL!";
-                    #endif
-                }
-            }
-        } else {
-            #ifdef K_DEBUG
-                   tError() << "PolyLine::itemResponse() - Fatal Error: Scene variable is NULL!";
-            #endif
-        }
-    } else {
-        #ifdef K_DEBUG
-               tError() << "PolyLine::itemResponse() - Fatal Error: Project variable is NULL!";
-        #endif
-    }
-        
-    switch (response->action()) {
-        case TupProjectRequest::Add:
-        {
-            if (TupPathItem *path = qgraphicsitem_cast<TupPathItem *>(item)) {
-                if (k->item != path) {
-                    k->item = path;
-                    if (k->nodegroup)
-                        k->nodegroup->setParentItem(path);
-                }
-            }
-        }
-        break;
-        case TupProjectRequest::Remove:
-        {
-            // SQA: This code is really being used
-            /*
-            if (item == k->item) {
-                k->path = QPainterPath();
-                delete k->item;
-                k->item = 0;
-                delete k->nodegroup;
-                k->nodegroup = 0;
-            }
-            */
-        }
-        break;
-        case TupProjectRequest::EditNodes:
-        {
-            if (k->nodegroup && item) {
-                if (qgraphicsitem_cast<QGraphicsPathItem *>(k->nodegroup->parentItem()) != item) {
-                    delete k->item;
-                    k->item = qgraphicsitem_cast<TupPathItem *>(item);
-                    k->nodegroup->setParentItem(k->item);
-                }
-
-                k->nodegroup->createNodes(k->item);
-                k->nodegroup->saveParentProperties();
-                k->nodegroup->expandAllNodes();
-            }
-        }
-        break;
-        default: 
-        break;
-    }
-}
-
-void PolyLine::keyPressEvent(QKeyEvent *event)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
-        emit closeHugeCanvas();
-    } else if (event->key() == Qt::Key_X) {
-               initEnv();
-    } else {
-        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-        if (flags.first != -1 && flags.second != -1)
-            emit callForPlugin(flags.first, flags.second);
-    }
-}
-
-void PolyLine::initEnv()
-{
-    k->begin = true;
-    k->path = QPainterPath();
-    k->item = 0;
-
-    if (k->nodegroup) { 
-        k->nodegroup->clear();
-        k->nodegroup = 0;
-    }
-
-    if (k->line1) {
-        if (k->scene->items().contains(k->line1))
-            k->scene->removeItem(k->line1);
-    }
-    if (k->line2) {
-        if (k->scene->items().contains(k->line2))
-            k->scene->removeItem(k->line2);
-    }
-}
-
-void PolyLine::nodeChanged()
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    if (k->nodegroup) {
-        if (!k->nodegroup->changedNodes().isEmpty()) {
-            int position = -1;
-            TupProject *project = k->scene->scene()->project();
-            if (project->spaceContext() == TupProject::FRAMES_EDITION) {
-                position = k->scene->currentFrame()->indexOf(k->nodegroup->parentItem());
-            } else {
-                TupBackground *bg = k->scene->scene()->background();
-                if (bg) {
-                    if (project->spaceContext() == TupProject::STATIC_BACKGROUND_EDITION) {
-                        TupFrame *frame = bg->staticFrame();
-                        if (frame) {
-                            position = frame->indexOf(k->nodegroup->parentItem());
-                        } else {
-                            #ifdef K_DEBUG
-                                   tError() << "PolyLine::nodeChanged() - Fatal Error: Static bg frame is NULL!";
-                            #endif
-                            return;
-                        }
-                    } else if (project->spaceContext() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                               TupFrame *frame = bg->dynamicFrame();
-                               if (frame) {
-                                   position = frame->indexOf(k->nodegroup->parentItem());
-                               } else {
-                                   #ifdef K_DEBUG
-                                          tError() << "PolyLine::nodeChanged() - Fatal Error: Dynamic bg frame is NULL!";
-                                   #endif
-                                   return;
-                               }
-                    } else {
-                        #ifdef K_DEBUG
-                               tError() << "PolyLine::nodeChanged() - Fatal Error: Invalid spaceMode!";
-                        #endif
-                    }
-                } else {
-                    #ifdef K_DEBUG
-                           tError() << "PolyLine::nodeChanged() - Fatal Error: Scene background variable is NULL!";
-                    #endif
-                }
-            }
-
-            if (position >= 0 && qgraphicsitem_cast<QGraphicsPathItem *>(k->nodegroup->parentItem())) {
-                    QDomDocument doc;
-                    doc.appendChild(qgraphicsitem_cast<TupPathItem *>(k->nodegroup->parentItem())->toXml(doc));
-                
-                    TupProjectRequest event = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(), k->scene->currentLayerIndex(), k->scene->currentFrameIndex(), 
-                                                                                 position, QPointF(), k->scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::EditNodes, 
-                                                                                 doc.toString());
-                    emit requested(&event);
-                    // k->nodegroup->restoreItem();
-             } else {
-               #ifdef K_DEBUG
-                      tError() << "PolyLine::nodeChanged() - Fatal Error: Invalid object index || No nodegroup parent item";
-               #endif
-               return;
-             }
-        } else {
-          #ifdef K_DEBUG
-                 tError() << "PolyLine::nodeChanged() - Fatal Error: Array of changed nodes is empty!";
-          #endif
-          return;
-        }
-    } else {
-        #ifdef K_DEBUG
-               tError() << "PolyLine::nodeChanged() - Fatal Error: Array of nodes is empty!";
-        #endif
-        return;
-    }
-}
-
-int PolyLine::toolType() const
-{
-    return TupToolInterface::Brush;
-}
-
-QWidget *PolyLine::configurator() 
-{
-    if (! k->configurator)
-        k->configurator = new InfoPanel;
-
-    return k->configurator;
-}
-
-void PolyLine::aboutToChangeScene(TupGraphicsScene *)
-{
-    initEnv();
-}
-
-void PolyLine::aboutToChangeTool()
-{
-    initEnv();
-}
-
-void PolyLine::saveConfig()
-{
-}
-
-QCursor PolyLine::cursor() const
-{
-    return k->cursor;
-}
-
-Q_EXPORT_PLUGIN2(tup_polyline, PolyLine);
diff -Nru tupi-0.2+git04/src/plugins/tools/polylinetool/polyline.h tupi-0.2+git05/src/plugins/tools/polylinetool/polyline.h
--- tupi-0.2+git04/src/plugins/tools/polylinetool/polyline.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polylinetool/polyline.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef POLYLINE_H
-#define POLYLINE_H
-
-#include "tuptoolplugin.h"
-#include "tuppathitem.h"
-#include "infopanel.h"
-#include "tcontrolnode.h"
-#include "tnodegroup.h"
-
-/**
- * @author Jorge Cuadrado
- */
-
-class PolyLine : public TupToolPlugin
-{    
-    Q_OBJECT
-    
-    public:
-        PolyLine();
-        virtual ~PolyLine();
-        
-        virtual void init(TupGraphicsScene *scene);
-        virtual QStringList keys() const;
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        
-        virtual void keyPressEvent(QKeyEvent *event);
-
-        virtual QWidget *configurator();
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-        virtual void saveConfig();
-        virtual QCursor cursor() const;
-
-    protected:
-        virtual void itemResponse(const TupItemResponse *response);
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
-
-    private slots:
-        void nodeChanged();
-        void initEnv();
-        
-    private:
-        void setupActions();
-        struct Private;
-        Private * const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/polylinetool/polylinetool.json tupi-0.2+git05/src/plugins/tools/polylinetool/polylinetool.json
--- tupi-0.2+git04/src/plugins/tools/polylinetool/polylinetool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polylinetool/polylinetool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "PolyLineTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/polylinetool/polylinetool.pro tupi-0.2+git05/src/plugins/tools/polylinetool/polylinetool.pro
--- tupi-0.2+git04/src/plugins/tools/polylinetool/polylinetool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/polylinetool/polylinetool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/polylinetool
-# Target is a library:  
-
-INSTALLS += target
-target.path = /plugins/
-
-HEADERS += polyline.h \
-           infopanel.h
-
-SOURCES += polyline.cpp \
-           infopanel.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupipolylinetool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-include(../../../../tupiglobal.pri)
-
diff -Nru tupi-0.2+git04/src/plugins/tools/position/configurator.cpp tupi-0.2+git05/src/plugins/tools/position/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/position/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/position/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,367 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+#include "tweenmanager.h"
+#include "buttonspanel.h"
+#include "tupitemtweener.h"
+#include "stepsviewer.h"
+#include "tuptweenerstep.h"
+#include "tosd.h"
+#include "tradiobuttongroup.h"
+#include "timagebutton.h"
+
+struct Configurator::Private
+{
+    QBoxLayout *layout; 
+    QBoxLayout *settingsLayout;
+    Settings *settingsPanel;
+    TweenManager *tweenManager;
+    ButtonsPanel *controlPanel;
+
+    bool selectionDone;
+
+    TImageButton *removeButton;
+    TImageButton *editButton;
+
+    TupToolPlugin::Mode mode; 
+    GuiState state;
+
+    int framesTotal;
+    int currentFrame;
+
+    TupItemTweener *currentTween;
+};
+
+Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
+{
+    k->framesTotal = 1;
+    k->currentFrame = 0;
+
+    k->mode = TupToolPlugin::View;
+    k->selectionDone = false;
+    k->state = Manager;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    QLabel *title = new QLabel(tr("Position Tween"));
+    title->setAlignment(Qt::AlignHCenter);
+    title->setFont(QFont("Arial", 8, QFont::Bold));
+
+    k->layout->addWidget(title);
+
+    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    k->settingsLayout->setMargin(0);
+    k->settingsLayout->setSpacing(0);
+
+    setTweenManagerPanel();
+    setButtonsPanel();
+    setPropertiesPanel();
+
+    k->layout->addLayout(k->settingsLayout);
+    k->layout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    delete k;
+}
+
+void Configurator::loadTweenList(QList<QString> tweenList)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Configurator::loadTweenList()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    k->tweenManager->loadTweenList(tweenList);
+    if (tweenList.count() > 0)
+        activeButtonsPanel(true); 
+}
+
+void Configurator::setPropertiesPanel()
+{
+    k->settingsPanel = new Settings(this);
+
+    connect(k->settingsPanel, SIGNAL(startingFrameChanged(int)), this, SIGNAL(startingFrameChanged(int)));
+
+    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
+    connect(k->settingsPanel, SIGNAL(clickedCreatePath()), this, SIGNAL(clickedCreatePath()));
+
+    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
+    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
+
+    k->settingsLayout->addWidget(k->settingsPanel);
+
+    activePropertiesPanel(false);
+}
+
+void Configurator::activePropertiesPanel(bool enable)
+{
+    if (enable)
+        k->settingsPanel->show();
+    else
+        k->settingsPanel->hide();
+}
+
+void Configurator::setTweenManagerPanel()
+{
+    k->tweenManager = new TweenManager(this);
+
+    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
+    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
+
+    k->settingsLayout->addWidget(k->tweenManager);
+
+    k->state = Manager;
+}
+
+void Configurator::activeTweenManagerPanel(bool enable)
+{
+    if (enable) 
+        k->tweenManager->show();
+    else 
+        k->tweenManager->hide();
+
+    if (k->tweenManager->listSize() > 0)
+        activeButtonsPanel(enable);
+}
+
+void Configurator::setButtonsPanel()
+{
+    k->controlPanel = new ButtonsPanel(this);
+    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
+    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
+
+    k->settingsLayout->addWidget(k->controlPanel);
+
+    activeButtonsPanel(false);
+}
+
+void Configurator::activeButtonsPanel(bool enable)
+{
+    if (enable)
+        k->controlPanel->show();
+    else
+        k->controlPanel->hide();
+}
+
+void Configurator::initStartCombo(int framesTotal, int currentFrame)
+{
+    k->framesTotal = framesTotal;
+    k->currentFrame = currentFrame;
+    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
+}
+
+void Configurator::setStartFrame(int currentIndex)
+{
+    k->currentFrame = currentIndex;
+    k->settingsPanel->setStartFrame(currentIndex);
+}
+
+int Configurator::startFrame()
+{
+    return k->settingsPanel->startFrame();
+}
+
+int Configurator::startComboSize()
+{
+    return k->settingsPanel->startComboSize();
+}
+
+void Configurator::updateSteps(const QGraphicsPathItem *path)
+{
+    k->settingsPanel->updateSteps(path);
+}
+
+QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point, QString &path)
+{
+    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame, point, path);
+}
+
+int Configurator::totalSteps()
+{
+    return k->settingsPanel->totalSteps();
+}
+
+void Configurator::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->settingsPanel->activateMode(mode);
+}
+
+void Configurator::cleanData()
+{
+    k->settingsPanel->cleanData();
+}
+
+void Configurator::addTween(const QString &name)
+{
+    k->mode = TupToolPlugin::Add;
+
+    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
+
+    activeTweenManagerPanel(false);
+    activePropertiesPanel(true);
+
+    k->state = Properties;
+
+    emit setMode(k->mode);
+}
+
+void Configurator::editTween()
+{
+    activeTweenManagerPanel(false);
+
+    k->mode = TupToolPlugin::Edit;
+    k->state = Properties;
+
+    k->settingsPanel->notifySelection(true);
+    k->settingsPanel->setParameters(k->currentTween);
+    activePropertiesPanel(true);
+
+    emit setMode(k->mode);
+}
+
+void Configurator::closeTweenProperties()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Configurator::closeTweenProperties()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    if (k->mode == TupToolPlugin::Add)
+        k->tweenManager->removeItemFromList();
+
+    emit clickedResetInterface();
+
+    closeSettingsPanel();
+}
+
+void Configurator::removeTween()
+{
+    QString name = k->tweenManager->currentTweenName();
+    k->tweenManager->removeItemFromList();
+
+    removeTween(name);
+}
+
+void Configurator::removeTween(const QString &name)
+{
+    if (k->tweenManager->listSize() == 0)
+        activeButtonsPanel(false);
+
+    emit clickedRemoveTween(name);
+}
+
+QString Configurator::currentTweenName() const
+{
+    // SQA: if name has been changed... change the item at TweenManager!
+    QString oldName = k->tweenManager->currentTweenName();
+    QString newName = k->settingsPanel->currentTweenName();
+
+    if (oldName.compare(newName) != 0)
+        k->tweenManager->updateTweenName(newName);
+
+    return newName;
+}
+
+void Configurator::notifySelection(bool flag)
+{
+    k->settingsPanel->notifySelection(flag); 
+}
+
+void Configurator::closeSettingsPanel()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Configurator::closeSettingsPanel()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    if (k->state == Properties) {
+        activeTweenManagerPanel(true);
+        activePropertiesPanel(false);
+        k->mode = TupToolPlugin::View;
+        k->state = Manager;
+    }
+}
+
+TupToolPlugin::Mode Configurator::mode()
+{
+    return k->mode;
+}
+
+void Configurator::applyItem()
+{
+     k->mode = TupToolPlugin::Edit;
+     emit clickedApplyTween();
+}
+
+void Configurator::resetUI()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Configurator::resetUI()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    k->tweenManager->resetUI();
+    closeSettingsPanel();
+    k->settingsPanel->notifySelection(false);
+}
+
+void Configurator::updateTweenData(const QString &name)
+{
+    emit getTweenData(name);
+}
+
+void Configurator::setCurrentTween(TupItemTweener *currentTween)
+{
+    k->currentTween = currentTween;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/position/configurator.h tupi-0.2+git05/src/plugins/tools/position/configurator.h
--- tupi-0.2+git04/src/plugins/tools/position/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/position/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,129 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "settings.h"
+
+#include <QFrame>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QComboBox>
+#include <QBoxLayout>
+#include <QHeaderView>
+#include <QGraphicsPathItem>
+#include <QMenu>
+#include <QAction>
+
+// class QGraphicsPathItem;
+// class QListWidgetItem;
+class TupItemTweener;
+
+/**
+ * @author Jorge Cuadrado
+*/
+
+class TUPI_PLUGIN Configurator : public QFrame
+{
+    Q_OBJECT
+
+    public:
+        enum GuiState { Manager = 1, Properties };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+
+        void loadTweenList(QList<QString> tweenList);
+
+        void setPropertiesPanel();
+        void activePropertiesPanel(bool enable);
+
+        void setTweenManagerPanel();
+        void activeTweenManagerPanel(bool enable);
+
+        void setButtonsPanel();
+        void activeButtonsPanel(bool enable);
+
+        void initStartCombo(int framesTotal, int currentFrame);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+
+        void updateSteps(const QGraphicsPathItem *path);
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point, QString &path);
+        int totalSteps();
+        // void activateSelectionMode();
+        void activateMode(TupToolPlugin::EditMode mode);
+        void cleanData();
+        QString currentTweenName() const;
+        void notifySelection(bool flag);
+        int startComboSize();
+        void closeSettingsPanel();
+        TupToolPlugin::Mode mode();
+        void resetUI();
+        void setCurrentTween(TupItemTweener *currentTween);
+
+    public slots:
+        void closeTweenProperties();
+        
+    private slots:
+        void applyItem();
+        void addTween(const QString &name);
+        void editTween();
+        void removeTween();
+        void removeTween(const QString &name);
+        void updateTweenData(const QString &name);
+        
+    signals:
+        void clickedCreatePath();
+        void clickedSelect();
+        void clickedRemoveTween(const QString &);
+        void setMode(TupToolPlugin::Mode mode);
+        void clickedResetInterface();
+        void clickedApplyTween();
+        void startingFrameChanged(int);
+        // void editModeOn();
+        void getTweenData(const QString &);
+        
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/position/position.pro tupi-0.2+git05/src/plugins/tools/position/position.pro
--- tupi-0.2+git04/src/plugins/tools/position/position.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/position/position.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,39 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += tweener.h \
+           configurator.h \
+           settings.h
+		   
+SOURCES += tweener.cpp \
+           configurator.cpp \
+           settings.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupipositiontool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/position/positiontool.json tupi-0.2+git05/src/plugins/tools/position/positiontool.json
--- tupi-0.2+git04/src/plugins/tools/position/positiontool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/position/positiontool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "PositionTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/position/settings.cpp tupi-0.2+git05/src/plugins/tools/position/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/position/settings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/position/settings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,345 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "settings.h"
+#include "tradiobuttongroup.h"
+#include "timagebutton.h"
+#include "tupitemtweener.h"
+#include "stepsviewer.h"
+#include "tuptweenerstep.h"
+#include "tosd.h"
+
+struct Settings::Private
+{
+    QWidget *innerPanel;
+    QBoxLayout *layout; 
+
+    QLineEdit *input;
+    TRadioButtonGroup *options;
+    StepsViewer *stepViewer;
+    QSpinBox *comboInit;
+    QLabel *totalLabel;
+    bool selectionDone;
+    TupToolPlugin::Mode mode; 
+
+    TImageButton *apply;
+    TImageButton *remove;
+};
+
+Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    k->selectionDone = false;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QFont font = this->font();
+    font.setPointSize(8);
+    setFont(font);
+
+    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
+    k->input = new QLineEdit;
+
+    QHBoxLayout *nameLayout = new QHBoxLayout;
+    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    nameLayout->setMargin(0);
+    nameLayout->setSpacing(0);
+    nameLayout->addWidget(nameLabel);
+    nameLayout->addWidget(k->input);
+
+    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
+    k->options->addItem(tr("Select object"), 0);
+    k->options->addItem(tr("Set Properties"), 1);
+    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
+
+    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
+    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
+
+    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
+    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(10);
+    buttonsLayout->addWidget(k->apply);
+    buttonsLayout->addWidget(k->remove);
+
+    k->layout->addLayout(nameLayout);
+    k->layout->addWidget(k->options);
+
+    setInnerForm();
+
+    k->layout->addSpacing(10);
+    k->layout->addLayout(buttonsLayout);
+    k->layout->setSpacing(5);
+
+    activateMode(TupToolPlugin::Selection);
+}
+
+Settings::~Settings()
+{
+    delete k;
+}
+
+void Settings::setInnerForm()
+{
+    k->innerPanel = new QWidget; 
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
+    startingLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    k->comboInit = new QSpinBox();
+
+    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SIGNAL(startingFrameChanged(int)));
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(k->comboInit);
+
+    k->stepViewer = new StepsViewer;
+    k->stepViewer->verticalHeader()->hide();
+
+    k->totalLabel = new QLabel(tr("Frames Total") + ": 0");
+    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    QHBoxLayout *totalLayout = new QHBoxLayout;
+    totalLayout->setAlignment(Qt::AlignHCenter);
+    totalLayout->setMargin(0);
+    totalLayout->setSpacing(0);
+    totalLayout->addWidget(k->totalLabel);
+
+    innerLayout->addWidget(startingLabel);
+    innerLayout->addLayout(startLayout);
+    innerLayout->addWidget(k->stepViewer);
+
+    innerLayout->addLayout(totalLayout);
+
+    k->layout->addWidget(k->innerPanel);
+
+    activeInnerForm(false);
+}
+
+void Settings::activeInnerForm(bool enable)
+{
+    if (enable && !k->innerPanel->isVisible())
+        k->innerPanel->show();
+    else
+        k->innerPanel->hide();
+}
+
+// Adding new Tween
+
+void Settings::setParameters(const QString &name, int framesTotal, int startFrame)
+{
+    k->mode = TupToolPlugin::Add;
+    k->input->setText(name);
+
+    activateMode(TupToolPlugin::Selection);
+    k->stepViewer->cleanRows();
+    k->totalLabel->setText(tr("Frames Total") + ": 0");
+
+    k->comboInit->setEnabled(false);
+    k->apply->setToolTip(tr("Save Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
+    k->remove->setToolTip(tr("Cancel Tween"));
+
+    initStartCombo(framesTotal, startFrame);
+}
+
+// Editing new Tween
+
+void Settings::setParameters(TupItemTweener *currentTween)
+{
+    setEditMode();
+
+    notifySelection(true);
+    activateMode(TupToolPlugin::Properties);
+
+    k->input->setText(currentTween->name());
+    k->comboInit->setEnabled(true);
+
+    initStartCombo(currentTween->frames(), currentTween->initFrame());
+
+    k->stepViewer->setPath(currentTween->graphicsPath());
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->stepViewer->totalSteps()));
+}
+
+void Settings::initStartCombo(int framesTotal, int currentIndex)
+{
+    k->comboInit->clear();
+    k->comboInit->setMinimum(1);
+    k->comboInit->setMaximum(framesTotal);
+    k->comboInit->setValue(currentIndex);
+}
+
+void Settings::setStartFrame(int currentIndex)
+{
+    k->comboInit->setValue(currentIndex);
+}
+
+int Settings::startFrame()
+{
+    return k->comboInit->value() - 1;
+}
+
+int Settings::startComboSize()
+{
+    return k->comboInit->maximum();
+}
+
+void Settings::updateSteps(const QGraphicsPathItem *path)
+{
+    k->stepViewer->setPath(path);
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->stepViewer->totalSteps()));
+}
+
+void Settings::emitOptionChanged(int option)
+{
+    switch (option) {
+            case 0:
+             {
+                 activeInnerForm(false);
+                 emit clickedSelect();
+             }
+            break;
+            case 1:
+             {
+                 if (k->selectionDone) {
+                     activeInnerForm(true);
+                     emit clickedCreatePath();
+                 } else {
+                     k->options->setCurrentIndex(0);
+                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);   
+                 }
+             }
+    }
+}
+
+QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point, QString &path)
+{
+    QDomDocument doc;
+
+    QDomElement root = doc.createElement("tweening");
+    root.setAttribute("name", currentTweenName());
+    root.setAttribute("type", TupItemTweener::Position);
+    root.setAttribute("initFrame", currentFrame);
+    root.setAttribute("initLayer", currentLayer);
+    root.setAttribute("initScene", currentScene);
+    root.setAttribute("frames", k->stepViewer->totalSteps());
+    root.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
+    root.setAttribute("coords", path);
+
+    foreach (TupTweenerStep *step, k->stepViewer->steps())
+             root.appendChild(step->toXml(doc));
+
+    doc.appendChild(root);
+
+    return doc.toString();
+}
+
+int Settings::totalSteps()
+{
+    return k->stepViewer->totalSteps();
+}
+
+/*
+void Settings::activatePathMode()
+{
+    k->options->setCurrentIndex(1);
+}
+
+void Settings::activateSelectionMode()
+{
+    k->options->setCurrentIndex(0);
+}
+*/
+
+void Settings::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->options->setCurrentIndex(mode);
+}
+
+void Settings::cleanData()
+{
+    k->stepViewer->cleanRows();
+}
+
+void Settings::notifySelection(bool flag)
+{
+    k->selectionDone = flag;
+}
+
+void Settings::applyTween()
+{
+    if (!k->selectionDone) {
+        k->options->setCurrentIndex(0);
+        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
+        return;
+    }
+
+    if (totalSteps() <= 2) {
+        TOsd::self()->display(tr("Info"), tr("You must define a path for this Tween!"), TOsd::Info);
+        return;
+    }
+
+    // SQA: Verify Tween is really well applied before call setEditMode!
+    setEditMode();
+
+    if (!k->comboInit->isEnabled())
+        k->comboInit->setEnabled(true);
+
+    emit clickedApplyTween();
+}
+
+void Settings::setEditMode()
+{
+    k->mode = TupToolPlugin::Edit;
+    k->apply->setToolTip(tr("Update Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
+    k->remove->setToolTip(tr("Close Tween properties"));
+}
+
+QString Settings::currentTweenName() const
+{
+    QString tweenName = k->input->text();
+    if (tweenName.length() > 0)
+        k->input->setFocus();
+
+    return tweenName;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/position/settings.h tupi-0.2+git05/src/plugins/tools/position/settings.h
--- tupi-0.2+git04/src/plugins/tools/position/settings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/position/settings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,104 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+
+#include <QWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QSpinBox>
+#include <QBoxLayout>
+#include <QHeaderView>
+#include <QGraphicsPathItem>
+#include <QDir>
+
+// class QGraphicsPathItem;
+class TupItemTweener;
+
+/**
+ * @author Jorge Cuadrado
+*/
+
+class TUPI_PLUGIN Settings : public QWidget 
+{
+    Q_OBJECT
+
+    public:
+        Settings(QWidget *parent = 0);
+        ~Settings();
+
+        void setParameters(const QString &name, int framesTotal, int startFrame);
+        void setParameters(TupItemTweener *currentTween);
+        void initStartCombo(int totalFrames, int currentIndex);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+
+        void updateSteps(const QGraphicsPathItem *path);
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point, QString &path);
+        int totalSteps();
+        // void activatePathMode();
+        // void activateSelectionMode();
+        void activateMode(TupToolPlugin::EditMode mode);
+        void cleanData();
+        void notifySelection(bool flag);
+        int startComboSize();
+        QString currentTweenName() const;
+        
+    private slots:
+        void emitOptionChanged(int option);
+        // void addTween();
+        void applyTween();
+        
+    signals:
+        void clickedCreatePath();
+        void clickedSelect();
+        void clickedResetTween();
+        void clickedApplyTween();
+        void startingFrameChanged(int);
+        
+    private:
+        void setInnerForm();
+        void activeInnerForm(bool enable);
+        void setEditMode();
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/position/tweener.cpp tupi-0.2+git05/src/plugins/tools/position/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/position/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/position/tweener.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,927 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tweener.h"
+#include "configurator.h"
+#include "taction.h"
+#include "tnodegroup.h"
+#include "tosd.h"
+#include "tupsvg2qt.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicsscene.h"
+#include "tupgraphicobject.h"
+#include "tuppathitem.h"
+#include "tupellipseitem.h"
+#include "tuprectitem.h"
+#include "tuplineitem.h"
+#include "tupsvgitem.h"
+#include "tupitemtweener.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+
+struct Tweener::Private
+{
+    QMap<QString, TAction *> actions;
+    Configurator *configurator;
+
+    TupGraphicsScene *scene;
+    QGraphicsPathItem *path;
+    QList<QGraphicsItem *> objects;
+
+    TupItemTweener *currentTween;
+    TNodeGroup *nodesGroup;
+
+    bool isPathInScene;
+    int initFrame;
+    int initLayer;
+    int initScene;
+
+    TupToolPlugin::Mode mode;
+    TupToolPlugin::EditMode editMode;
+
+    QPointF itemObjectReference;
+    QPointF pathOffset;
+    QPointF firstNode;
+
+    int baseZValue;
+};
+
+Tweener::Tweener() : TupToolPlugin(), k(new Private)
+{
+    setupActions();
+
+    k->configurator = 0;
+    k->path = 0;
+    k->nodesGroup = 0;
+    k->currentTween = 0;
+
+    k->initFrame = 0;
+    k->initLayer = 0;
+    k->initScene = 0;
+}
+
+Tweener::~Tweener()
+{
+    delete k;
+}
+
+/* This method initialize the context of the plugin */
+
+void Tweener::init(TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::init()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    if (k->nodesGroup) {
+        k->nodesGroup->clear();
+        delete k->nodesGroup;
+        k->nodesGroup = 0;
+    }
+
+    if (k->path) {
+        delete k->path;
+        k->path = 0;
+    }
+
+    k->scene = scene;
+    k->objects.clear();
+    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
+
+    k->isPathInScene = false;
+    k->pathOffset = QPointF(0, 0); 
+    k->firstNode = QPointF(0, 0);
+    k->itemObjectReference = QPointF(0, 0);
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+
+    k->configurator->resetUI();
+
+    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Position);
+    if (tweenList.size() > 0) {
+        k->configurator->loadTweenList(tweenList);
+        setCurrentTween(tweenList.at(0));
+    }
+
+    int total = framesTotal();
+    k->configurator->initStartCombo(total, k->scene->currentFrameIndex());
+}
+
+void Tweener::updateStartFrame(int index)
+{
+    if (k->initFrame != index && index >= 0)
+        k->initFrame = index - 1;
+}
+
+/* This method returns the plugin name */
+
+QStringList Tweener::keys() const
+{
+    return QStringList() << tr("Position Tween");
+}
+
+/* This method makes an action when the mouse is pressed on the workspace 
+ * depending on the active mode: Selecting an object or Creating a path  
+*/
+
+void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::press()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+
+    if (k->editMode == TupToolPlugin::Properties && k->scene->currentFrameIndex() == k->initFrame) {
+        if (k->path) {
+            QPointF point = k->path->mapFromParent(input->pos());
+            QPainterPath path = k->path->path();
+            path.cubicTo(point, point, point);
+            k->path->setPath(path);
+        }
+    } 
+}
+
+/* This method is executed while the mouse is pressed and on movement */
+
+void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method finishes the action started on the press method depending
+ * on the active mode: Selecting an object or Creating a path
+*/
+
+void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::release()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (scene->currentFrameIndex() == k->initFrame) {
+        if (k->editMode == TupToolPlugin::Properties) {
+            if (k->nodesGroup) {
+                k->nodesGroup->createNodes(k->path);
+                k->nodesGroup->show();
+                k->nodesGroup->expandAllNodes();
+                k->configurator->updateSteps(k->path);
+                QPainterPath::Element e = k->path->path().elementAt(0);
+                QPointF begin = QPointF(e.x, e.y);
+
+                if (begin != k->firstNode) {
+                    QPointF oldPos = k->firstNode;
+                    QPointF newPos = begin;
+
+                    int distanceX = newPos.x() - oldPos.x();
+                    int distanceY = newPos.y() - oldPos.y();
+
+                    if (k->objects.size() > 0) {
+                        foreach (QGraphicsItem *item, k->objects)
+                                 item->moveBy(distanceX, distanceY);
+                        QGraphicsItem *item = k->objects.at(0);
+                        QRectF rect = item->sceneBoundingRect();
+                        k->itemObjectReference = rect.center();
+                    }
+
+                    k->firstNode = newPos;
+                }
+            }
+        } else {
+            if (scene->selectedItems().size() > 0) {
+                k->objects = scene->selectedItems();
+                k->configurator->notifySelection(true);
+
+                QGraphicsItem *item = k->objects.at(0);
+                QRectF rect = item->sceneBoundingRect();
+                QPointF newPos = rect.center();
+                QPointF oldPos = k->itemObjectReference;
+                k->itemObjectReference = newPos;
+
+                if (!k->path) {
+                    k->path = new QGraphicsPathItem;
+                    k->path->setZValue(k->baseZValue);
+
+                    QColor color(55, 155, 55, 200);
+                    QPen pen(QBrush(color), 2, Qt::DashDotLine, Qt::RoundCap, Qt::RoundJoin);
+                    k->path->setPen(pen);
+
+                    QPainterPath path;
+                    path.moveTo(newPos);
+                    k->firstNode = newPos;
+                    k->path->setPath(path);
+                    scene->addItem(k->path);
+                    k->isPathInScene = true;
+
+                    k->pathOffset = QPointF(0, 0);
+                } else {
+                    int distanceX = newPos.x() - oldPos.x();
+                    int distanceY = newPos.y() - oldPos.y();
+                    k->path->moveBy(distanceX, distanceY);
+
+                    k->pathOffset = QPointF(distanceX, distanceY);
+                }
+            } 
+        }
+    } 
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+QMap<QString, TAction *> Tweener::actions() const
+{
+    return k->actions;
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+int Tweener::toolType() const
+{
+    return TupToolInterface::Tweener;
+}
+
+/* This method returns the tool panel associated to this plugin */
+
+QWidget *Tweener::configurator()
+{
+    if (!k->configurator) {
+        k->mode = TupToolPlugin::View;
+
+        k->configurator = new Configurator;
+        connect(k->configurator, SIGNAL(startingFrameChanged(int)), this, SLOT(updateStartFrame(int)));
+        connect(k->configurator, SIGNAL(clickedCreatePath()), this, SLOT(setTweenPath()));
+        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
+        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
+        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
+        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode)));
+        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
+        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
+    } else {
+        k->mode = k->configurator->mode();
+    }
+
+    return k->configurator;
+}
+
+/* This method is called when there's a change on/of scene */
+void Tweener::aboutToChangeScene(TupGraphicsScene *scene)
+{
+    Q_UNUSED(scene);
+}
+
+/* This method is called when this plugin is off */
+
+void Tweener::aboutToChangeTool()
+{
+    resetGUI();
+}
+
+void Tweener::resetGUI()
+{
+    if (k->editMode == TupToolPlugin::Selection) {
+        clearSelection();
+        disableSelection();
+        return;
+    }
+
+    if (k->editMode == TupToolPlugin::Properties) {
+        if (k->path) {
+            k->scene->removeItem(k->path);
+            k->isPathInScene = false;
+            if (k->nodesGroup) {
+                k->nodesGroup->clear();
+                k->nodesGroup = 0;
+            }
+        }
+        return;
+    }
+}
+
+/* This method defines the actions contained in this plugin */
+
+void Tweener::setupActions()
+{
+    TAction *action = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "position_tween.png"), tr("Position Tween"), this);
+    action->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
+    action->setShortcut(QKeySequence(tr("Shift+W")));
+
+    k->actions.insert(tr("Position Tween"), action);
+}
+
+/* This method initializes the "Create path" mode */
+
+void Tweener::setTweenPath()
+{
+    if (k->path) {
+        k->pathOffset = QPointF(0, 0);
+
+        if (!k->isPathInScene) {
+            k->scene->addItem(k->path);
+            k->isPathInScene = true;
+        } 
+
+        if (k->nodesGroup) {
+            k->nodesGroup->createNodes(k->path);
+        } else {
+            k->nodesGroup = new TNodeGroup(k->path, k->scene, TNodeGroup::PositionTween, k->baseZValue);
+            connect(k->nodesGroup, SIGNAL(nodeReleased()), SLOT(updatePath()));
+            k->nodesGroup->createNodes(k->path);
+        }
+        k->nodesGroup->show();
+        k->nodesGroup->expandAllNodes();
+    }
+
+    k->editMode = TupToolPlugin::Properties;
+    disableSelection();
+}
+
+/* This method initializes the "Select object" mode */
+
+void Tweener::setSelection()
+{
+    if (k->mode == TupToolPlugin::Edit) {
+        if (k->initFrame != k->scene->currentFrameIndex()) {
+            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->currentTween->initScene(),
+                                                                              k->currentTween->initLayer(),
+                                                                              k->currentTween->initFrame(), 
+                                                                              TupProjectRequest::Select, "1");
+            emit requested(&request);
+        }
+    }
+
+    if (k->path) {
+        k->scene->removeItem(k->path);
+        k->isPathInScene = false;
+        if (k->nodesGroup) {
+            k->nodesGroup->clear();
+            k->nodesGroup = 0;
+        }
+    }
+
+    k->editMode = TupToolPlugin::Selection;
+
+    int bottomBoundary = 20000 + (k->scene->currentLayerIndex()*10000);
+    int topBoundary = bottomBoundary + 10000; 
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             view->setDragMode(QGraphicsView::RubberBandDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0)) 
+                           item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+             }
+    }
+
+    // When Object selection is enabled, previous selection is set
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                 item->setSelected(true);
+        }
+    }
+}
+
+/* This method transforms the path created into a QString representation */
+
+QString Tweener::pathToCoords()
+{
+    QString strPath = "";
+    QChar t;
+    int offsetX = k->pathOffset.x();
+    int offsetY = k->pathOffset.y();
+
+    for (int i=0; i < k->path->path().elementCount(); i++) {
+         QPainterPath::Element e = k->path->path().elementAt(i);
+         switch (e.type) {
+             case QPainterPath::MoveToElement:
+             {
+                 if (t != 'M') {
+                     t = 'M';
+                     strPath += "M " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                 } else {
+                     strPath += QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                 }
+             }
+             break;
+             case QPainterPath::LineToElement:
+             {
+                  if (t != 'L') {
+                      t = 'L';
+                      strPath += " L " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                  } else {
+                      strPath += QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                  }
+             }
+             break;
+             case QPainterPath::CurveToElement:
+             {
+                  if (t != 'C') {
+                      t = 'C';
+                      strPath += " C " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                  } else {
+                      strPath += "  " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
+                  }
+             }
+             break;
+             case QPainterPath::CurveToDataElement:
+             {
+                  if (t == 'C')
+                      strPath +=  " " + QString::number(e.x + offsetX) + "  " + QString::number(e.y + offsetY) + " ";
+             }
+             break;
+         }
+    }
+
+    return strPath.trimmed();
+}
+
+/* This method resets this plugin */
+
+void Tweener::applyReset()
+{
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+
+    clearSelection();
+    disableSelection();
+
+    if (k->nodesGroup) {
+        k->nodesGroup->clear();
+        k->nodesGroup = 0;
+    }
+
+    if (k->path) {
+        // if (k->initFrame == k->scene->currentFrameIndex())
+        if (k->path)
+            k->scene->removeItem(k->path);
+        k->isPathInScene = false;
+        k->path = 0;
+    }
+
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+
+    k->configurator->cleanData();
+}
+
+/* This method applies to the project, the Tween created from this plugin */
+
+void Tweener::applyTween()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::applyTween()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    QString name = k->configurator->currentTweenName();
+
+    if (name.length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
+        return;
+    }
+
+    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Position)) {
+        k->initFrame = k->scene->currentFrameIndex();
+        k->initLayer = k->scene->currentLayerIndex();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {   
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 int objectIndex = k->scene->currentFrame()->indexOf(item); 
+                 QRectF rect = item->sceneBoundingRect();
+                 QPointF point = rect.topLeft();
+
+                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = k->scene->currentFrame()->indexOf(svg);
+                 } else {
+                     if (qgraphicsitem_cast<TupPathItem *>(item) || qgraphicsitem_cast<TupEllipseItem *>(item) 
+                         || qgraphicsitem_cast<TupLineItem *>(item) || qgraphicsitem_cast<TupRectItem *>(item))
+                         point = item->pos();
+                 }
+
+                 QString route = pathToCoords();
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex,
+                                             QPointF(), k->scene->spaceMode(), type,
+                                             TupProjectRequest::SetTween, 
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, point, route));
+                 emit requested(&request);
+        }
+    } else {
+        removeTweenFromProject(name);
+        QList<QGraphicsItem *> newList;
+
+        k->initFrame = k->configurator->startFrame();
+        k->initLayer = k->currentTween->initLayer();
+        k->initScene = k->currentTween->initScene();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 TupProject *project = k->scene->scene()->project();
+                 TupScene *scene = project->scene(k->initScene);
+                 TupLayer *layer = scene->layer(k->initLayer);
+                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
+                 int objectIndex = frame->indexOf(item);
+                 QRectF rect = item->sceneBoundingRect();
+                 QPointF point = rect.topLeft();
+                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item); 
+
+                 if (svg) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = frame->indexOf(svg);
+                 } else {
+                     if (qgraphicsitem_cast<TupPathItem *>(item) || qgraphicsitem_cast<TupEllipseItem *>(item) 
+                         || qgraphicsitem_cast<TupLineItem *>(item) || qgraphicsitem_cast<TupRectItem *>(item))
+                         point = item->pos();
+                 }
+
+                 if (k->initFrame != k->currentTween->initFrame()) {
+                     QDomDocument dom;
+                     if (type == TupLibraryObject::Svg)
+                         dom.appendChild(svg->toXml(dom));
+                     else
+                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
+
+                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, 
+                                                 k->initFrame, 0, QPointF(), 
+                                                 k->scene->spaceMode(), type, 
+                                                 TupProjectRequest::Add, dom.toString());
+                     emit requested(&request);
+
+                     request = TupRequestBuilder::createItemRequest(k->currentTween->initScene(), 
+                               k->currentTween->initLayer(),
+                               k->currentTween->initFrame(),
+                               objectIndex, QPointF(), 
+                               k->scene->spaceMode(), type,
+                               TupProjectRequest::Remove);
+                     emit requested(&request);
+
+                     frame = layer->frame(k->initFrame);
+                     if (type == TupLibraryObject::Item) {
+                         objectIndex = frame->graphicItemsCount() - 1;
+                         newList.append(frame->graphic(objectIndex)->item());
+                     } else {
+                         objectIndex = frame->svgItemsCount() - 1;
+                         newList.append(frame->svg(objectIndex));
+                     }
+                 }
+
+                 QString route = pathToCoords();
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex,
+                                             QPointF(), k->scene->spaceMode(), type,
+                                             TupProjectRequest::SetTween,
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, point, route));
+                 emit requested(&request);
+        }
+
+        if (newList.size() > 0)
+            k->objects = newList;
+    }
+
+    int framesNumber = framesTotal();
+    int total = k->initFrame + k->configurator->totalSteps() - 1;
+    TupProjectRequest request;
+
+    if (total > framesNumber) {
+        int layersTotal = k->scene->scene()->layersTotal();
+        for (int i = framesNumber; i <= total; i++) {
+             for (int j = 0; j < layersTotal; j++) {
+                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i, TupProjectRequest::Add,
+                                                                  tr("Frame %1").arg(i + 1));
+                  emit requested(&request);
+             }
+        }
+    }
+
+    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
+                                                    TupProjectRequest::Select, "1");
+    emit requested(&request);
+
+    setCurrentTween(name);
+    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
+}
+
+/* This method updates the data of the path into the tool panel 
+ * and disables edition mode for nodes
+*/
+
+void Tweener::updatePath()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::updatePath()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    k->configurator->updateSteps(k->path);
+}
+
+/* This method saves the settings of this plugin */
+
+void Tweener::saveConfig()
+{
+}
+
+/* This method updates the workspace when the plugin changes the scene */
+
+void Tweener::updateScene(TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::updateScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    k->mode = k->configurator->mode();
+
+    if (k->mode == TupToolPlugin::Edit) {
+        int total = k->initFrame + k->configurator->totalSteps();
+
+        if (k->editMode == TupToolPlugin::Properties) {
+            if (scene->currentFrameIndex() >= k->initFrame && scene->currentFrameIndex() < total) {
+                if (k->path && k->nodesGroup) {
+                    k->scene->addItem(k->path);            
+                    k->nodesGroup->createNodes(k->path);
+                    k->nodesGroup->show();
+                    k->nodesGroup->expandAllNodes();
+                }
+            }
+        } 
+
+        int framesNumber = framesTotal();
+
+        if (k->configurator->startComboSize() < framesNumber)
+            k->configurator->initStartCombo(framesNumber, k->initFrame);
+
+    } else if (k->mode == TupToolPlugin::Add) {
+               int total = framesTotal();
+               if (k->configurator->startComboSize() < total) {
+                   k->configurator->initStartCombo(total, k->initFrame);
+               } else {
+                   if (scene->currentFrameIndex() != k->initFrame)
+                       k->configurator->setStartFrame(scene->currentFrameIndex());
+               }
+
+           if (k->editMode == TupToolPlugin::Properties) {
+               k->path = 0;
+               k->configurator->cleanData();
+               k->configurator->activateMode(TupToolPlugin::Selection);
+               clearSelection();
+               setSelection();
+           } else if (k->editMode == TupToolPlugin::Selection) {
+                      k->path = 0;
+                      if (scene->currentFrameIndex() != k->initFrame)
+                          clearSelection();
+                      k->initFrame = scene->currentFrameIndex();
+                      setSelection();
+           } 
+    } else {
+        if (scene->currentFrameIndex() != k->initFrame) 
+            k->configurator->setStartFrame(scene->currentFrameIndex());
+    }
+}
+
+void Tweener::updateMode(TupToolPlugin::Mode mode)
+{
+    k->mode = mode;
+
+    if (k->mode == TupToolPlugin::Edit)
+        setEditEnv();
+}
+
+void Tweener::removeTweenFromProject(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    scene->removeTween(name, TupItemTweener::Position);
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      QString tip = item->toolTip();
+                      if (tip.startsWith(tr("Position Tween") + ": " + name))
+                          item->setToolTip("");
+             }
+    }
+}
+
+void Tweener::removeTween(const QString &name)
+{
+    removeTweenFromProject(name);
+    applyReset();
+}
+
+void Tweener::setCurrentTween(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    k->currentTween = scene->tween(name, TupItemTweener::Position);
+    if (k->currentTween)
+        k->configurator->setCurrentTween(k->currentTween);
+}
+
+void Tweener::setEditEnv()
+{
+    k->initFrame = k->currentTween->initFrame();
+    k->initLayer = k->currentTween->initLayer();
+    k->initScene = k->currentTween->initScene();
+
+    if (k->initFrame != k->scene->currentFrameIndex() || k->initLayer != k->scene->currentLayerIndex() || k->initScene != k->scene->currentSceneIndex()) {
+        TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame, TupProjectRequest::Select, "1");
+        emit requested(&request);
+    }
+
+    k->mode = TupToolPlugin::Edit;
+
+    TupScene *scene = k->scene->scene();
+    k->objects = scene->getItemsFromTween(k->currentTween->name(), TupItemTweener::Position);
+    QGraphicsItem *item = k->objects.at(0);
+    QRectF rect = item->sceneBoundingRect();
+    k->itemObjectReference = rect.center();
+
+    k->path = k->currentTween->graphicsPath();
+    k->path->setZValue(k->baseZValue);
+
+    QPainterPath::Element e = k->path->path().elementAt(0);
+    k->firstNode = QPointF(e.x, e.y);
+
+    QPointF oldPos = QPointF(e.x, e.y);
+    QPointF newPos = rect.center();
+
+    int distanceX = newPos.x() - oldPos.x();
+    int distanceY = newPos.y() - oldPos.y();
+    k->path->moveBy(distanceX, distanceY);
+    k->pathOffset = QPointF(distanceX, distanceY);
+
+    QColor color(55, 155, 55, 200);
+    QPen pen(QBrush(color), 2, Qt::DashDotLine, Qt::RoundCap, Qt::RoundJoin);
+    k->path->setPen(pen);
+
+    setTweenPath();
+}
+
+int Tweener::framesTotal()
+{
+    int total = 1;
+    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
+    if (layer)
+        total = layer->framesTotal();
+
+    return total;
+}
+
+/* This method clear selection */
+
+void Tweener::clearSelection()
+{
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 if (item->isSelected())
+                     item->setSelected(false);
+        }
+        k->objects.clear();
+        k->configurator->notifySelection(false);
+    }
+}
+
+/* This method disables object selection */
+
+void Tweener::disableSelection()
+{
+    foreach (QGraphicsView *view, k->scene->views()) {
+             view->setDragMode (QGraphicsView::NoDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+void Tweener::sceneResponse(const TupSceneResponse *event)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::sceneResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
+        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
+        init(k->scene);
+    }
+
+    if (event->action() == TupProjectRequest::Select)
+        init(k->scene);
+}
+
+void Tweener::layerResponse(const TupLayerResponse *event)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::layerResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    if (event->action() == TupProjectRequest::Remove)
+        init(k->scene);        
+}
+
+void Tweener::frameResponse(const TupFrameResponse *event)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::frameResponse()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
+        init(k->scene);
+
+    if (event->action() == TupProjectRequest::Select) {
+        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex()) {
+            resetGUI();
+            init(k->scene);
+        }
+    }
+}
+
+TupToolPlugin::Mode Tweener::currentMode()
+{
+    return k->mode;
+}
+
+TupToolPlugin::EditMode Tweener::currentEditMode()
+{
+    return k->editMode;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/position/tweener.h tupi-0.2+git05/src/plugins/tools/position/tweener.h
--- tupi-0.2+git04/src/plugins/tools/position/tweener.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/position/tweener.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,117 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef POSITIONTWEENER_H
+#define POSITIONTWEENER_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "settings.h"
+#include "tupprojectresponse.h"
+
+#include <QPointF>
+#include <QKeySequence>
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QMatrix>
+#include <QGraphicsLineItem>
+#include <QGraphicsView>
+#include <QDomDocument>
+#include <QDir>
+
+/**
+ * @author Jorge Cuadrado
+ * 
+*/
+
+class TUPI_PLUGIN Tweener : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "positiontool.json")
+
+    public:
+        Tweener();
+        virtual ~Tweener();
+        virtual void init(TupGraphicsScene *scene);
+
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void updateScene(TupGraphicsScene *scene);
+        virtual QMap<QString, TAction *>actions() const;
+        virtual QWidget *configurator();
+        virtual void aboutToChangeTool();
+        virtual void saveConfig();
+
+        int toolType() const;
+        void aboutToChangeScene(TupGraphicsScene *scene);
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+        virtual void layerResponse(const TupLayerResponse *event);
+        virtual void frameResponse(const TupFrameResponse *event);
+
+        virtual TupToolPlugin::Mode currentMode();
+        virtual TupToolPlugin::EditMode currentEditMode();
+
+    private:
+        int framesTotal();
+        void setupActions();
+        QString pathToCoords();
+        void clearSelection();
+        void disableSelection();
+        void removeTweenFromProject(const QString &name);
+        void resetGUI();
+
+    private:
+        struct Private;
+        Private *const k;
+
+    private slots:
+        void applyReset();
+        void applyTween();
+        void removeTween(const QString &name);
+        void setTweenPath();
+        void setSelection();
+        void setEditEnv();
+        void updateMode(TupToolPlugin::Mode mode);
+        void updateStartFrame(int index);
+        void setCurrentTween(const QString &name);
+
+    public slots:
+        void updatePath();
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/positiontool/configurator.cpp tupi-0.2+git05/src/plugins/tools/positiontool/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/positiontool/configurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/positiontool/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,362 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "configurator.h"
-#include "tweenmanager.h"
-#include "buttonspanel.h"
-#include "tupitemtweener.h"
-#include "stepsviewer.h"
-#include "tuptweenerstep.h"
-#include "tosd.h"
-#include "tradiobuttongroup.h"
-#include "timagebutton.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QListWidget>
-#include <QComboBox>
-#include <QBoxLayout>
-#include <QHeaderView>
-#include <QGraphicsPathItem>
-#include <QMenu>
-#include <QAction>
-
-struct Configurator::Private
-{
-    QBoxLayout *layout; 
-    QBoxLayout *settingsLayout;
-    Settings *settingsPanel;
-    TweenManager *tweenManager;
-    ButtonsPanel *controlPanel;
-
-    bool selectionDone;
-
-    TImageButton *removeButton;
-    TImageButton *editButton;
-
-    TupToolPlugin::Mode mode; 
-    GuiState state;
-
-    int framesTotal;
-    int currentFrame;
-
-    TupItemTweener *currentTween;
-};
-
-Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
-{
-    k->framesTotal = 1;
-    k->currentFrame = 0;
-
-    k->mode = TupToolPlugin::View;
-    k->selectionDone = false;
-    k->state = Manager;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-
-    QLabel *title = new QLabel(tr("Position Tween"));
-    title->setAlignment(Qt::AlignHCenter);
-    title->setFont(QFont("Arial", 8, QFont::Bold));
-
-    k->layout->addWidget(title);
-
-    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    k->settingsLayout->setMargin(0);
-    k->settingsLayout->setSpacing(0);
-
-    setTweenManagerPanel();
-    setButtonsPanel();
-    setPropertiesPanel();
-
-    k->layout->addLayout(k->settingsLayout);
-    k->layout->addStretch(2);
-}
-
-Configurator::~Configurator()
-{
-    delete k;
-}
-
-void Configurator::loadTweenList(QList<QString> tweenList)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    k->tweenManager->loadTweenList(tweenList);
-    if (tweenList.count() > 0)
-        activeButtonsPanel(true); 
-}
-
-void Configurator::setPropertiesPanel()
-{
-    k->settingsPanel = new Settings(this);
-
-    connect(k->settingsPanel, SIGNAL(startingFrameChanged(int)), this, SIGNAL(startingFrameChanged(int)));
-
-    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
-    connect(k->settingsPanel, SIGNAL(clickedCreatePath()), this, SIGNAL(clickedCreatePath()));
-
-    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
-    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
-
-    k->settingsLayout->addWidget(k->settingsPanel);
-
-    activePropertiesPanel(false);
-}
-
-void Configurator::activePropertiesPanel(bool enable)
-{
-    if (enable)
-        k->settingsPanel->show();
-    else
-        k->settingsPanel->hide();
-}
-
-void Configurator::setTweenManagerPanel()
-{
-    k->tweenManager = new TweenManager(this);
-
-    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
-    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
-
-    k->settingsLayout->addWidget(k->tweenManager);
-
-    k->state = Manager;
-}
-
-void Configurator::activeTweenManagerPanel(bool enable)
-{
-    if (enable) 
-        k->tweenManager->show();
-    else 
-        k->tweenManager->hide();
-
-    if (k->tweenManager->listSize() > 0)
-        activeButtonsPanel(enable);
-}
-
-void Configurator::setButtonsPanel()
-{
-    k->controlPanel = new ButtonsPanel(this);
-    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
-    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
-
-    k->settingsLayout->addWidget(k->controlPanel);
-
-    activeButtonsPanel(false);
-}
-
-void Configurator::activeButtonsPanel(bool enable)
-{
-    if (enable)
-        k->controlPanel->show();
-    else
-        k->controlPanel->hide();
-}
-
-void Configurator::initStartCombo(int framesTotal, int currentFrame)
-{
-    k->framesTotal = framesTotal;
-    k->currentFrame = currentFrame;
-    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
-}
-
-void Configurator::setStartFrame(int currentIndex)
-{
-    k->currentFrame = currentIndex;
-    k->settingsPanel->setStartFrame(currentIndex);
-}
-
-int Configurator::startFrame()
-{
-    return k->settingsPanel->startFrame();
-}
-
-int Configurator::startComboSize()
-{
-    return k->settingsPanel->startComboSize();
-}
-
-void Configurator::updateSteps(const QGraphicsPathItem *path)
-{
-    k->settingsPanel->updateSteps(path);
-}
-
-QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point, QString &path)
-{
-    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame, point, path);
-}
-
-int Configurator::totalSteps()
-{
-    return k->settingsPanel->totalSteps();
-}
-
-void Configurator::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->settingsPanel->activateMode(mode);
-}
-
-void Configurator::cleanData()
-{
-    k->settingsPanel->cleanData();
-}
-
-void Configurator::addTween(const QString &name)
-{
-    k->mode = TupToolPlugin::Add;
-
-    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
-
-    activeTweenManagerPanel(false);
-    activePropertiesPanel(true);
-
-    k->state = Properties;
-
-    emit setMode(k->mode);
-}
-
-void Configurator::editTween()
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Edit;
-    k->state = Properties;
-
-    k->settingsPanel->notifySelection(true);
-    k->settingsPanel->setParameters(k->currentTween);
-    activePropertiesPanel(true);
-
-    emit setMode(k->mode);
-}
-
-void Configurator::closeTweenProperties()
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    if (k->mode == TupToolPlugin::Add)
-        k->tweenManager->removeItemFromList();
-
-    emit clickedResetInterface();
-
-    closeSettingsPanel();
-}
-
-void Configurator::removeTween()
-{
-    QString name = k->tweenManager->currentTweenName();
-    k->tweenManager->removeItemFromList();
-
-    removeTween(name);
-}
-
-void Configurator::removeTween(const QString &name)
-{
-    if (k->tweenManager->listSize() == 0)
-        activeButtonsPanel(false);
-
-    emit clickedRemoveTween(name);
-}
-
-QString Configurator::currentTweenName() const
-{
-    // SQA: if name has been changed... change the item at TweenManager!
-    QString oldName = k->tweenManager->currentTweenName();
-    QString newName = k->settingsPanel->currentTweenName();
-
-    if (oldName.compare(newName) != 0)
-        k->tweenManager->updateTweenName(newName);
-
-    return newName;
-}
-
-void Configurator::notifySelection(bool flag)
-{
-    k->settingsPanel->notifySelection(flag); 
-}
-
-void Configurator::closeSettingsPanel()
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    if (k->state == Properties) {
-        activeTweenManagerPanel(true);
-        activePropertiesPanel(false);
-        k->mode = TupToolPlugin::View;
-        k->state = Manager;
-    }
-}
-
-TupToolPlugin::Mode Configurator::mode()
-{
-    return k->mode;
-}
-
-void Configurator::applyItem()
-{
-     k->mode = TupToolPlugin::Edit;
-     emit clickedApplyTween();
-}
-
-void Configurator::resetUI()
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    k->tweenManager->resetUI();
-    closeSettingsPanel();
-    k->settingsPanel->notifySelection(false);
-}
-
-void Configurator::updateTweenData(const QString &name)
-{
-    emit getTweenData(name);
-}
-
-void Configurator::setCurrentTween(TupItemTweener *currentTween)
-{
-    k->currentTween = currentTween;
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/positiontool/configurator.h tupi-0.2+git05/src/plugins/tools/positiontool/configurator.h
--- tupi-0.2+git04/src/plugins/tools/positiontool/configurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/positiontool/configurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONFIGURATOR_H
-#define CONFIGURATOR_H
-
-#include "tuptoolplugin.h"
-#include "settings.h"
-
-#include <QFrame>
-
-class QGraphicsPathItem;
-class QListWidgetItem;
-class TupItemTweener;
-
-/**
- * @author Jorge Cuadrado
-*/
-
-class Configurator : public QFrame
-{
-    Q_OBJECT
-
-    public:
-        enum GuiState { Manager = 1, Properties };
-
-        Configurator(QWidget *parent = 0);
-        ~Configurator();
-
-        void loadTweenList(QList<QString> tweenList);
-
-        void setPropertiesPanel();
-        void activePropertiesPanel(bool enable);
-
-        void setTweenManagerPanel();
-        void activeTweenManagerPanel(bool enable);
-
-        void setButtonsPanel();
-        void activeButtonsPanel(bool enable);
-
-        void initStartCombo(int framesTotal, int currentFrame);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-
-        void updateSteps(const QGraphicsPathItem *path);
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point, QString &path);
-        int totalSteps();
-        // void activateSelectionMode();
-        void activateMode(TupToolPlugin::EditMode mode);
-        void cleanData();
-        QString currentTweenName() const;
-        void notifySelection(bool flag);
-        int startComboSize();
-        void closeSettingsPanel();
-        TupToolPlugin::Mode mode();
-        void resetUI();
-        void setCurrentTween(TupItemTweener *currentTween);
-
-    public slots:
-        void closeTweenProperties();
-        
-    private slots:
-        void applyItem();
-        void addTween(const QString &name);
-        void editTween();
-        void removeTween();
-        void removeTween(const QString &name);
-        void updateTweenData(const QString &name);
-        
-    signals:
-        void clickedCreatePath();
-        void clickedSelect();
-        void clickedRemoveTween(const QString &);
-        void setMode(TupToolPlugin::Mode mode);
-        void clickedResetInterface();
-        void clickedApplyTween();
-        void startingFrameChanged(int);
-        // void editModeOn();
-        void getTweenData(const QString &);
-        
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/positiontool/positiontool.json tupi-0.2+git05/src/plugins/tools/positiontool/positiontool.json
--- tupi-0.2+git04/src/plugins/tools/positiontool/positiontool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/positiontool/positiontool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "PositionTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/positiontool/positiontool.pro tupi-0.2+git05/src/plugins/tools/positiontool/positiontool.pro
--- tupi-0.2+git04/src/plugins/tools/positiontool/positiontool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/positiontool/positiontool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/positiontool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += tweener.h \
-           configurator.h \
-           settings.h
-SOURCES += tweener.cpp \
-           configurator.cpp \
-           settings.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupipositiontool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
-
-
diff -Nru tupi-0.2+git04/src/plugins/tools/positiontool/settings.cpp tupi-0.2+git05/src/plugins/tools/positiontool/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/positiontool/settings.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/positiontool/settings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,355 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "settings.h"
-#include "tradiobuttongroup.h"
-#include "timagebutton.h"
-#include "tdebug.h"
-#include "tupitemtweener.h"
-#include "stepsviewer.h"
-#include "tuptweenerstep.h"
-#include "tosd.h"
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QListWidget>
-#include <QSpinBox>
-#include <QBoxLayout>
-#include <QHeaderView>
-#include <QGraphicsPathItem>
-#include <QDir>
-
-struct Settings::Private
-{
-    QWidget *innerPanel;
-    QBoxLayout *layout; 
-
-    QLineEdit *input;
-    TRadioButtonGroup *options;
-    StepsViewer *stepViewer;
-    QSpinBox *comboInit;
-    QLabel *totalLabel;
-    bool selectionDone;
-    TupToolPlugin::Mode mode; 
-
-    TImageButton *apply;
-    TImageButton *remove;
-};
-
-Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    k->selectionDone = false;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QFont font = this->font();
-    font.setPointSize(8);
-    setFont(font);
-
-    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
-    k->input = new QLineEdit;
-
-    QHBoxLayout *nameLayout = new QHBoxLayout;
-    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    nameLayout->setMargin(0);
-    nameLayout->setSpacing(0);
-    nameLayout->addWidget(nameLabel);
-    nameLayout->addWidget(k->input);
-
-    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
-    k->options->addItem(tr("Select object"), 0);
-    k->options->addItem(tr("Set Properties"), 1);
-    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
-
-    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
-    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
-
-    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
-    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    buttonsLayout->setMargin(0);
-    buttonsLayout->setSpacing(10);
-    buttonsLayout->addWidget(k->apply);
-    buttonsLayout->addWidget(k->remove);
-
-    k->layout->addLayout(nameLayout);
-    k->layout->addWidget(k->options);
-
-    setInnerForm();
-
-    k->layout->addSpacing(10);
-    k->layout->addLayout(buttonsLayout);
-    k->layout->setSpacing(5);
-
-    activateMode(TupToolPlugin::Selection);
-}
-
-Settings::~Settings()
-{
-    delete k;
-}
-
-void Settings::setInnerForm()
-{
-    k->innerPanel = new QWidget; 
-
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
-    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
-    startingLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    k->comboInit = new QSpinBox();
-
-    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SIGNAL(startingFrameChanged(int)));
-
-    QHBoxLayout *startLayout = new QHBoxLayout;
-    startLayout->setAlignment(Qt::AlignHCenter);
-    startLayout->setMargin(0);
-    startLayout->setSpacing(0);
-    startLayout->addWidget(k->comboInit);
-
-    k->stepViewer = new StepsViewer;
-    k->stepViewer->verticalHeader()->hide();
-
-    k->totalLabel = new QLabel(tr("Frames Total") + ": 0");
-    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    QHBoxLayout *totalLayout = new QHBoxLayout;
-    totalLayout->setAlignment(Qt::AlignHCenter);
-    totalLayout->setMargin(0);
-    totalLayout->setSpacing(0);
-    totalLayout->addWidget(k->totalLabel);
-
-    innerLayout->addWidget(startingLabel);
-    innerLayout->addLayout(startLayout);
-    innerLayout->addWidget(k->stepViewer);
-
-    innerLayout->addLayout(totalLayout);
-
-    k->layout->addWidget(k->innerPanel);
-
-    activeInnerForm(false);
-}
-
-void Settings::activeInnerForm(bool enable)
-{
-    if (enable && !k->innerPanel->isVisible())
-        k->innerPanel->show();
-    else
-        k->innerPanel->hide();
-}
-
-// Adding new Tween
-
-void Settings::setParameters(const QString &name, int framesTotal, int startFrame)
-{
-    k->mode = TupToolPlugin::Add;
-    k->input->setText(name);
-
-    activateMode(TupToolPlugin::Selection);
-    k->stepViewer->cleanRows();
-    k->totalLabel->setText(tr("Frames Total") + ": 0");
-
-    k->comboInit->setEnabled(false);
-    k->apply->setToolTip(tr("Save Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
-    k->remove->setToolTip(tr("Cancel Tween"));
-
-    initStartCombo(framesTotal, startFrame);
-}
-
-// Editing new Tween
-
-void Settings::setParameters(TupItemTweener *currentTween)
-{
-    setEditMode();
-
-    notifySelection(true);
-    activateMode(TupToolPlugin::Properties);
-
-    k->input->setText(currentTween->name());
-    k->comboInit->setEnabled(true);
-
-    initStartCombo(currentTween->frames(), currentTween->initFrame());
-
-    k->stepViewer->setPath(currentTween->graphicsPath());
-    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->stepViewer->totalSteps()));
-}
-
-void Settings::initStartCombo(int framesTotal, int currentIndex)
-{
-    k->comboInit->clear();
-    k->comboInit->setMinimum(1);
-    k->comboInit->setMaximum(framesTotal);
-    k->comboInit->setValue(currentIndex);
-}
-
-void Settings::setStartFrame(int currentIndex)
-{
-    k->comboInit->setValue(currentIndex);
-}
-
-int Settings::startFrame()
-{
-    return k->comboInit->value() - 1;
-}
-
-int Settings::startComboSize()
-{
-    return k->comboInit->maximum();
-}
-
-void Settings::updateSteps(const QGraphicsPathItem *path)
-{
-    k->stepViewer->setPath(path);
-    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->stepViewer->totalSteps()));
-}
-
-void Settings::emitOptionChanged(int option)
-{
-    switch (option) {
-            case 0:
-             {
-                 activeInnerForm(false);
-                 emit clickedSelect();
-             }
-            break;
-            case 1:
-             {
-                 if (k->selectionDone) {
-                     activeInnerForm(true);
-                     emit clickedCreatePath();
-                 } else {
-                     k->options->setCurrentIndex(0);
-                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);   
-                 }
-             }
-    }
-}
-
-QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point, QString &path)
-{
-    QDomDocument doc;
-
-    QDomElement root = doc.createElement("tweening");
-    root.setAttribute("name", currentTweenName());
-    root.setAttribute("type", TupItemTweener::Position);
-    root.setAttribute("initFrame", currentFrame);
-    root.setAttribute("initLayer", currentLayer);
-    root.setAttribute("initScene", currentScene);
-    root.setAttribute("frames", k->stepViewer->totalSteps());
-    root.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
-    root.setAttribute("coords", path);
-
-    foreach (TupTweenerStep *step, k->stepViewer->steps())
-             root.appendChild(step->toXml(doc));
-
-    doc.appendChild(root);
-
-    return doc.toString();
-}
-
-int Settings::totalSteps()
-{
-    return k->stepViewer->totalSteps();
-}
-
-/*
-void Settings::activatePathMode()
-{
-    k->options->setCurrentIndex(1);
-}
-
-void Settings::activateSelectionMode()
-{
-    k->options->setCurrentIndex(0);
-}
-*/
-
-void Settings::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->options->setCurrentIndex(mode);
-}
-
-void Settings::cleanData()
-{
-    k->stepViewer->cleanRows();
-}
-
-void Settings::notifySelection(bool flag)
-{
-    k->selectionDone = flag;
-}
-
-void Settings::applyTween()
-{
-    if (!k->selectionDone) {
-        k->options->setCurrentIndex(0);
-        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
-        return;
-    }
-
-    if (totalSteps() <= 2) {
-        TOsd::self()->display(tr("Info"), tr("You must define a path for this Tween!"), TOsd::Info);
-        return;
-    }
-
-    // SQA: Verify Tween is really well applied before call setEditMode!
-    setEditMode();
-
-    if (!k->comboInit->isEnabled())
-        k->comboInit->setEnabled(true);
-
-    emit clickedApplyTween();
-}
-
-void Settings::setEditMode()
-{
-    k->mode = TupToolPlugin::Edit;
-    k->apply->setToolTip(tr("Update Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
-    k->remove->setToolTip(tr("Close Tween properties"));
-}
-
-QString Settings::currentTweenName() const
-{
-    QString tweenName = k->input->text();
-    if (tweenName.length() > 0)
-        k->input->setFocus();
-
-    return tweenName;
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/positiontool/settings.h tupi-0.2+git05/src/plugins/tools/positiontool/settings.h
--- tupi-0.2+git04/src/plugins/tools/positiontool/settings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/positiontool/settings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
-#include "tuptoolplugin.h"
-#include <QWidget>
-
-class QGraphicsPathItem;
-class TupItemTweener;
-
-/**
- * @author Jorge Cuadrado
-*/
-
-class Settings : public QWidget 
-{
-    Q_OBJECT
-
-    public:
-        Settings(QWidget *parent = 0);
-        ~Settings();
-
-        void setParameters(const QString &name, int framesTotal, int startFrame);
-        void setParameters(TupItemTweener *currentTween);
-        void initStartCombo(int totalFrames, int currentIndex);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-
-        void updateSteps(const QGraphicsPathItem *path);
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point, QString &path);
-        int totalSteps();
-        // void activatePathMode();
-        // void activateSelectionMode();
-        void activateMode(TupToolPlugin::EditMode mode);
-        void cleanData();
-        void notifySelection(bool flag);
-        int startComboSize();
-        QString currentTweenName() const;
-        
-    private slots:
-        void emitOptionChanged(int option);
-        // void addTween();
-        void applyTween();
-        
-    signals:
-        void clickedCreatePath();
-        void clickedSelect();
-        void clickedResetTween();
-        void clickedApplyTween();
-        void startingFrameChanged(int);
-        
-    private:
-        void setInnerForm();
-        void activeInnerForm(bool enable);
-        void setEditMode();
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/positiontool/tweener.cpp tupi-0.2+git05/src/plugins/tools/positiontool/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/positiontool/tweener.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/positiontool/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,901 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tweener.h"
-#include "configurator.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "taction.h"
-#include "tnodegroup.h"
-#include "tosd.h"
-#include "tupsvg2qt.h"
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicsscene.h"
-#include "tupgraphicobject.h"
-#include "tuppathitem.h"
-#include "tupellipseitem.h"
-#include "tuprectitem.h"
-#include "tuplineitem.h"
-#include "tupsvgitem.h"
-#include "tupitemtweener.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QGraphicsPathItem>
-#include <QPainterPath>
-#include <QMatrix>
-#include <QGraphicsLineItem>
-#include <QGraphicsView>
-#include <QDomDocument>
-#include <QDir>
-
-struct Tweener::Private
-{
-    QMap<QString, TAction *> actions;
-    Configurator *configurator;
-
-    TupGraphicsScene *scene;
-    QGraphicsPathItem *path;
-    QList<QGraphicsItem *> objects;
-
-    TupItemTweener *currentTween;
-    TNodeGroup *nodesGroup;
-
-    bool isPathInScene;
-    int initFrame;
-    int initLayer;
-    int initScene;
-
-    TupToolPlugin::Mode mode;
-    TupToolPlugin::EditMode editMode;
-
-    QPointF itemObjectReference;
-    QPointF pathOffset;
-    QPointF firstNode;
-
-    int baseZValue;
-};
-
-Tweener::Tweener() : TupToolPlugin(), k(new Private)
-{
-    setupActions();
-
-    k->configurator = 0;
-    k->path = 0;
-    k->nodesGroup = 0;
-    k->currentTween = 0;
-
-    k->initFrame = 0;
-    k->initLayer = 0;
-    k->initScene = 0;
-}
-
-Tweener::~Tweener()
-{
-    delete k;
-}
-
-/* This method initialize the context of the plugin */
-
-void Tweener::init(TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-       T_FUNCINFO;
-    #endif
-
-    if (k->nodesGroup) {
-        k->nodesGroup->clear();
-        delete k->nodesGroup;
-        k->nodesGroup = 0;
-    }
-
-    if (k->path) {
-        delete k->path;
-        k->path = 0;
-    }
-
-    k->scene = scene;
-    k->objects.clear();
-    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
-
-    k->isPathInScene = false;
-    k->pathOffset = QPointF(0, 0); 
-    k->firstNode = QPointF(0, 0);
-    k->itemObjectReference = QPointF(0, 0);
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-
-    k->configurator->resetUI();
-
-    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Position);
-    if (tweenList.size() > 0) {
-        k->configurator->loadTweenList(tweenList);
-        setCurrentTween(tweenList.at(0));
-    }
-
-    int total = framesTotal();
-    k->configurator->initStartCombo(total, k->scene->currentFrameIndex());
-}
-
-void Tweener::updateStartFrame(int index)
-{
-    if (k->initFrame != index && index >= 0)
-        k->initFrame = index - 1;
-}
-
-/* This method returns the plugin name */
-
-QStringList Tweener::keys() const
-{
-    return QStringList() << tr("Position Tween");
-}
-
-/* This method makes an action when the mouse is pressed on the workspace 
- * depending on the active mode: Selecting an object or Creating a path  
-*/
-
-void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-       T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-
-    if (k->editMode == TupToolPlugin::Properties && k->scene->currentFrameIndex() == k->initFrame) {
-        if (k->path) {
-            QPointF point = k->path->mapFromParent(input->pos());
-            QPainterPath path = k->path->path();
-            path.cubicTo(point, point, point);
-            k->path->setPath(path);
-        }
-    } 
-}
-
-/* This method is executed while the mouse is pressed and on movement */
-
-void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method finishes the action started on the press method depending
- * on the active mode: Selecting an object or Creating a path
-*/
-
-void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-       T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (scene->currentFrameIndex() == k->initFrame) {
-        if (k->editMode == TupToolPlugin::Properties) {
-            if (k->nodesGroup) {
-                k->nodesGroup->createNodes(k->path);
-                k->nodesGroup->expandAllNodes();
-                k->configurator->updateSteps(k->path);
-                QPainterPath::Element e = k->path->path().elementAt(0);
-                QPointF begin = QPointF(e.x, e.y);
-
-                if (begin != k->firstNode) {
-                    QPointF oldPos = k->firstNode;
-                    QPointF newPos = begin;
-
-                    int distanceX = newPos.x() - oldPos.x();
-                    int distanceY = newPos.y() - oldPos.y();
-
-                    if (k->objects.size() > 0) {
-                        foreach (QGraphicsItem *item, k->objects)
-                                 item->moveBy(distanceX, distanceY);
-                        QGraphicsItem *item = k->objects.at(0);
-                        QRectF rect = item->sceneBoundingRect();
-                        k->itemObjectReference = rect.center();
-                    }
-
-                    k->firstNode = newPos;
-                }
-            }
-        } else {
-            if (scene->selectedItems().size() > 0) {
-                k->objects = scene->selectedItems();
-                k->configurator->notifySelection(true);
-
-                QGraphicsItem *item = k->objects.at(0);
-                QRectF rect = item->sceneBoundingRect();
-                QPointF newPos = rect.center();
-                QPointF oldPos = k->itemObjectReference;
-                k->itemObjectReference = newPos;
-
-                if (!k->path) {
-                    k->path = new QGraphicsPathItem;
-                    k->path->setZValue(k->baseZValue);
-
-                    QColor color(55, 155, 55, 200);
-                    QPen pen(QBrush(color), 2, Qt::DashDotLine, Qt::RoundCap, Qt::RoundJoin);
-                    k->path->setPen(pen);
-
-                    QPainterPath path;
-                    path.moveTo(newPos);
-                    k->firstNode = newPos;
-                    k->path->setPath(path);
-                    scene->addItem(k->path);
-                    k->isPathInScene = true;
-
-                    k->pathOffset = QPointF(0, 0);
-                } else {
-                    int distanceX = newPos.x() - oldPos.x();
-                    int distanceY = newPos.y() - oldPos.y();
-                    k->path->moveBy(distanceX, distanceY);
-
-                    k->pathOffset = QPointF(distanceX, distanceY);
-                }
-            } 
-        }
-    } 
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-QMap<QString, TAction *> Tweener::actions() const
-{
-    return k->actions;
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-int Tweener::toolType() const
-{
-    return TupToolInterface::Tweener;
-}
-
-/* This method returns the tool panel associated to this plugin */
-
-QWidget *Tweener::configurator()
-{
-    if (!k->configurator) {
-        k->mode = TupToolPlugin::View;
-
-        k->configurator = new Configurator;
-        connect(k->configurator, SIGNAL(startingFrameChanged(int)), this, SLOT(updateStartFrame(int)));
-        connect(k->configurator, SIGNAL(clickedCreatePath()), this, SLOT(setTweenPath()));
-        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
-        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
-        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
-        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode)));
-        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
-        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
-    } else {
-        k->mode = k->configurator->mode();
-    }
-
-    return k->configurator;
-}
-
-/* This method is called when there's a change on/of scene */
-void Tweener::aboutToChangeScene(TupGraphicsScene *scene)
-{
-    Q_UNUSED(scene);
-}
-
-/* This method is called when this plugin is off */
-
-void Tweener::aboutToChangeTool()
-{
-    resetGUI();
-}
-
-void Tweener::resetGUI()
-{
-    if (k->editMode == TupToolPlugin::Selection) {
-        clearSelection();
-        disableSelection();
-        return;
-    }
-
-    if (k->editMode == TupToolPlugin::Properties) {
-        if (k->path) {
-            k->scene->removeItem(k->path);
-            k->isPathInScene = false;
-            if (k->nodesGroup) {
-                k->nodesGroup->clear();
-                k->nodesGroup = 0;
-            }
-        }
-        return;
-    }
-}
-
-/* This method defines the actions contained in this plugin */
-
-void Tweener::setupActions()
-{
-    TAction *action = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "position_tween.png"), tr("Position Tween"), this);
-    action->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
-    action->setShortcut(QKeySequence(tr("Shift+W")));
-
-    k->actions.insert(tr("Position Tween"), action);
-}
-
-/* This method initializes the "Create path" mode */
-
-void Tweener::setTweenPath()
-{
-    if (k->path) {
-        k->pathOffset = QPointF(0, 0);
-
-        if (!k->isPathInScene) {
-            k->scene->addItem(k->path);
-            k->isPathInScene = true;
-        } 
-
-        if (k->nodesGroup) {
-            k->nodesGroup->createNodes(k->path);
-        } else {
-            k->nodesGroup = new TNodeGroup(k->path, k->scene, TNodeGroup::PositionTween, k->baseZValue);
-            connect(k->nodesGroup, SIGNAL(nodeReleased()), SLOT(updatePath()));
-            k->nodesGroup->createNodes(k->path);
-        }
-        k->nodesGroup->expandAllNodes();
-    }
-
-    k->editMode = TupToolPlugin::Properties;
-    disableSelection();
-}
-
-/* This method initializes the "Select object" mode */
-
-void Tweener::setSelection()
-{
-    if (k->mode == TupToolPlugin::Edit) {
-        if (k->initFrame != k->scene->currentFrameIndex()) {
-            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->currentTween->initScene(),
-                                                                              k->currentTween->initLayer(),
-                                                                              k->currentTween->initFrame(), 
-                                                                              TupProjectRequest::Select, "1");
-            emit requested(&request);
-        }
-    }
-
-    if (k->path) {
-        k->scene->removeItem(k->path);
-        k->isPathInScene = false;
-        if (k->nodesGroup) {
-            k->nodesGroup->clear();
-            k->nodesGroup = 0;
-        }
-    }
-
-    k->editMode = TupToolPlugin::Selection;
-
-    int bottomBoundary = 20000 + (k->scene->currentLayerIndex()*10000);
-    int topBoundary = bottomBoundary + 10000; 
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             view->setDragMode(QGraphicsView::RubberBandDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0)) 
-                           item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-             }
-    }
-
-    // When Object selection is enabled, previous selection is set
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                 item->setSelected(true);
-        }
-    }
-}
-
-/* This method transforms the path created into a QString representation */
-
-QString Tweener::pathToCoords()
-{
-    QString strPath = "";
-    QChar t;
-    int offsetX = k->pathOffset.x();
-    int offsetY = k->pathOffset.y();
-
-    for (int i=0; i < k->path->path().elementCount(); i++) {
-         QPainterPath::Element e = k->path->path().elementAt(i);
-         switch (e.type) {
-             case QPainterPath::MoveToElement:
-             {
-                 if (t != 'M') {
-                     t = 'M';
-                     strPath += "M " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                 } else {
-                     strPath += QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                 }
-             }
-             break;
-             case QPainterPath::LineToElement:
-             {
-                  if (t != 'L') {
-                      t = 'L';
-                      strPath += " L " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                  } else {
-                      strPath += QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                  }
-             }
-             break;
-             case QPainterPath::CurveToElement:
-             {
-                  if (t != 'C') {
-                      t = 'C';
-                      strPath += " C " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                  } else {
-                      strPath += "  " + QString::number(e.x + offsetX) + " " + QString::number(e.y + offsetY) + " ";
-                  }
-             }
-             break;
-             case QPainterPath::CurveToDataElement:
-             {
-                  if (t == 'C')
-                      strPath +=  " " + QString::number(e.x + offsetX) + "  " + QString::number(e.y + offsetY) + " ";
-             }
-             break;
-         }
-    }
-
-    return strPath.trimmed();
-}
-
-/* This method resets this plugin */
-
-void Tweener::applyReset()
-{
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-
-    clearSelection();
-    disableSelection();
-
-    if (k->nodesGroup) {
-        k->nodesGroup->clear();
-        k->nodesGroup = 0;
-    }
-
-    if (k->path) {
-        if (k->initFrame == k->scene->currentFrameIndex())
-            k->scene->removeItem(k->path);
-        k->isPathInScene = false;
-        k->path = 0;
-    }
-
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-
-    k->configurator->cleanData();
-}
-
-/* This method applies to the project, the Tween created from this plugin */
-
-void Tweener::applyTween()
-{
-    #ifdef K_DEBUG
-       T_FUNCINFO;
-    #endif
-
-    QString name = k->configurator->currentTweenName();
-
-    if (name.length() == 0) {
-        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
-        return;
-    }
-
-    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Position)) {
-        k->initFrame = k->scene->currentFrameIndex();
-        k->initLayer = k->scene->currentLayerIndex();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {   
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 int objectIndex = k->scene->currentFrame()->indexOf(item); 
-                 QRectF rect = item->sceneBoundingRect();
-                 QPointF point = rect.topLeft();
-
-                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = k->scene->currentFrame()->indexOf(svg);
-                 } else {
-                     if (qgraphicsitem_cast<TupPathItem *>(item) || qgraphicsitem_cast<TupEllipseItem *>(item) 
-                         || qgraphicsitem_cast<TupLineItem *>(item) || qgraphicsitem_cast<TupRectItem *>(item))
-                         point = item->pos();
-                 }
-
-                 QString route = pathToCoords();
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex,
-                                             QPointF(), k->scene->spaceMode(), type,
-                                             TupProjectRequest::SetTween, 
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, point, route));
-                 emit requested(&request);
-        }
-    } else {
-        removeTweenFromProject(name);
-        QList<QGraphicsItem *> newList;
-
-        k->initFrame = k->configurator->startFrame();
-        k->initLayer = k->currentTween->initLayer();
-        k->initScene = k->currentTween->initScene();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 TupProject *project = k->scene->scene()->project();
-                 TupScene *scene = project->scene(k->initScene);
-                 TupLayer *layer = scene->layer(k->initLayer);
-                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
-                 int objectIndex = frame->indexOf(item);
-                 QRectF rect = item->sceneBoundingRect();
-                 QPointF point = rect.topLeft();
-                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item); 
-
-                 if (svg) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = frame->indexOf(svg);
-                 } else {
-                     if (qgraphicsitem_cast<TupPathItem *>(item) || qgraphicsitem_cast<TupEllipseItem *>(item) 
-                         || qgraphicsitem_cast<TupLineItem *>(item) || qgraphicsitem_cast<TupRectItem *>(item))
-                         point = item->pos();
-                 }
-
-                 if (k->initFrame != k->currentTween->initFrame()) {
-                     QDomDocument dom;
-                     if (type == TupLibraryObject::Svg)
-                         dom.appendChild(svg->toXml(dom));
-                     else
-                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
-
-                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, 
-                                                 k->initFrame, 0, QPointF(), 
-                                                 k->scene->spaceMode(), type, 
-                                                 TupProjectRequest::Add, dom.toString());
-                     emit requested(&request);
-
-                     request = TupRequestBuilder::createItemRequest(k->currentTween->initScene(), 
-                               k->currentTween->initLayer(),
-                               k->currentTween->initFrame(),
-                               objectIndex, QPointF(), 
-                               k->scene->spaceMode(), type,
-                               TupProjectRequest::Remove);
-                     emit requested(&request);
-
-                     frame = layer->frame(k->initFrame);
-                     if (type == TupLibraryObject::Item) {
-                         objectIndex = frame->graphicItemsCount() - 1;
-                         newList.append(frame->graphic(objectIndex)->item());
-                     } else {
-                         objectIndex = frame->svgItemsCount() - 1;
-                         newList.append(frame->svg(objectIndex));
-                     }
-                 }
-
-                 QString route = pathToCoords();
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex,
-                                             QPointF(), k->scene->spaceMode(), type,
-                                             TupProjectRequest::SetTween,
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, point, route));
-                 emit requested(&request);
-        }
-
-        if (newList.size() > 0)
-            k->objects = newList;
-    }
-
-    int framesNumber = framesTotal();
-    int total = k->initFrame + k->configurator->totalSteps() - 1;
-    int layersTotal = k->scene->scene()->layersTotal();
-    TupProjectRequest request;
-
-    if (total > framesNumber) {
-        for (int i = framesNumber; i <= total; i++) {
-             for (int j = 0; j < layersTotal; j++) {
-                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i, TupProjectRequest::Add,
-                                                                  tr("Frame %1").arg(i + 1));
-                  emit requested(&request);
-             }
-        }
-    }
-
-    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
-                                                    TupProjectRequest::Select, "1");
-    emit requested(&request);
-
-    setCurrentTween(name);
-    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
-}
-
-/* This method updates the data of the path into the tool panel 
- * and disables edition mode for nodes
-*/
-
-void Tweener::updatePath()
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    k->configurator->updateSteps(k->path);
-}
-
-/* This method saves the settings of this plugin */
-
-void Tweener::saveConfig()
-{
-}
-
-/* This method updates the workspace when the plugin changes the scene */
-
-void Tweener::updateScene(TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    k->mode = k->configurator->mode();
-
-    if (k->mode == TupToolPlugin::Edit) {
-        int total = k->initFrame + k->configurator->totalSteps();
-
-        if (k->editMode == TupToolPlugin::Properties) {
-            if (scene->currentFrameIndex() >= k->initFrame && scene->currentFrameIndex() < total) {
-                if (k->path && k->nodesGroup) {
-                    k->scene->addItem(k->path);            
-                    k->nodesGroup->createNodes(k->path);
-                    k->nodesGroup->expandAllNodes();
-                }
-            }
-        } 
-
-        int framesNumber = framesTotal();
-
-        if (k->configurator->startComboSize() < framesNumber)
-            k->configurator->initStartCombo(framesNumber, k->initFrame);
-
-    } else if (k->mode == TupToolPlugin::Add) {
-               int total = framesTotal();
-               if (k->configurator->startComboSize() < total) {
-                   k->configurator->initStartCombo(total, k->initFrame);
-               } else {
-                   if (scene->currentFrameIndex() != k->initFrame)
-                       k->configurator->setStartFrame(scene->currentFrameIndex());
-               }
-
-           if (k->editMode == TupToolPlugin::Properties) {
-               k->path = 0;
-               k->configurator->cleanData();
-               k->configurator->activateMode(TupToolPlugin::Selection);
-               clearSelection();
-               setSelection();
-           } else if (k->editMode == TupToolPlugin::Selection) {
-                      k->path = 0;
-                      if (scene->currentFrameIndex() != k->initFrame)
-                          clearSelection();
-                      k->initFrame = scene->currentFrameIndex();
-                      setSelection();
-           } 
-    } else {
-        if (scene->currentFrameIndex() != k->initFrame) 
-            k->configurator->setStartFrame(scene->currentFrameIndex());
-    }
-}
-
-void Tweener::updateMode(TupToolPlugin::Mode mode)
-{
-    k->mode = mode;
-
-    if (k->mode == TupToolPlugin::Edit)
-        setEditEnv();
-}
-
-void Tweener::removeTweenFromProject(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    scene->removeTween(name, TupItemTweener::Position);
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      QString tip = item->toolTip();
-                      if (tip.startsWith(tr("Position Tween") + ": " + name))
-                          item->setToolTip("");
-             }
-    }
-}
-
-void Tweener::removeTween(const QString &name)
-{
-    removeTweenFromProject(name);
-    applyReset();
-}
-
-void Tweener::setCurrentTween(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    k->currentTween = scene->tween(name, TupItemTweener::Position);
-    if (k->currentTween)
-        k->configurator->setCurrentTween(k->currentTween);
-}
-
-void Tweener::setEditEnv()
-{
-    k->initFrame = k->currentTween->initFrame();
-    k->initLayer = k->currentTween->initLayer();
-    k->initScene = k->currentTween->initScene();
-
-    if (k->initFrame != k->scene->currentFrameIndex() || k->initLayer != k->scene->currentLayerIndex() || k->initScene != k->scene->currentSceneIndex()) {
-        TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame, TupProjectRequest::Select, "1");
-        emit requested(&request);
-    }
-
-    k->mode = TupToolPlugin::Edit;
-
-    TupScene *scene = k->scene->scene();
-    k->objects = scene->getItemsFromTween(k->currentTween->name(), TupItemTweener::Position);
-    QGraphicsItem *item = k->objects.at(0);
-    QRectF rect = item->sceneBoundingRect();
-    k->itemObjectReference = rect.center();
-
-    k->path = k->currentTween->graphicsPath();
-    k->path->setZValue(k->baseZValue);
-
-    QPainterPath::Element e = k->path->path().elementAt(0);
-    k->firstNode = QPointF(e.x, e.y);
-
-    QPointF oldPos = QPointF(e.x, e.y);
-    QPointF newPos = rect.center();
-
-    int distanceX = newPos.x() - oldPos.x();
-    int distanceY = newPos.y() - oldPos.y();
-    k->path->moveBy(distanceX, distanceY);
-    k->pathOffset = QPointF(distanceX, distanceY);
-
-    QColor color(55, 155, 55, 200);
-    QPen pen(QBrush(color), 2, Qt::DashDotLine, Qt::RoundCap, Qt::RoundJoin);
-    k->path->setPen(pen);
-
-    setTweenPath();
-}
-
-int Tweener::framesTotal()
-{
-    int total = 1;
-    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
-    if (layer)
-        total = layer->framesTotal();
-
-    return total;
-}
-
-/* This method clear selection */
-
-void Tweener::clearSelection()
-{
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 if (item->isSelected())
-                     item->setSelected(false);
-        }
-        k->objects.clear();
-        k->configurator->notifySelection(false);
-    }
-}
-
-/* This method disables object selection */
-
-void Tweener::disableSelection()
-{
-    foreach (QGraphicsView *view, k->scene->views()) {
-             view->setDragMode (QGraphicsView::NoDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-void Tweener::sceneResponse(const TupSceneResponse *event)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
-        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
-        init(k->scene);
-    }
-
-    if (event->action() == TupProjectRequest::Select)
-        init(k->scene);
-}
-
-void Tweener::layerResponse(const TupLayerResponse *event)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    if (event->action() == TupProjectRequest::Remove)
-        init(k->scene);        
-}
-
-void Tweener::frameResponse(const TupFrameResponse *event)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
-        init(k->scene);
-
-    if (event->action() == TupProjectRequest::Select) {
-        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex()) {
-            resetGUI();
-            init(k->scene);
-        }
-    }
-}
-
-TupToolPlugin::Mode Tweener::currentMode()
-{
-    return k->mode;
-}
-
-TupToolPlugin::EditMode Tweener::currentEditMode()
-{
-    return k->editMode;
-}
-
-Q_EXPORT_PLUGIN2(tup_tweener, Tweener);
diff -Nru tupi-0.2+git04/src/plugins/tools/positiontool/tweener.h tupi-0.2+git05/src/plugins/tools/positiontool/tweener.h
--- tupi-0.2+git04/src/plugins/tools/positiontool/tweener.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/positiontool/tweener.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef POSITIONTWEENER_H
-#define POSITIONTWEENER_H
-
-#include "tuptoolplugin.h"
-#include "settings.h"
-#include "tupprojectresponse.h"
-
-/**
- * @author Jorge Cuadrado
- * 
-*/
-
-class Tweener : public TupToolPlugin
-{
-    Q_OBJECT
-
-    public:
-        Tweener();
-        virtual ~Tweener();
-        virtual void init(TupGraphicsScene *scene);
-
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void updateScene(TupGraphicsScene *scene);
-        virtual QMap<QString, TAction *>actions() const;
-        virtual QWidget *configurator();
-        virtual void aboutToChangeTool();
-        virtual void saveConfig();
-
-        int toolType() const;
-        void aboutToChangeScene(TupGraphicsScene *scene);
-
-        virtual void sceneResponse(const TupSceneResponse *event);
-        virtual void layerResponse(const TupLayerResponse *event);
-        virtual void frameResponse(const TupFrameResponse *event);
-
-        virtual TupToolPlugin::Mode currentMode();
-        virtual TupToolPlugin::EditMode currentEditMode();
-
-    private:
-        int framesTotal();
-        void setupActions();
-        QString pathToCoords();
-        void clearSelection();
-        void disableSelection();
-        void removeTweenFromProject(const QString &name);
-        void resetGUI();
-
-    private:
-        struct Private;
-        Private *const k;
-
-    private slots:
-        void applyReset();
-        void applyTween();
-        void removeTween(const QString &name);
-        void setTweenPath();
-        void setSelection();
-        void setEditEnv();
-        void updateMode(TupToolPlugin::Mode mode);
-        void updateStartFrame(int index);
-        void setCurrentTween(const QString &name);
-
-    public slots:
-        void updatePath();
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/rotation/configurator.cpp tupi-0.2+git05/src/plugins/tools/rotation/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/rotation/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotation/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,320 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+#include "tweenmanager.h"
+#include "buttonspanel.h"
+#include "tupitemtweener.h"
+#include "tosd.h"
+
+struct Configurator::Private
+{
+    QBoxLayout *layout;
+    QBoxLayout *settingsLayout;
+    Settings *settingsPanel;
+    TweenManager *tweenManager;
+    ButtonsPanel *controlPanel;
+
+    TupItemTweener *currentTween;
+
+    int framesTotal;
+    int currentFrame;
+
+    TupToolPlugin::Mode mode;
+    GuiState state;
+};
+
+Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
+{
+    k->framesTotal = 1;
+    k->currentFrame = 0;
+
+    k->mode = TupToolPlugin::View;
+    k->state = Manager;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    QLabel *title = new QLabel(tr("Rotation Tween"));
+    title->setAlignment(Qt::AlignHCenter);
+    title->setFont(QFont("Arial", 8, QFont::Bold));
+
+    k->layout->addWidget(title);
+
+    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    k->settingsLayout->setMargin(0);
+    k->settingsLayout->setSpacing(0);
+
+    setTweenManagerPanel();
+    setButtonsPanel();
+    setPropertiesPanel();
+
+    k->layout->addLayout(k->settingsLayout);
+    k->layout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    delete k;
+}
+
+void Configurator::loadTweenList(QList<QString> tweenList)
+{
+    k->tweenManager->loadTweenList(tweenList);
+    if (tweenList.count() > 0)
+        activeButtonsPanel(true);
+}
+
+void Configurator::setPropertiesPanel()
+{
+    k->settingsPanel = new Settings(this);
+
+    connect(k->settingsPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int)));
+    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
+    connect(k->settingsPanel, SIGNAL(clickedDefineAngle()), this, SIGNAL(clickedDefineAngle()));
+    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
+    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
+
+    k->settingsLayout->addWidget(k->settingsPanel);
+
+    activePropertiesPanel(false);
+}
+
+void Configurator::activePropertiesPanel(bool enable)
+{
+    if (enable)
+        k->settingsPanel->show();
+    else
+        k->settingsPanel->hide();
+}
+
+void Configurator::setCurrentTween(TupItemTweener *currentTween)
+{
+    k->currentTween = currentTween;
+}
+
+void Configurator::setTweenManagerPanel()
+{
+    k->tweenManager = new TweenManager(this);
+    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
+    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
+
+    k->settingsLayout->addWidget(k->tweenManager);
+    k->state = Manager;
+}
+
+void Configurator::activeTweenManagerPanel(bool enable)
+{
+    if (enable)
+        k->tweenManager->show();
+    else
+        k->tweenManager->hide();
+
+    if (k->tweenManager->listSize() > 0)
+        activeButtonsPanel(enable);
+}
+
+void Configurator::setButtonsPanel()
+{
+    k->controlPanel = new ButtonsPanel(this);
+    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
+    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
+
+    k->settingsLayout->addWidget(k->controlPanel);
+
+    activeButtonsPanel(false);
+}
+
+void Configurator::activeButtonsPanel(bool enable)
+{
+    if (enable)
+        k->controlPanel->show();
+    else
+        k->controlPanel->hide();
+}
+
+void Configurator::initStartCombo(int framesTotal, int currentFrame)
+{
+    k->framesTotal = framesTotal;
+    k->currentFrame = currentFrame;
+    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
+}
+
+void Configurator::setStartFrame(int currentIndex)
+{
+    k->currentFrame = currentIndex;
+    k->settingsPanel->setStartFrame(currentIndex);
+}
+
+int Configurator::startFrame()
+{
+    return k->settingsPanel->startFrame();
+}
+
+int Configurator::startComboSize()
+{
+    return k->settingsPanel->startComboSize();
+}
+
+QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
+{
+    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame, point);
+}
+
+int Configurator::totalSteps()
+{
+    return k->settingsPanel->totalSteps();
+}
+
+void Configurator::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->settingsPanel->activateMode(mode);
+}
+
+void Configurator::addTween(const QString &name)
+{
+    k->mode = TupToolPlugin::Add;
+    emit setMode(k->mode);
+
+    activeTweenManagerPanel(false);
+
+    // k->mode = TupToolPlugin::Add;
+    k->state = Properties;
+
+    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
+    activePropertiesPanel(true);
+
+    // emit setMode(k->mode);
+}
+
+void Configurator::editTween()
+{
+    k->mode = TupToolPlugin::Edit;
+    emit setMode(k->mode);
+
+    activeTweenManagerPanel(false);
+
+    // k->mode = TupToolPlugin::Edit;
+    k->state = Properties;
+
+    k->settingsPanel->notifySelection(true);
+    k->settingsPanel->setParameters(k->currentTween);
+    activePropertiesPanel(true);
+
+    // emit setMode(k->mode);
+}
+
+void Configurator::removeTween()
+{
+    QString name = k->tweenManager->currentTweenName();
+    k->tweenManager->removeItemFromList();
+
+    removeTween(name);
+}
+
+void Configurator::removeTween(const QString &name)
+{
+    if (k->tweenManager->listSize() == 0)
+        activeButtonsPanel(false);
+
+    emit clickedRemoveTween(name);
+}
+
+QString Configurator::currentTweenName() const
+{
+    QString oldName = k->tweenManager->currentTweenName();
+    QString newName = k->settingsPanel->currentTweenName();
+
+    if (oldName.compare(newName) != 0)
+        k->tweenManager->updateTweenName(newName);
+
+    return newName;
+}
+
+void Configurator::notifySelection(bool flag)
+{
+    k->settingsPanel->notifySelection(flag);
+}
+
+void Configurator::closeTweenProperties()
+{
+    if (k->mode == TupToolPlugin::Add)
+        k->tweenManager->removeItemFromList();
+
+    emit clickedResetInterface();
+
+    closeSettingsPanel();
+}
+
+void Configurator::closeSettingsPanel()
+{
+    if (k->state == Properties) {
+        activeTweenManagerPanel(true);
+        activePropertiesPanel(false);
+        k->mode = TupToolPlugin::View;
+        k->state = Manager;
+    } 
+    /*
+    else {
+        k->settingsPanel->activateMode(TupToolPlugin::Properties);
+    }
+    */
+}
+
+TupToolPlugin::Mode Configurator::mode()
+{
+    return k->mode;
+}
+
+void Configurator::applyItem()
+{
+     k->mode = TupToolPlugin::Edit;
+     emit clickedApplyTween();
+}
+
+void Configurator::resetUI()
+{
+    k->tweenManager->resetUI();
+    closeSettingsPanel();
+    k->settingsPanel->notifySelection(false);
+}
+
+void Configurator::updateTweenData(const QString &name)
+{
+    emit getTweenData(name);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/rotation/configurator.h tupi-0.2+git05/src/plugins/tools/rotation/configurator.h
--- tupi-0.2+git04/src/plugins/tools/rotation/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotation/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,112 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "tglobal.h"
+#include "settings.h"
+
+#include <QFrame>
+#include <QLabel>
+#include <QBoxLayout>
+#include <QGraphicsPathItem>
+#include <QListWidgetItem>
+
+class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Configurator : public QFrame
+{
+    Q_OBJECT
+
+    public:
+        enum GuiState { Manager = 1, Properties };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+
+        void loadTweenList(QList<QString> tweenList);
+
+        void initStartCombo(int framesTotal, int currentFrame);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+
+        int totalSteps();
+        void activateMode(TupToolPlugin::EditMode mode);
+        void setCurrentTween(TupItemTweener *currentTween);
+        QString currentTweenName() const;
+        void notifySelection(bool flag);
+        int startComboSize();
+        void closeSettingsPanel();
+        TupToolPlugin::Mode mode();
+        void resetUI();
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
+        
+    private slots:
+        void applyItem();
+        void addTween(const QString &name);
+        void editTween();
+        void removeTween();
+        void removeTween(const QString &name);
+        void closeTweenProperties();
+        void updateTweenData(const QString &name);
+        
+    signals:
+        void startingPointChanged(int index);
+        void clickedSelect();
+        void clickedDefineAngle();
+        void clickedRemoveTween(const QString &name);
+        void setMode(TupToolPlugin::Mode mode);
+        void clickedApplyTween();
+        void clickedResetInterface();
+        void getTweenData(const QString &name);
+        
+    private:
+        void setPropertiesPanel();
+        void activePropertiesPanel(bool enable);
+        void setTweenManagerPanel();
+        void activeTweenManagerPanel(bool enable);
+        void setButtonsPanel();
+        void activeButtonsPanel(bool enable);
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/rotation/rotation.pro tupi-0.2+git05/src/plugins/tools/rotation/rotation.pro
--- tupi-0.2+git04/src/plugins/tools/rotation/rotation.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotation/rotation.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,39 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += tweener.h \
+           configurator.h \
+           settings.h
+
+SOURCES += tweener.cpp \
+           configurator.cpp \
+           settings.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupirotationtool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/rotation/rotationtool.json tupi-0.2+git05/src/plugins/tools/rotation/rotationtool.json
--- tupi-0.2+git04/src/plugins/tools/rotation/rotationtool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotation/rotationtool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "RotationTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/rotation/settings.cpp tupi-0.2+git05/src/plugins/tools/rotation/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/rotation/settings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotation/settings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,725 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "settings.h"
+#include "tradiobuttongroup.h"
+#include "tupitemtweener.h"
+#include "tuptweenerstep.h"
+#include "timagebutton.h"
+#include "tseparator.h"
+#include "tosd.h"
+
+struct Settings::Private
+{
+    QWidget *innerPanel;
+    QWidget *rangePanel;
+    QWidget *clockPanel;
+
+    QBoxLayout *layout;
+    TupToolPlugin::Mode mode;
+
+    QLineEdit *input;
+    TRadioButtonGroup *options;
+    QSpinBox *comboInit;
+    QSpinBox *comboEnd;
+
+    QComboBox *comboType;
+    TupItemTweener::RotationType rotationType;
+
+    QSpinBox *comboStart;
+    QSpinBox *comboFinish;
+
+    QSpinBox *degreesSpinbox;
+    QCheckBox *rangeLoopBox;
+    QCheckBox *reverseLoopBox;
+    QLabel *totalLabel;
+    QComboBox *comboClock;
+    int totalSteps;
+
+    bool selectionDone;
+    bool propertiesDone;
+
+    TImageButton *apply;
+    TImageButton *remove;
+};
+
+Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    k->selectionDone = false;
+    k->propertiesDone = false;
+    k->rotationType = TupItemTweener::Continuos;
+    k->totalSteps = 0;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QFont font = this->font();
+    font.setPointSize(8);
+    setFont(font);
+
+    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
+    k->input = new QLineEdit;
+
+    QHBoxLayout *nameLayout = new QHBoxLayout;
+    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    nameLayout->setMargin(0);
+    nameLayout->setSpacing(0);
+    nameLayout->addWidget(nameLabel);
+    nameLayout->addWidget(k->input);
+
+    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
+    k->options->addItem(tr("Select object"), 0);
+    k->options->addItem(tr("Set Properties"), 1);
+    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
+
+    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
+    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
+
+    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
+    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(10);
+    buttonsLayout->addWidget(k->apply);
+    buttonsLayout->addWidget(k->remove);
+
+    k->layout->addLayout(nameLayout);
+    k->layout->addWidget(k->options);
+
+    setInnerForm();
+
+    k->layout->addSpacing(10);
+    k->layout->addLayout(buttonsLayout);
+    k->layout->setSpacing(5);
+
+    activateMode(TupToolPlugin::Selection);
+}
+
+Settings::~Settings()
+{
+    delete k;
+}
+
+void Settings::setInnerForm()
+{
+    k->innerPanel = new QWidget;
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
+    startingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboInit = new QSpinBox();
+    k->comboInit->setEnabled(false);
+    k->comboInit->setMaximum(999);
+    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(updateLastFrame()));
+ 
+    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
+    endingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboEnd = new QSpinBox();
+    k->comboEnd->setEnabled(true);
+    k->comboEnd->setMinimum(1);
+    k->comboEnd->setMaximum(999);
+    k->comboEnd->setValue(1);
+    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(startingLabel);
+    startLayout->addWidget(k->comboInit);
+
+    QHBoxLayout *endLayout = new QHBoxLayout;
+    endLayout->setAlignment(Qt::AlignHCenter);
+    endLayout->setMargin(0);
+    endLayout->setSpacing(0);
+    endLayout->addWidget(endingLabel);
+    endLayout->addWidget(k->comboEnd);
+
+    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
+    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    QHBoxLayout *totalLayout = new QHBoxLayout;
+    totalLayout->setAlignment(Qt::AlignHCenter);
+    totalLayout->setMargin(0);
+    totalLayout->setSpacing(0);
+    totalLayout->addWidget(k->totalLabel);
+
+    k->comboType = new QComboBox();
+    k->comboType->addItem(tr("Continuous"));
+    k->comboType->addItem(tr("Partial"));
+
+    connect(k->comboType, SIGNAL(currentIndexChanged(int)), this, SLOT(refreshForm(int)));
+
+    QLabel *typeLabel = new QLabel(tr("Type") + ": ");
+    typeLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *typeLayout = new QHBoxLayout;
+    typeLayout->setAlignment(Qt::AlignHCenter);
+    typeLayout->setMargin(0);
+    typeLayout->setSpacing(0);
+    typeLayout->addWidget(typeLabel);
+    typeLayout->addWidget(k->comboType);
+
+    QLabel *speedLabel = new QLabel(tr("Speed (Degrees/Frame)") + ": ");
+    speedLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+
+    k->degreesSpinbox = new QSpinBox;
+    k->degreesSpinbox->setEnabled(true);
+    k->degreesSpinbox->setMinimum(0);
+    k->degreesSpinbox->setMaximum(359);
+    k->degreesSpinbox->setValue(5);
+
+    QVBoxLayout *speedLayout = new QVBoxLayout;
+    speedLayout->setAlignment(Qt::AlignHCenter);
+    speedLayout->setMargin(0);
+    speedLayout->setSpacing(0);
+    speedLayout->addWidget(speedLabel);
+
+    QVBoxLayout *speedLayout2 = new QVBoxLayout;
+    speedLayout2->setAlignment(Qt::AlignHCenter);
+    speedLayout2->setMargin(0);
+    speedLayout2->setSpacing(0);
+    speedLayout2->addWidget(k->degreesSpinbox);
+
+    innerLayout->addLayout(startLayout);
+    innerLayout->addLayout(endLayout);
+    innerLayout->addLayout(totalLayout);
+
+    innerLayout->addSpacing(15);
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+    innerLayout->addLayout(typeLayout);
+
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    setClockForm();
+    innerLayout->addWidget(k->clockPanel);
+    setRangeForm();
+    innerLayout->addWidget(k->rangePanel);
+
+    innerLayout->addLayout(speedLayout);
+    innerLayout->addLayout(speedLayout2);
+
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    k->layout->addWidget(k->innerPanel);
+
+    activeInnerForm(false);
+}
+
+void Settings::activeInnerForm(bool enable)
+{
+    if (enable && !k->innerPanel->isVisible()) {
+        k->propertiesDone = true;
+        k->innerPanel->show();
+    } else {
+        k->propertiesDone = false;
+        k->innerPanel->hide();
+    }
+}
+
+void Settings::setClockForm()
+{
+    k->clockPanel = new QWidget;
+
+    QBoxLayout *clockLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->clockPanel);
+    clockLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    clockLayout->setMargin(0);
+    clockLayout->setSpacing(0);
+
+    QLabel *directionLabel = new QLabel(tr("Direction") + ": ");
+    directionLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+
+    k->comboClock = new QComboBox();
+    k->comboClock->addItem(tr("Clockwise"));
+    k->comboClock->addItem(tr("Counterclockwise"));
+
+    clockLayout->addWidget(directionLabel);    
+    clockLayout->addWidget(k->comboClock);
+    clockLayout->addSpacing(5);
+    activeClockForm(true);
+}
+
+void Settings::activeClockForm(bool enable)
+{
+    if (enable && !k->clockPanel->isVisible())
+        k->clockPanel->show();
+    else
+        k->clockPanel->hide();
+}
+
+void Settings::setRangeForm()
+{
+    k->rangePanel = new QWidget;
+    QBoxLayout *rangeLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->rangePanel);
+    rangeLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    rangeLayout->setMargin(0);
+    rangeLayout->setSpacing(0);
+ 
+    QLabel *rangeLabel = new QLabel(tr("Degrees Range") + ": ");
+    rangeLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+
+    QLabel *startLabel = new QLabel(tr("Start at") + ": ");
+    startLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+
+    k->comboStart = new QSpinBox;
+    k->comboStart->setEnabled(true);
+    k->comboStart->setMinimum(0);
+    k->comboStart->setMaximum(359);
+    connect(k->comboStart, SIGNAL(valueChanged(int)), this, SLOT(checkRange(int)));
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(startLabel);
+    startLayout->addWidget(k->comboStart);
+
+    QLabel *endLabel = new QLabel(tr("Finish at") + ": ");
+    endLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+
+    k->comboFinish = new QSpinBox;
+    k->comboFinish->setEnabled(true);
+    k->comboFinish->setMinimum(0);
+    k->comboFinish->setMaximum(359);
+    connect(k->comboFinish, SIGNAL(valueChanged(int)), this, SLOT(checkRange(int)));
+
+    QHBoxLayout *endLayout = new QHBoxLayout;
+    endLayout->setAlignment(Qt::AlignHCenter);
+    endLayout->setMargin(0);
+    endLayout->setSpacing(0);
+    endLayout->addWidget(endLabel);
+    endLayout->addWidget(k->comboFinish);
+
+    k->rangeLoopBox = new QCheckBox(tr("Loop"), k->rangePanel);
+
+    connect(k->rangeLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
+
+    QVBoxLayout *loopLayout = new QVBoxLayout;
+    loopLayout->setAlignment(Qt::AlignHCenter);
+    loopLayout->setMargin(0);
+    loopLayout->setSpacing(0);
+    loopLayout->addWidget(k->rangeLoopBox);
+    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->rangePanel);
+
+    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateRangeCheckbox(int)));
+
+    QVBoxLayout *reverseLayout = new QVBoxLayout;
+    reverseLayout->setAlignment(Qt::AlignHCenter);
+    reverseLayout->setMargin(0);
+    reverseLayout->setSpacing(0);
+    reverseLayout->addWidget(k->reverseLoopBox);
+
+    rangeLayout->addWidget(rangeLabel);
+    rangeLayout->addLayout(startLayout);
+    rangeLayout->addLayout(endLayout);
+    rangeLayout->addSpacing(5);
+    rangeLayout->addLayout(loopLayout);
+    rangeLayout->addLayout(reverseLayout);
+
+    activeRangeForm(false);
+}
+
+void Settings::activeRangeForm(bool enable)
+{
+    if (enable && !k->rangePanel->isVisible())
+        k->rangePanel->show();
+    else
+        k->rangePanel->hide();
+}
+
+// Adding new Tween
+
+void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
+{
+    k->mode = TupToolPlugin::Add;
+    k->input->setText(name);
+
+    activateMode(TupToolPlugin::Selection);
+
+    k->apply->setToolTip(tr("Save Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
+    k->remove->setToolTip(tr("Cancel Tween"));
+
+    initStartCombo(framesTotal, initFrame);
+}
+
+// Editing new Tween
+
+void Settings::setParameters(TupItemTweener *currentTween)
+{
+    setEditMode();
+    activateMode(TupToolPlugin::Properties);
+
+    k->input->setText(currentTween->name());
+
+    k->comboInit->setEnabled(true);
+    k->comboInit->setValue(currentTween->initFrame());
+
+    k->comboEnd->setValue(currentTween->initFrame() + currentTween->frames());
+
+    checkFramesRange();
+
+    k->comboType->setCurrentIndex(currentTween->tweenRotationType());
+    k->degreesSpinbox->setValue(currentTween->tweenRotateSpeed());
+
+    if (currentTween->tweenRotationType() == TupItemTweener::Continuos) {
+        k->comboClock->setCurrentIndex(currentTween->tweenRotateDirection());
+    } else {
+        k->comboStart->setValue(currentTween->tweenRotateStartDegree());
+        k->comboFinish->setValue(currentTween->tweenRotateEndDegree());
+
+        k->rangeLoopBox->setChecked(currentTween->tweenRotateLoop());
+        k->reverseLoopBox->setChecked(currentTween->tweenRotateReverseLoop());
+    }
+}
+
+void Settings::initStartCombo(int framesTotal, int currentIndex)
+{
+    k->comboInit->clear();
+    k->comboEnd->clear();
+
+    k->comboInit->setMinimum(1);
+    k->comboInit->setMaximum(framesTotal);
+    k->comboInit->setValue(currentIndex + 1);
+
+    k->comboEnd->setMinimum(1);
+    k->comboEnd->setValue(framesTotal);
+}
+
+void Settings::setStartFrame(int currentIndex)
+{
+    k->comboInit->setValue(currentIndex + 1);
+    int end = k->comboEnd->value();
+    if (end < currentIndex+1)
+        k->comboEnd->setValue(currentIndex + 1);
+}
+
+int Settings::startFrame()
+{
+    return k->comboInit->value() - 1;
+}
+
+int Settings::startComboSize()
+{
+    return k->comboInit->maximum();
+}
+
+int Settings::totalSteps()
+{
+    return k->comboEnd->value() - (k->comboInit->value() - 1);
+}
+
+void Settings::setEditMode()
+{
+    k->mode = TupToolPlugin::Edit;
+    k->apply->setToolTip(tr("Update Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
+    k->remove->setToolTip(tr("Close Tween properties"));
+}
+
+void Settings::applyTween()
+{
+    if (!k->selectionDone) {
+        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info); 
+        #ifdef K_DEBUG
+            QString msg = "Settings::applyTween() - You must select at least one object!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+
+        return;
+    }
+
+    if (!k->propertiesDone) {
+        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
+        #ifdef K_DEBUG
+            QString msg = "Settings::applyTween() - You must set Tween properties first!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return;
+    }
+
+    // SQA: Verify Tween is really well applied before call setEditMode!
+    setEditMode();
+
+    if (!k->comboInit->isEnabled())
+        k->comboInit->setEnabled(true);
+
+    emit clickedApplyTween();
+}
+
+void Settings::notifySelection(bool flag)
+{
+    k->selectionDone = flag;
+}
+
+QString Settings::currentTweenName() const
+{
+    QString tweenName = k->input->text();
+    if (tweenName.length() > 0)
+        k->input->setFocus();
+
+    return tweenName;
+}
+
+void Settings::emitOptionChanged(int option)
+{
+    switch (option) {
+            case 0:
+            {
+                activeInnerForm(false);
+                emit clickedSelect();
+            }
+            break;
+            case 1:
+            {
+                if (k->selectionDone) {
+                    activeInnerForm(true);
+                    emit clickedDefineAngle();
+                } else {
+                    k->options->setCurrentIndex(0);
+                    TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
+                    #ifdef K_DEBUG
+                        QString msg = "Settings::emitOptionChanged() - You must set Tween properties first!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif
+                }
+            }
+    }
+}
+
+QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
+{
+    QDomDocument doc;
+
+    QDomElement root = doc.createElement("tweening");
+    root.setAttribute("name", currentTweenName());
+    root.setAttribute("type", TupItemTweener::Rotation);
+    root.setAttribute("initFrame", currentFrame);
+    root.setAttribute("initLayer", currentLayer);
+    root.setAttribute("initScene", currentScene);
+    
+    checkFramesRange();
+    root.setAttribute("frames", k->totalSteps);
+
+    root.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
+    root.setAttribute("rotationType", k->rotationType);
+    int speed = k->degreesSpinbox->value();
+    root.setAttribute("rotateSpeed", speed);
+
+    if (k->rotationType == TupItemTweener::Continuos) {
+        int direction = k->comboClock->currentIndex();
+        root.setAttribute("rotateDirection", direction);
+
+        int angle = 0;
+        for (int i=0; i < k->totalSteps; i++) {
+             TupTweenerStep *step = new TupTweenerStep(i);
+             step->setRotation(angle);
+             root.appendChild(step->toXml(doc));
+             if (direction == TupItemTweener::Clockwise)
+                 angle += speed;
+             else
+                 angle -= speed;
+        }
+
+    } else if (k->rotationType == TupItemTweener::Partial) {
+               bool loop = k->rangeLoopBox->isChecked();
+               if (loop)
+                   root.setAttribute("rotateLoop", "1");
+               else
+                   root.setAttribute("rotateLoop", "0");
+
+               int start = k->comboStart->value();
+               root.setAttribute("rotateStartDegree", start);
+
+               int end = k->comboFinish->value();
+               root.setAttribute("rotateEndDegree", end);
+
+               bool reverse = k->reverseLoopBox->isChecked();
+               if (reverse)
+                   root.setAttribute("reverseLoop", "1");
+               else
+                   root.setAttribute("reverseLoop", "0");
+
+               double angle = start;
+               bool token = false;
+
+               if (start < end) {
+                   for (int i=0; i < k->totalSteps; i++) {
+                        TupTweenerStep *step = new TupTweenerStep(i);
+                        step->setRotation(angle);
+                        root.appendChild(step->toXml(doc));
+
+                        if (!token) {
+                            if (angle < end)
+                                angle += speed;
+                        } else {
+                            angle -= speed;
+                        }
+
+                        if (reverse) {
+                            if (angle >= end)
+                                token = true;
+                            else if (angle < start) 
+                                     token = false;
+                        } else if (loop && angle >= end) {
+                                   angle = start;
+                        } 
+                   }
+               } else {
+                   for (int i=0; i < k->totalSteps; i++) {
+                        TupTweenerStep *step = new TupTweenerStep(i);
+                        step->setRotation(angle);
+                        root.appendChild(step->toXml(doc));
+
+                        if (!token) {
+                            if (angle > end)
+                                angle -= speed;
+                        } else {
+                            angle += speed;
+                        }
+
+                        if (reverse) {
+                            if (angle <= end)
+                                token = true;
+                            else if (angle > start)
+                                     token = false;
+                        } else if (loop && angle <= end) {
+                                   angle = start;
+                        }
+                   }
+               }
+    }
+
+    doc.appendChild(root);
+
+    return doc.toString();
+}
+
+void Settings::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->options->setCurrentIndex(mode);
+}
+
+void Settings::refreshForm(int type)
+{
+    if (type == 0) {
+        k->rotationType = TupItemTweener::Continuos;
+        activeClockForm(true);
+        activeRangeForm(false);
+    } else {
+        k->rotationType = TupItemTweener::Partial;
+        activeClockForm(false);
+        activeRangeForm(true);
+    }
+}
+
+void Settings::checkTopLimit(int index)
+{
+    Q_UNUSED(index);
+    checkFramesRange();
+}
+
+void Settings::updateLastFrame()
+{
+    int end = k->comboInit->value() + k->totalSteps - 1;
+    k->comboEnd->setValue(end);
+}
+
+void Settings::checkFramesRange()
+{
+    int begin = k->comboInit->value();
+    int end = k->comboEnd->value();
+        
+    if (begin > end) {
+        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
+        end = k->comboEnd->value();
+    }
+
+    k->totalSteps = end - begin + 1;
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
+}
+
+void Settings::updateRangeCheckbox(int state)
+{
+    Q_UNUSED(state);
+
+    if (k->reverseLoopBox->isChecked() && k->rangeLoopBox->isChecked())
+        k->rangeLoopBox->setChecked(false);
+}
+
+void Settings::updateReverseCheckbox(int state)
+{
+    Q_UNUSED(state);
+
+    if (k->reverseLoopBox->isChecked() && k->rangeLoopBox->isChecked())
+        k->reverseLoopBox->setChecked(false);
+}
+
+void Settings::updateTotalSteps(const QString &text)
+{
+    Q_UNUSED(text);
+    checkFramesRange();
+}
+
+void Settings::checkRange(int index)
+{
+    Q_UNUSED(index);
+
+    int start = k->comboStart->value();
+    int end = k->comboFinish->value();
+
+    if (start == end) {
+        if (k->comboFinish->value() == 359)
+            k->comboStart->setValue(k->comboStart->value() - 1);
+        else
+            k->comboFinish->setValue(k->comboFinish->value() + 1);
+    }
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/rotation/settings.h tupi-0.2+git05/src/plugins/tools/rotation/settings.h
--- tupi-0.2+git04/src/plugins/tools/rotation/settings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotation/settings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,111 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+
+#include <QWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QBoxLayout>
+#include <QComboBox>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QDir>
+
+class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Settings : public QWidget 
+{
+    Q_OBJECT
+
+    public:
+        Settings(QWidget *parent = 0);
+        ~Settings();
+
+        void setParameters(const QString &name, int framesTotal, int startFrame);
+        void setParameters(TupItemTweener *currentTween);
+        void initStartCombo(int totalFrames, int currentIndex);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+
+        int totalSteps();
+
+        void notifySelection(bool flag);
+        int startComboSize();
+        QString currentTweenName() const;
+        void activateMode(TupToolPlugin::EditMode mode);
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
+
+    private slots:
+        void applyTween();
+        void emitOptionChanged(int option);
+        void refreshForm(int type);
+        void checkTopLimit(int index);
+        void updateRangeCheckbox(int state);
+        void updateReverseCheckbox(int state);
+        void updateTotalSteps(const QString &text);
+        void checkRange(int index);
+        void updateLastFrame();
+        
+    signals:
+        void clickedSelect();
+        void clickedDefineAngle();
+        void clickedApplyTween();
+        void clickedResetTween();
+        void startingPointChanged(int index);
+        
+    private:
+        void setInnerForm();
+        void activeInnerForm(bool enable);
+        void setClockForm();
+        void activeClockForm(bool enable); 
+        void setRangeForm();
+        void activeRangeForm(bool enable);
+        void setEditMode();
+        void checkFramesRange();
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/rotation/tweener.cpp tupi-0.2+git05/src/plugins/tools/rotation/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/rotation/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotation/tweener.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,648 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tweener.h"
+#include "configurator.h"
+#include "target.h"
+#include "taction.h"
+#include "tosd.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicsscene.h"
+#include "tupgraphicobject.h"
+#include "tupsvgitem.h"
+#include "tuppathitem.h"
+#include "tuprectitem.h"
+#include "tuppixmapitem.h"
+#include "tupitemtweener.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+
+struct Tweener::Private
+{
+    QMap<QString, TAction *> actions;
+    Configurator *configurator;
+
+    TupGraphicsScene *scene;
+    QList<QGraphicsItem *> objects;
+
+    TupItemTweener *currentTween;
+    int initFrame;
+    int initLayer;
+    int initScene;
+
+    QPointF origin;
+    Target *target;
+
+    TupToolPlugin::Mode mode;
+    TupToolPlugin::EditMode editMode;
+
+    int baseZValue;
+};
+
+Tweener::Tweener() : TupToolPlugin(), k(new Private)
+{
+    setupActions();
+
+    k->configurator = 0;
+    k->initFrame = 0;
+    k->target = 0;
+}
+
+Tweener::~Tweener()
+{
+    delete k;
+}
+
+/* This method initializes the plugin */
+
+void Tweener::init(TupGraphicsScene *scene)
+{
+    k->scene = scene;
+    k->objects.clear();
+
+    if (k->target) {
+        k->scene->removeItem(k->target);
+        k->target = 0;
+    }
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+
+    k->configurator->resetUI();
+
+    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Rotation);
+    if (tweenList.size() > 0) {
+        k->configurator->loadTweenList(tweenList);
+        QString tweenName = tweenList.at(0);
+        setCurrentTween(tweenName);
+    }
+
+    int total = framesTotal();
+    k->configurator->initStartCombo(total, k->initFrame);
+}
+
+void Tweener::updateStartPoint(int index)
+{
+     if (k->initFrame != index && index >= 0)
+         k->initFrame = index;
+}
+
+/* This method returns the plugin name */
+
+QStringList Tweener::keys() const
+{
+    return QStringList() << tr("Rotation Tween");
+}
+
+/* This method makes an action when the mouse is pressed on the workspace 
+ * depending on the active mode: Selecting an object or Creating a path  
+*/
+
+void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::press()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method is executed while the mouse is pressed and on movement */
+
+void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method finishes the action started on the press method depending
+ * on the active mode: Selecting an object or Creating a path
+*/
+
+void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::release()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (scene->currentFrameIndex() == k->initFrame) {
+        if (k->editMode == TupToolPlugin::Selection) {
+            if (scene->selectedItems().size() > 0) {
+                k->objects = scene->selectedItems();
+                k->configurator->notifySelection(true);
+                QGraphicsItem *item = k->objects.at(0);
+                QRectF rect = item->sceneBoundingRect();
+                k->origin = rect.center();
+            }
+        }
+    }
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+QMap<QString, TAction *> Tweener::actions() const
+{
+    return k->actions;
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+int Tweener::toolType() const
+{
+    return TupToolInterface::Tweener;
+}
+
+/* This method returns the tool panel associated to this plugin */
+
+QWidget *Tweener::configurator()
+{
+    if (!k->configurator) {
+        k->mode = TupToolPlugin::View;
+
+        k->configurator = new Configurator;
+        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
+        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
+        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
+        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
+        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode)));
+        connect(k->configurator, SIGNAL(clickedDefineAngle()), this, SLOT(setPropertiesMode()));
+        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
+        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    } 
+
+    return k->configurator;
+}
+
+/* This method is called when there's a change on/of scene */
+void Tweener::aboutToChangeScene(TupGraphicsScene *)
+{
+}
+
+/* This method is called when this plugin is off */
+
+void Tweener::aboutToChangeTool()
+{
+    if (k->editMode == TupToolPlugin::Selection) {
+        clearSelection();
+        disableSelection();
+
+        return;
+    }
+
+    if (k->editMode == TupToolPlugin::Properties) {
+        k->scene->removeItem(k->target);
+        k->target = 0;
+    }
+}
+
+/* This method defines the actions contained in this plugin */
+
+void Tweener::setupActions()
+{
+    TAction *translater = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "rotation_tween.png"), 
+                                      tr("Rotation Tween"), this);
+    translater->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
+    translater->setShortcut(QKeySequence(tr("Shift+R")));
+
+    k->actions.insert(tr("Rotation Tween"), translater);
+}
+
+/* This method saves the settings of this plugin */
+
+void Tweener::saveConfig()
+{
+}
+
+/* This method updates the workspace when the plugin changes the scene */
+
+void Tweener::updateScene(TupGraphicsScene *scene)
+{ 
+    k->mode = k->configurator->mode();
+
+    if (k->mode == TupToolPlugin::Edit) {
+        int framesNumber = framesTotal();
+
+        if (k->configurator->startComboSize() < framesNumber)
+            k->configurator->initStartCombo(framesNumber, k->initFrame);
+
+        int tweenLimit = k->initFrame + (k->configurator->totalSteps() - 1);
+        if (scene->currentFrameIndex() >= k->initFrame && scene->currentFrameIndex() <= tweenLimit)
+            k->scene->addItem(k->target);
+
+    } else if (k->mode == TupToolPlugin::Add) {
+               int total = framesTotal();
+
+               if (k->editMode == TupToolPlugin::Properties) {
+                   if (total > k->configurator->startComboSize()) {
+                       k->configurator->activateMode(TupToolPlugin::Selection);
+                       clearSelection();
+                       setSelection();
+                   } 
+               } else if (k->editMode == TupToolPlugin::Selection) {
+                          if (scene->currentFrameIndex() != k->initFrame)
+                              clearSelection();
+                          k->initFrame = scene->currentFrameIndex();
+                          setSelection();
+               }
+
+               if (k->configurator->startComboSize() < total) {
+                   k->configurator->initStartCombo(total, k->initFrame);
+               } else {
+                   if (scene->currentFrameIndex() != k->initFrame)
+                       k->configurator->setStartFrame(scene->currentFrameIndex());
+               }
+
+    } else {
+        if (scene->currentFrameIndex() != k->initFrame)
+            k->configurator->setStartFrame(scene->currentFrameIndex());
+    }
+}
+
+void Tweener::setCurrentTween(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    k->currentTween = scene->tween(name, TupItemTweener::Rotation);
+
+    if (k->currentTween)
+        k->configurator->setCurrentTween(k->currentTween);
+}
+
+int Tweener::framesTotal()
+{
+    int total = 1;
+    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
+    if (layer)
+        total = layer->framesTotal();
+
+    return total;
+}
+
+/* This method clears selection */
+
+void Tweener::clearSelection()
+{
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 if (item->isSelected())
+                     item->setSelected(false);
+        }
+
+        k->objects.clear();
+        k->configurator->notifySelection(false);
+    }
+}
+
+/* This method disables object selection */
+
+void Tweener::disableSelection()
+{
+    foreach (QGraphicsView *view, k->scene->views()) {
+             view->setDragMode (QGraphicsView::NoDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+/* This method initializes the "Select object" mode */
+
+void Tweener::setSelection()
+{
+    if (k->editMode == TupToolPlugin::Properties)
+        k->scene->removeItem(k->target);
+
+    k->editMode = TupToolPlugin::Selection;
+
+    int bottomBoundary = 20000 + (k->initLayer*10000);
+    int topBoundary = bottomBoundary + 10000;
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             view->setDragMode(QGraphicsView::RubberBandDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
+                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+             }
+    }
+
+    // When Object selection is enabled, previous selection is set
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                 item->setSelected(true);
+        }
+        k->configurator->notifySelection(true);
+    }
+}
+
+void Tweener::setPropertiesMode()
+{
+    k->editMode = TupToolPlugin::Properties;
+    disableSelection();
+
+    addTarget();
+}
+
+/* This method resets this plugin */
+
+void Tweener::applyReset()
+{
+    if ((k->mode == TupToolPlugin::Edit || k->mode == TupToolPlugin::Add) && k->editMode == TupToolPlugin::Properties) {
+        k->scene->removeItem(k->target);
+        k->target = 0;
+    }     
+
+    disableSelection();
+    clearSelection();
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+}
+
+/* This method applies to the project, the Tween created from this plugin */
+
+void Tweener::applyTween()
+{
+    QString name = k->configurator->currentTweenName();
+
+    if (name.length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
+        return;
+    }
+
+    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Rotation)) {
+        k->initFrame = k->scene->currentFrameIndex();
+        k->initLayer = k->scene->currentLayerIndex();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 int objectIndex = -1;
+                 QPointF origin = item->mapFromParent(k->origin);
+
+                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = k->scene->currentFrame()->indexOf(svg);
+                 } else {
+                     objectIndex = k->scene->currentFrame()->indexOf(item);
+                     if (qgraphicsitem_cast<TupPathItem *>(item))
+                         origin = k->origin;
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex, QPointF(), k->scene->spaceMode(), type,
+                                             TupProjectRequest::SetTween,
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
+                 emit requested(&request);
+        }
+    } else {
+        removeTweenFromProject(name);
+        QList<QGraphicsItem *> newList;
+
+        k->initFrame = k->configurator->startFrame();
+        k->initLayer = k->currentTween->initLayer();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 TupProject *project = k->scene->scene()->project();
+                 TupScene *scene = project->scene(k->initScene);
+                 TupLayer *layer = scene->layer(k->initLayer);
+                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
+                 int objectIndex = -1;
+                 QPointF origin = item->mapFromParent(k->origin);
+                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
+
+                 if (svg) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = frame->indexOf(svg);
+                 } else {
+                     objectIndex = frame->indexOf(item);
+                     if (qgraphicsitem_cast<TupPathItem *>(item))
+                         origin = k->origin;
+                 }
+
+                 if (k->initFrame != k->currentTween->initFrame()) {
+                     QDomDocument dom;
+                     if (type == TupLibraryObject::Svg)
+                         dom.appendChild(svg->toXml(dom));
+                     else
+                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
+
+                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame, 
+                                                                                      0, QPointF(), k->scene->spaceMode(), 
+                                                                                      type, TupProjectRequest::Add, dom.toString());
+                     emit requested(&request);
+
+                     request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer,
+                                                                    k->currentTween->initFrame(),
+                                                                    objectIndex, QPointF(), k->scene->spaceMode(),
+                                                                    type, TupProjectRequest::Remove);
+                     emit requested(&request);
+
+                     frame = layer->frame(k->initFrame);
+                     if (type == TupLibraryObject::Item) {
+                         objectIndex = frame->graphicItemsCount() - 1;
+                         newList.append(frame->graphic(objectIndex)->item());
+                     } else {
+                         objectIndex = frame->svgItemsCount() - 1;
+                         newList.append(frame->svg(objectIndex));
+                     }
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex, QPointF(), k->scene->spaceMode(), 
+                                             type, TupProjectRequest::SetTween,
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
+                 emit requested(&request);
+        }
+
+        if (newList.size() > 0)
+            k->objects = newList;
+    }
+
+    int total = k->initFrame + k->configurator->totalSteps();
+    int framesNumber = framesTotal();
+    int layersTotal = k->scene->scene()->layersTotal();
+    TupProjectRequest request;
+
+    if (total >= framesNumber) {
+        for (int i = framesNumber; i < total; i++) {
+             for (int j = 0; j < layersTotal; j++) {
+                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i,
+                                                                  TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
+                  emit requested(&request);
+             }
+        }
+    }
+
+    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
+                                                    TupProjectRequest::Select, "1");
+    emit requested(&request);
+
+    setCurrentTween(name);
+    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
+}
+
+void Tweener::removeTweenFromProject(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    scene->removeTween(name, TupItemTweener::Rotation);
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      QString tip = item->toolTip();
+                      if (tip.startsWith(tr("Rotation Tween") + ": " + name))
+                          item->setToolTip("");
+             }
+    }
+}
+
+void Tweener::removeTween(const QString &name)
+{
+    removeTweenFromProject(name);
+    applyReset();
+}
+
+void Tweener::updateOriginPoint(const QPointF &point)
+{
+    k->origin = point;
+}
+
+void Tweener::addTarget()
+{
+    if (k->mode == TupToolPlugin::Add) {
+        k->target = new Target(k->origin, k->baseZValue);
+        connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
+        k->scene->addItem(k->target);
+    } else {
+        if (k->mode == TupToolPlugin::Edit) {
+            QGraphicsItem *item = k->objects.at(0);
+            k->origin = item->mapToParent(k->currentTween->transformOriginPoint());
+            k->target = new Target(k->origin, k->baseZValue);
+            connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
+            k->scene->addItem(k->target);
+        }
+    }
+}
+
+void Tweener::updateMode(TupToolPlugin::Mode mode)
+{
+    k->mode = mode;
+
+    if (k->mode == TupToolPlugin::Edit) {
+        k->editMode = TupToolPlugin::Properties;
+
+        k->initScene = k->currentTween->initScene();
+        k->initLayer = k->currentTween->initLayer();
+        k->initFrame = k->currentTween->initFrame();
+
+        if (k->initFrame != k->scene->currentFrameIndex() || k->initLayer != k->scene->currentLayerIndex()) {
+            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene,
+                                                                              k->initLayer,
+                                                                              k->initFrame, TupProjectRequest::Select, "1");
+            emit requested(&request);
+        }
+
+        if (k->objects.isEmpty()) {
+            k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Rotation);
+            k->origin = k->currentTween->transformOriginPoint();
+        }
+    }
+}
+
+void Tweener::sceneResponse(const TupSceneResponse *event)
+{
+    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
+        && (k->scene->currentSceneIndex() == event->sceneIndex()))
+        init(k->scene);
+
+    if (event->action() == TupProjectRequest::Select)
+        init(k->scene);
+}
+
+void Tweener::layerResponse(const TupLayerResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove)
+        init(k->scene);
+}
+
+void Tweener::frameResponse(const TupFrameResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove && k->initLayer == event->layerIndex())
+        init(k->scene);
+
+    if (event->action() == TupProjectRequest::Select)
+        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
+            init(k->scene);
+}
+
+TupToolPlugin::Mode Tweener::currentMode()
+{
+    return k->mode;
+}
+
+TupToolPlugin::EditMode Tweener::currentEditMode()
+{
+    return k->editMode;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/rotation/tweener.h tupi-0.2+git05/src/plugins/tools/rotation/tweener.h
--- tupi-0.2+git04/src/plugins/tools/rotation/tweener.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotation/tweener.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,113 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef ROTATIONTWEENER_H
+#define ROTATIONTWEENER_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "settings.h"
+#include "tupprojectresponse.h"
+
+#include <QPointF>
+#include <QKeySequence>
+#include <QMatrix>
+#include <QGraphicsView>
+#include <QDomDocument>
+#include <QDir>
+#include <QPointF>
+
+/**
+ * @author Gustav Gonzalez 
+ * 
+*/
+
+class TUPI_PLUGIN Tweener : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "rotationtool.json")
+
+    public:
+        Tweener();
+        virtual ~Tweener();
+        virtual void init(TupGraphicsScene *scene);
+
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+
+        virtual void updateScene(TupGraphicsScene *scene);
+        virtual void saveConfig();
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+        virtual void layerResponse(const TupLayerResponse *event);
+        virtual void frameResponse(const TupFrameResponse *event);
+
+        virtual TupToolPlugin::Mode currentMode();
+        virtual TupToolPlugin::EditMode currentEditMode();
+
+    private:
+        void setupActions();
+        int framesTotal();
+        void clearSelection();
+        void disableSelection();
+        void addTarget();
+        void removeTweenFromProject(const QString &name);
+
+    private:
+        struct Private;
+        Private *const k;
+
+    private slots:
+        void setSelection();
+        void setPropertiesMode();
+        void updateMode(TupToolPlugin::Mode mode);
+        void applyReset();
+        void applyTween();
+        void removeTween(const QString &name);
+        void updateStartPoint(int index);
+        void setCurrentTween(const QString &name);
+        void updateOriginPoint(const QPointF &point);
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/rotationtool/configurator.cpp tupi-0.2+git05/src/plugins/tools/rotationtool/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/rotationtool/configurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotationtool/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,315 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "configurator.h"
-#include "tweenmanager.h"
-#include "buttonspanel.h"
-
-#include "tupitemtweener.h"
-#include "tosd.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QBoxLayout>
-
-struct Configurator::Private
-{
-    QBoxLayout *layout;
-    QBoxLayout *settingsLayout;
-    Settings *settingsPanel;
-    TweenManager *tweenManager;
-    ButtonsPanel *controlPanel;
-
-    TupItemTweener *currentTween;
-
-    int framesTotal;
-    int currentFrame;
-
-    TupToolPlugin::Mode mode;
-    GuiState state;
-};
-
-Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
-{
-    k->framesTotal = 1;
-    k->currentFrame = 0;
-
-    k->mode = TupToolPlugin::View;
-    k->state = Manager;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-
-    QLabel *title = new QLabel(tr("Rotation Tween"));
-    title->setAlignment(Qt::AlignHCenter);
-    title->setFont(QFont("Arial", 8, QFont::Bold));
-
-    k->layout->addWidget(title);
-
-    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    k->settingsLayout->setMargin(0);
-    k->settingsLayout->setSpacing(0);
-
-    setTweenManagerPanel();
-    setButtonsPanel();
-    setPropertiesPanel();
-
-    k->layout->addLayout(k->settingsLayout);
-    k->layout->addStretch(2);
-}
-
-Configurator::~Configurator()
-{
-    delete k;
-}
-
-void Configurator::loadTweenList(QList<QString> tweenList)
-{
-    k->tweenManager->loadTweenList(tweenList);
-    if (tweenList.count() > 0)
-        activeButtonsPanel(true);
-}
-
-void Configurator::setPropertiesPanel()
-{
-    k->settingsPanel = new Settings(this);
-
-    connect(k->settingsPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int)));
-    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
-    connect(k->settingsPanel, SIGNAL(clickedDefineAngle()), this, SIGNAL(clickedDefineAngle()));
-    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
-    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
-
-    k->settingsLayout->addWidget(k->settingsPanel);
-
-    activePropertiesPanel(false);
-}
-
-void Configurator::activePropertiesPanel(bool enable)
-{
-    if (enable)
-        k->settingsPanel->show();
-    else
-        k->settingsPanel->hide();
-}
-
-void Configurator::setCurrentTween(TupItemTweener *currentTween)
-{
-    k->currentTween = currentTween;
-}
-
-void Configurator::setTweenManagerPanel()
-{
-    k->tweenManager = new TweenManager(this);
-    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
-    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
-
-    k->settingsLayout->addWidget(k->tweenManager);
-    k->state = Manager;
-}
-
-void Configurator::activeTweenManagerPanel(bool enable)
-{
-    if (enable)
-        k->tweenManager->show();
-    else
-        k->tweenManager->hide();
-
-    if (k->tweenManager->listSize() > 0)
-        activeButtonsPanel(enable);
-}
-
-void Configurator::setButtonsPanel()
-{
-    k->controlPanel = new ButtonsPanel(this);
-    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
-    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
-
-    k->settingsLayout->addWidget(k->controlPanel);
-
-    activeButtonsPanel(false);
-}
-
-void Configurator::activeButtonsPanel(bool enable)
-{
-    if (enable)
-        k->controlPanel->show();
-    else
-        k->controlPanel->hide();
-}
-
-void Configurator::initStartCombo(int framesTotal, int currentFrame)
-{
-    k->framesTotal = framesTotal;
-    k->currentFrame = currentFrame;
-    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
-}
-
-void Configurator::setStartFrame(int currentIndex)
-{
-    k->currentFrame = currentIndex;
-    k->settingsPanel->setStartFrame(currentIndex);
-}
-
-int Configurator::startFrame()
-{
-    return k->settingsPanel->startFrame();
-}
-
-int Configurator::startComboSize()
-{
-    return k->settingsPanel->startComboSize();
-}
-
-QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
-{
-    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame, point);
-}
-
-int Configurator::totalSteps()
-{
-    return k->settingsPanel->totalSteps();
-}
-
-void Configurator::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->settingsPanel->activateMode(mode);
-}
-
-void Configurator::addTween(const QString &name)
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Add;
-    k->state = Properties;
-
-    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
-    activePropertiesPanel(true);
-
-    emit setMode(k->mode);
-}
-
-void Configurator::editTween()
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Edit;
-    k->state = Properties;
-
-    k->settingsPanel->notifySelection(true);
-    k->settingsPanel->setParameters(k->currentTween);
-    activePropertiesPanel(true);
-    emit setMode(k->mode);
-}
-
-void Configurator::removeTween()
-{
-    QString name = k->tweenManager->currentTweenName();
-    k->tweenManager->removeItemFromList();
-
-    removeTween(name);
-}
-
-void Configurator::removeTween(const QString &name)
-{
-    if (k->tweenManager->listSize() == 0)
-        activeButtonsPanel(false);
-
-    emit clickedRemoveTween(name);
-}
-
-QString Configurator::currentTweenName() const
-{
-    QString oldName = k->tweenManager->currentTweenName();
-    QString newName = k->settingsPanel->currentTweenName();
-
-    if (oldName.compare(newName) != 0)
-        k->tweenManager->updateTweenName(newName);
-
-    return newName;
-}
-
-void Configurator::notifySelection(bool flag)
-{
-    k->settingsPanel->notifySelection(flag);
-}
-
-void Configurator::closeTweenProperties()
-{
-    if (k->mode == TupToolPlugin::Add)
-        k->tweenManager->removeItemFromList();
-
-    emit clickedResetInterface();
-
-    closeSettingsPanel();
-}
-
-void Configurator::closeSettingsPanel()
-{
-    if (k->state == Properties) {
-        activeTweenManagerPanel(true);
-        activePropertiesPanel(false);
-        k->mode = TupToolPlugin::View;
-        k->state = Manager;
-    } else {
-        k->settingsPanel->activateMode(TupToolPlugin::Properties);
-    }
-}
-
-TupToolPlugin::Mode Configurator::mode()
-{
-    return k->mode;
-}
-
-void Configurator::applyItem()
-{
-     k->mode = TupToolPlugin::Edit;
-     emit clickedApplyTween();
-}
-
-void Configurator::resetUI()
-{
-    k->tweenManager->resetUI();
-    closeSettingsPanel();
-    k->settingsPanel->notifySelection(false);
-}
-
-void Configurator::updateTweenData(const QString &name)
-{
-    emit getTweenData(name);
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/rotationtool/configurator.h tupi-0.2+git05/src/plugins/tools/rotationtool/configurator.h
--- tupi-0.2+git04/src/plugins/tools/rotationtool/configurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotationtool/configurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONFIGURATOR_H
-#define CONFIGURATOR_H
-
-#include "settings.h"
-#include <QFrame>
-
-class QGraphicsPathItem;
-class QListWidgetItem;
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Configurator : public QFrame
-{
-    Q_OBJECT
-
-    public:
-        enum GuiState { Manager = 1, Properties };
-
-        Configurator(QWidget *parent = 0);
-        ~Configurator();
-
-        void loadTweenList(QList<QString> tweenList);
-
-        void initStartCombo(int framesTotal, int currentFrame);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-
-        int totalSteps();
-        void activateMode(TupToolPlugin::EditMode mode);
-        void setCurrentTween(TupItemTweener *currentTween);
-        QString currentTweenName() const;
-        void notifySelection(bool flag);
-        int startComboSize();
-        void closeSettingsPanel();
-        TupToolPlugin::Mode mode();
-        void resetUI();
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
-        
-    private slots:
-        void applyItem();
-        void addTween(const QString &name);
-        void editTween();
-        void removeTween();
-        void removeTween(const QString &name);
-        void closeTweenProperties();
-        void updateTweenData(const QString &name);
-        
-    signals:
-        void startingPointChanged(int index);
-        void clickedSelect();
-        void clickedDefineAngle();
-        void clickedRemoveTween(const QString &name);
-        void setMode(TupToolPlugin::Mode mode);
-        void clickedApplyTween();
-        void clickedResetInterface();
-        void getTweenData(const QString &name);
-        
-    private:
-        void setPropertiesPanel();
-        void activePropertiesPanel(bool enable);
-        void setTweenManagerPanel();
-        void activeTweenManagerPanel(bool enable);
-        void setButtonsPanel();
-        void activeButtonsPanel(bool enable);
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/rotationtool/rotationtool.json tupi-0.2+git05/src/plugins/tools/rotationtool/rotationtool.json
--- tupi-0.2+git04/src/plugins/tools/rotationtool/rotationtool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotationtool/rotationtool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "RotationTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/rotationtool/rotationtool.pro tupi-0.2+git05/src/plugins/tools/rotationtool/rotationtool.pro
--- tupi-0.2+git04/src/plugins/tools/rotationtool/rotationtool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotationtool/rotationtool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/rotationtool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += tweener.h \
-           configurator.h \
-           settings.h
-
-SOURCES += tweener.cpp \
-           configurator.cpp \
-           settings.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupirotationtool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/rotationtool/settings.cpp tupi-0.2+git05/src/plugins/tools/rotationtool/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/rotationtool/settings.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotationtool/settings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,708 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "settings.h"
-#include "tdebug.h"
-#include "tradiobuttongroup.h"
-#include "tupitemtweener.h"
-#include "tuptweenerstep.h"
-#include "timagebutton.h"
-#include "tseparator.h"
-#include "tosd.h"
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QBoxLayout>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QDir>
-
-struct Settings::Private
-{
-    QWidget *innerPanel;
-    QWidget *rangePanel;
-    QWidget *clockPanel;
-
-    QBoxLayout *layout;
-    TupToolPlugin::Mode mode;
-
-    QLineEdit *input;
-    TRadioButtonGroup *options;
-    QSpinBox *comboInit;
-    QSpinBox *comboEnd;
-
-    QComboBox *comboType;
-    TupItemTweener::RotationType rotationType;
-
-    QSpinBox *comboStart;
-    QSpinBox *comboFinish;
-
-    QSpinBox *degreesSpinbox;
-    QCheckBox *rangeLoopBox;
-    QCheckBox *reverseLoopBox;
-    QLabel *totalLabel;
-    QComboBox *comboClock;
-    int totalSteps;
-
-    bool selectionDone;
-    bool propertiesDone;
-
-    TImageButton *apply;
-    TImageButton *remove;
-};
-
-Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    k->selectionDone = false;
-    k->propertiesDone = false;
-    k->rotationType = TupItemTweener::Continuos;
-    k->totalSteps = 0;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QFont font = this->font();
-    font.setPointSize(8);
-    setFont(font);
-
-    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
-    k->input = new QLineEdit;
-
-    QHBoxLayout *nameLayout = new QHBoxLayout;
-    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    nameLayout->setMargin(0);
-    nameLayout->setSpacing(0);
-    nameLayout->addWidget(nameLabel);
-    nameLayout->addWidget(k->input);
-
-    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
-    k->options->addItem(tr("Select object"), 0);
-    k->options->addItem(tr("Set Properties"), 1);
-    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
-
-    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
-    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
-
-    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
-    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    buttonsLayout->setMargin(0);
-    buttonsLayout->setSpacing(10);
-    buttonsLayout->addWidget(k->apply);
-    buttonsLayout->addWidget(k->remove);
-
-    k->layout->addLayout(nameLayout);
-    k->layout->addWidget(k->options);
-
-    setInnerForm();
-
-    k->layout->addSpacing(10);
-    k->layout->addLayout(buttonsLayout);
-    k->layout->setSpacing(5);
-
-    activateMode(TupToolPlugin::Selection);
-}
-
-Settings::~Settings()
-{
-    delete k;
-}
-
-void Settings::setInnerForm()
-{
-    k->innerPanel = new QWidget;
-
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
-    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
-    startingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboInit = new QSpinBox();
-    k->comboInit->setEnabled(false);
-    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(updateLastFrame()));
- 
-    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
-    endingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboEnd = new QSpinBox();
-    k->comboEnd->setMinimum(1);
-    k->comboEnd->setMaximum(100);
-    k->comboEnd->setValue(1);
-    k->comboEnd->setEnabled(true);
-    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
-
-    QHBoxLayout *startLayout = new QHBoxLayout;
-    startLayout->setAlignment(Qt::AlignHCenter);
-    startLayout->setMargin(0);
-    startLayout->setSpacing(0);
-    startLayout->addWidget(startingLabel);
-    startLayout->addWidget(k->comboInit);
-
-    QHBoxLayout *endLayout = new QHBoxLayout;
-    endLayout->setAlignment(Qt::AlignHCenter);
-    endLayout->setMargin(0);
-    endLayout->setSpacing(0);
-    endLayout->addWidget(endingLabel);
-    endLayout->addWidget(k->comboEnd);
-
-    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
-    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    QHBoxLayout *totalLayout = new QHBoxLayout;
-    totalLayout->setAlignment(Qt::AlignHCenter);
-    totalLayout->setMargin(0);
-    totalLayout->setSpacing(0);
-    totalLayout->addWidget(k->totalLabel);
-
-    k->comboType = new QComboBox();
-    k->comboType->addItem(tr("Continuous"));
-    k->comboType->addItem(tr("Partial"));
-
-    connect(k->comboType, SIGNAL(currentIndexChanged(int)), this, SLOT(refreshForm(int)));
-
-    QLabel *typeLabel = new QLabel(tr("Type") + ": ");
-    typeLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *typeLayout = new QHBoxLayout;
-    typeLayout->setAlignment(Qt::AlignHCenter);
-    typeLayout->setMargin(0);
-    typeLayout->setSpacing(0);
-    typeLayout->addWidget(typeLabel);
-    typeLayout->addWidget(k->comboType);
-
-    QLabel *speedLabel = new QLabel(tr("Speed (Degrees/Frame)") + ": ");
-    speedLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-
-    k->degreesSpinbox = new QSpinBox;
-    k->degreesSpinbox->setEnabled(true);
-    k->degreesSpinbox->setMinimum(0);
-    k->degreesSpinbox->setMaximum(359);
-    k->degreesSpinbox->setValue(5);
-
-    QVBoxLayout *speedLayout = new QVBoxLayout;
-    speedLayout->setAlignment(Qt::AlignHCenter);
-    speedLayout->setMargin(0);
-    speedLayout->setSpacing(0);
-    speedLayout->addWidget(speedLabel);
-
-    QVBoxLayout *speedLayout2 = new QVBoxLayout;
-    speedLayout2->setAlignment(Qt::AlignHCenter);
-    speedLayout2->setMargin(0);
-    speedLayout2->setSpacing(0);
-    speedLayout2->addWidget(k->degreesSpinbox);
-
-    innerLayout->addLayout(startLayout);
-    innerLayout->addLayout(endLayout);
-    innerLayout->addLayout(totalLayout);
-
-    innerLayout->addSpacing(15);
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-    innerLayout->addLayout(typeLayout);
-
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    setClockForm();
-    innerLayout->addWidget(k->clockPanel);
-    setRangeForm();
-    innerLayout->addWidget(k->rangePanel);
-
-    innerLayout->addLayout(speedLayout);
-    innerLayout->addLayout(speedLayout2);
-
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    k->layout->addWidget(k->innerPanel);
-
-    activeInnerForm(false);
-}
-
-void Settings::activeInnerForm(bool enable)
-{
-    if (enable && !k->innerPanel->isVisible()) {
-        k->propertiesDone = true;
-        k->innerPanel->show();
-    } else {
-        k->propertiesDone = false;
-        k->innerPanel->hide();
-    }
-}
-
-void Settings::setClockForm()
-{
-    k->clockPanel = new QWidget;
-
-    QBoxLayout *clockLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->clockPanel);
-    clockLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    clockLayout->setMargin(0);
-    clockLayout->setSpacing(0);
-
-    QLabel *directionLabel = new QLabel(tr("Direction") + ": ");
-    directionLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-
-    k->comboClock = new QComboBox();
-    k->comboClock->addItem(tr("Clockwise"));
-    k->comboClock->addItem(tr("Counterclockwise"));
-
-    clockLayout->addWidget(directionLabel);    
-    clockLayout->addWidget(k->comboClock);
-    clockLayout->addSpacing(5);
-    activeClockForm(true);
-}
-
-void Settings::activeClockForm(bool enable)
-{
-    if (enable && !k->clockPanel->isVisible())
-        k->clockPanel->show();
-    else
-        k->clockPanel->hide();
-}
-
-void Settings::setRangeForm()
-{
-    k->rangePanel = new QWidget;
-    QBoxLayout *rangeLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->rangePanel);
-    rangeLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    rangeLayout->setMargin(0);
-    rangeLayout->setSpacing(0);
- 
-    QLabel *rangeLabel = new QLabel(tr("Degrees Range") + ": ");
-    rangeLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-
-    QLabel *startLabel = new QLabel(tr("Start at") + ": ");
-    startLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-
-    k->comboStart = new QSpinBox;
-    k->comboStart->setEnabled(true);
-    k->comboStart->setMinimum(0);
-    k->comboStart->setMaximum(359);
-    connect(k->comboStart, SIGNAL(valueChanged(int)), this, SLOT(checkRange(int)));
-
-    QHBoxLayout *startLayout = new QHBoxLayout;
-    startLayout->setAlignment(Qt::AlignHCenter);
-    startLayout->setMargin(0);
-    startLayout->setSpacing(0);
-    startLayout->addWidget(startLabel);
-    startLayout->addWidget(k->comboStart);
-
-    QLabel *endLabel = new QLabel(tr("Finish at") + ": ");
-    endLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-
-    k->comboFinish = new QSpinBox;
-    k->comboFinish->setEnabled(true);
-    k->comboFinish->setMinimum(0);
-    k->comboFinish->setMaximum(359);
-    connect(k->comboFinish, SIGNAL(valueChanged(int)), this, SLOT(checkRange(int)));
-
-    QHBoxLayout *endLayout = new QHBoxLayout;
-    endLayout->setAlignment(Qt::AlignHCenter);
-    endLayout->setMargin(0);
-    endLayout->setSpacing(0);
-    endLayout->addWidget(endLabel);
-    endLayout->addWidget(k->comboFinish);
-
-    k->rangeLoopBox = new QCheckBox(tr("Loop"), k->rangePanel);
-
-    connect(k->rangeLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
-
-    QVBoxLayout *loopLayout = new QVBoxLayout;
-    loopLayout->setAlignment(Qt::AlignHCenter);
-    loopLayout->setMargin(0);
-    loopLayout->setSpacing(0);
-    loopLayout->addWidget(k->rangeLoopBox);
-    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->rangePanel);
-
-    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateRangeCheckbox(int)));
-
-    QVBoxLayout *reverseLayout = new QVBoxLayout;
-    reverseLayout->setAlignment(Qt::AlignHCenter);
-    reverseLayout->setMargin(0);
-    reverseLayout->setSpacing(0);
-    reverseLayout->addWidget(k->reverseLoopBox);
-
-    rangeLayout->addWidget(rangeLabel);
-    rangeLayout->addLayout(startLayout);
-    rangeLayout->addLayout(endLayout);
-    rangeLayout->addSpacing(5);
-    rangeLayout->addLayout(loopLayout);
-    rangeLayout->addLayout(reverseLayout);
-
-    activeRangeForm(false);
-}
-
-void Settings::activeRangeForm(bool enable)
-{
-    if (enable && !k->rangePanel->isVisible())
-        k->rangePanel->show();
-    else
-        k->rangePanel->hide();
-}
-
-// Adding new Tween
-
-void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
-{
-    k->mode = TupToolPlugin::Add;
-    k->input->setText(name);
-
-    activateMode(TupToolPlugin::Selection);
-
-    k->apply->setToolTip(tr("Save Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
-    k->remove->setToolTip(tr("Cancel Tween"));
-
-    initStartCombo(framesTotal, initFrame);
-}
-
-// Editing new Tween
-
-void Settings::setParameters(TupItemTweener *currentTween)
-{
-    setEditMode();
-    activateMode(TupToolPlugin::Properties);
-
-    k->input->setText(currentTween->name());
-
-    k->comboInit->setEnabled(true);
-    k->comboInit->setValue(currentTween->initFrame());
-
-    k->comboEnd->setValue(currentTween->initFrame() + currentTween->frames());
-
-    checkFramesRange();
-
-    k->comboType->setCurrentIndex(currentTween->tweenRotationType());
-    k->degreesSpinbox->setValue(currentTween->tweenRotateSpeed());
-
-    if (currentTween->tweenRotationType() == TupItemTweener::Continuos) {
-        k->comboClock->setCurrentIndex(currentTween->tweenRotateDirection());
-    } else {
-        k->comboStart->setValue(currentTween->tweenRotateStartDegree());
-        k->comboFinish->setValue(currentTween->tweenRotateEndDegree());
-
-        k->rangeLoopBox->setChecked(currentTween->tweenRotateLoop());
-        k->reverseLoopBox->setChecked(currentTween->tweenRotateReverseLoop());
-    }
-}
-
-void Settings::initStartCombo(int framesTotal, int currentIndex)
-{
-    k->comboInit->clear();
-    k->comboEnd->clear();
-
-    k->comboInit->setMinimum(1);
-    k->comboInit->setMaximum(framesTotal);
-    k->comboInit->setValue(currentIndex + 1);
-
-    k->comboEnd->setMinimum(1);
-    k->comboEnd->setValue(framesTotal);
-}
-
-void Settings::setStartFrame(int currentIndex)
-{
-    k->comboInit->setValue(currentIndex + 1);
-    int end = k->comboEnd->value();
-    if (end < currentIndex+1)
-        k->comboEnd->setValue(currentIndex + 1);
-}
-
-int Settings::startFrame()
-{
-    return k->comboInit->value() - 1;
-}
-
-int Settings::startComboSize()
-{
-    return k->comboInit->maximum();
-}
-
-int Settings::totalSteps()
-{
-    return k->comboEnd->value() - (k->comboInit->value() - 1);
-}
-
-void Settings::setEditMode()
-{
-    k->mode = TupToolPlugin::Edit;
-    k->apply->setToolTip(tr("Update Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
-    k->remove->setToolTip(tr("Close Tween properties"));
-}
-
-void Settings::applyTween()
-{
-    if (!k->selectionDone) {
-        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info); 
-        return;
-    }
-
-    if (!k->propertiesDone) {
-        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
-        return;
-    }
-
-    // SQA: Verify Tween is really well applied before call setEditMode!
-    setEditMode();
-
-    if (!k->comboInit->isEnabled())
-        k->comboInit->setEnabled(true);
-
-    emit clickedApplyTween();
-}
-
-void Settings::notifySelection(bool flag)
-{
-    k->selectionDone = flag;
-}
-
-QString Settings::currentTweenName() const
-{
-    QString tweenName = k->input->text();
-    if (tweenName.length() > 0)
-        k->input->setFocus();
-
-    return tweenName;
-}
-
-void Settings::emitOptionChanged(int option)
-{
-    switch (option) {
-            case 0:
-            {
-                activeInnerForm(false);
-                emit clickedSelect();
-            }
-            break;
-            case 1:
-            {
-                if (k->selectionDone) {
-                    activeInnerForm(true);
-                    emit clickedDefineAngle();
-                } else {
-                    k->options->setCurrentIndex(0);
-                    TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
-                }
-            }
-    }
-}
-
-QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
-{
-    QDomDocument doc;
-
-    QDomElement root = doc.createElement("tweening");
-    root.setAttribute("name", currentTweenName());
-    root.setAttribute("type", TupItemTweener::Rotation);
-    root.setAttribute("initFrame", currentFrame);
-    root.setAttribute("initLayer", currentLayer);
-    root.setAttribute("initScene", currentScene);
-    
-    checkFramesRange();
-    root.setAttribute("frames", k->totalSteps);
-
-    root.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
-    root.setAttribute("rotationType", k->rotationType);
-    int speed = k->degreesSpinbox->value();
-    root.setAttribute("rotateSpeed", speed);
-
-    if (k->rotationType == TupItemTweener::Continuos) {
-        int direction = k->comboClock->currentIndex();
-        root.setAttribute("rotateDirection", direction);
-
-        int angle = 0;
-        for (int i=0; i < k->totalSteps; i++) {
-             TupTweenerStep *step = new TupTweenerStep(i);
-             step->setRotation(angle);
-             root.appendChild(step->toXml(doc));
-             if (direction == TupItemTweener::Clockwise)
-                 angle += speed;
-             else
-                 angle -= speed;
-        }
-
-    } else if (k->rotationType == TupItemTweener::Partial) {
-               bool loop = k->rangeLoopBox->isChecked();
-               if (loop)
-                   root.setAttribute("rotateLoop", "1");
-               else
-                   root.setAttribute("rotateLoop", "0");
-
-               int start = k->comboStart->value();
-               root.setAttribute("rotateStartDegree", start);
-
-               int end = k->comboFinish->value();
-               root.setAttribute("rotateEndDegree", end);
-
-               bool reverse = k->reverseLoopBox->isChecked();
-               if (reverse)
-                   root.setAttribute("reverseLoop", "1");
-               else
-                   root.setAttribute("reverseLoop", "0");
-
-               double angle = start;
-               bool token = false;
-
-               if (start < end) {
-                   for (int i=0; i < k->totalSteps; i++) {
-                        TupTweenerStep *step = new TupTweenerStep(i);
-                        step->setRotation(angle);
-                        root.appendChild(step->toXml(doc));
-
-                        if (!token) {
-                            if (angle < end)
-                                angle += speed;
-                        } else {
-                            angle -= speed;
-                        }
-
-                        if (reverse) {
-                            if (angle >= end)
-                                token = true;
-                            else if (angle < start) 
-                                     token = false;
-                        } else if (loop && angle >= end) {
-                                   angle = start;
-                        } 
-                   }
-               } else {
-                   for (int i=0; i < k->totalSteps; i++) {
-                        TupTweenerStep *step = new TupTweenerStep(i);
-                        step->setRotation(angle);
-                        root.appendChild(step->toXml(doc));
-
-                        if (!token) {
-                            if (angle > end)
-                                angle -= speed;
-                        } else {
-                            angle += speed;
-                        }
-
-                        if (reverse) {
-                            if (angle <= end)
-                                token = true;
-                            else if (angle > start)
-                                     token = false;
-                        } else if (loop && angle <= end) {
-                                   angle = start;
-                        }
-                   }
-               }
-    }
-
-    doc.appendChild(root);
-
-    return doc.toString();
-}
-
-void Settings::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->options->setCurrentIndex(mode);
-}
-
-void Settings::refreshForm(int type)
-{
-    if (type == 0) {
-        k->rotationType = TupItemTweener::Continuos;
-        activeClockForm(true);
-        activeRangeForm(false);
-    } else {
-        k->rotationType = TupItemTweener::Partial;
-        activeClockForm(false);
-        activeRangeForm(true);
-    }
-}
-
-void Settings::checkTopLimit(int index)
-{
-    Q_UNUSED(index);
-    checkFramesRange();
-}
-
-void Settings::updateLastFrame()
-{
-    int end = k->comboInit->value() + k->totalSteps - 1;
-    k->comboEnd->setValue(end);
-}
-
-void Settings::checkFramesRange()
-{
-    int begin = k->comboInit->value();
-    int end = k->comboEnd->value();
-        
-    if (begin > end) {
-        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
-        end = k->comboEnd->value();
-    }
-
-    k->totalSteps = end - begin + 1;
-    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
-}
-
-void Settings::updateRangeCheckbox(int state)
-{
-    Q_UNUSED(state);
-
-    if (k->reverseLoopBox->isChecked() && k->rangeLoopBox->isChecked())
-        k->rangeLoopBox->setChecked(false);
-}
-
-void Settings::updateReverseCheckbox(int state)
-{
-    Q_UNUSED(state);
-
-    if (k->reverseLoopBox->isChecked() && k->rangeLoopBox->isChecked())
-        k->reverseLoopBox->setChecked(false);
-}
-
-void Settings::updateTotalSteps(const QString &text)
-{
-    Q_UNUSED(text);
-    checkFramesRange();
-}
-
-void Settings::checkRange(int index)
-{
-    Q_UNUSED(index);
-
-    int start = k->comboStart->value();
-    int end = k->comboFinish->value();
-
-    if (start == end) {
-        if (k->comboFinish->value() == 359)
-            k->comboStart->setValue(k->comboStart->value() - 1);
-        else
-            k->comboFinish->setValue(k->comboFinish->value() + 1);
-    }
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/rotationtool/settings.h tupi-0.2+git05/src/plugins/tools/rotationtool/settings.h
--- tupi-0.2+git04/src/plugins/tools/rotationtool/settings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotationtool/settings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
-#include "tuptoolplugin.h"
-#include <QWidget>
-
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Settings : public QWidget 
-{
-    Q_OBJECT
-
-    public:
-        Settings(QWidget *parent = 0);
-        ~Settings();
-
-        void setParameters(const QString &name, int framesTotal, int startFrame);
-        void setParameters(TupItemTweener *currentTween);
-        void initStartCombo(int totalFrames, int currentIndex);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-
-        int totalSteps();
-
-        void notifySelection(bool flag);
-        int startComboSize();
-        QString currentTweenName() const;
-        void activateMode(TupToolPlugin::EditMode mode);
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
-
-    private slots:
-        void applyTween();
-        void emitOptionChanged(int option);
-        void refreshForm(int type);
-        void checkTopLimit(int index);
-        void updateRangeCheckbox(int state);
-        void updateReverseCheckbox(int state);
-        void updateTotalSteps(const QString &text);
-        void checkRange(int index);
-        void updateLastFrame();
-        
-    signals:
-        void clickedSelect();
-        void clickedDefineAngle();
-        void clickedApplyTween();
-        void clickedResetTween();
-        void startingPointChanged(int index);
-        
-    private:
-        void setInnerForm();
-        void activeInnerForm(bool enable);
-        void setClockForm();
-        void activeClockForm(bool enable); 
-        void setRangeForm();
-        void activeRangeForm(bool enable);
-        void setEditMode();
-        void checkFramesRange();
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/rotationtool/tweener.cpp tupi-0.2+git05/src/plugins/tools/rotationtool/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/rotationtool/tweener.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotationtool/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,645 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tweener.h"
-#include "configurator.h"
-#include "target.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "taction.h"
-#include "tosd.h"
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicsscene.h"
-#include "tupgraphicobject.h"
-#include "tupsvgitem.h"
-#include "tuppathitem.h"
-#include "tuprectitem.h"
-#include "tuppixmapitem.h"
-#include "tupitemtweener.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QMatrix>
-#include <QGraphicsView>
-#include <QDomDocument>
-#include <QDir>
-
-struct Tweener::Private
-{
-    QMap<QString, TAction *> actions;
-    Configurator *configurator;
-
-    TupGraphicsScene *scene;
-    QList<QGraphicsItem *> objects;
-
-    TupItemTweener *currentTween;
-    int initFrame;
-    int initLayer;
-    int initScene;
-
-    QPointF origin;
-    Target *target;
-
-    TupToolPlugin::Mode mode;
-    TupToolPlugin::EditMode editMode;
-
-    int baseZValue;
-};
-
-Tweener::Tweener() : TupToolPlugin(), k(new Private)
-{
-    setupActions();
-
-    k->configurator = 0;
-    k->initFrame = 0;
-    k->target = 0;
-}
-
-Tweener::~Tweener()
-{
-    delete k;
-}
-
-/* This method initializes the plugin */
-
-void Tweener::init(TupGraphicsScene *scene)
-{
-    k->scene = scene;
-    k->objects.clear();
-    if (k->target)
-        k->scene->removeItem(k->target);
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-
-    k->configurator->resetUI();
-
-    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Rotation);
-    if (tweenList.size() > 0) {
-        k->configurator->loadTweenList(tweenList);
-        QString tweenName = tweenList.at(0);
-        setCurrentTween(tweenName);
-    }
-
-    int total = framesTotal();
-    k->configurator->initStartCombo(total, k->initFrame);
-}
-
-void Tweener::updateStartPoint(int index)
-{
-     if (k->initFrame != index && index >= 0)
-         k->initFrame = index;
-}
-
-/* This method returns the plugin name */
-
-QStringList Tweener::keys() const
-{
-    return QStringList() << tr("Rotation Tween");
-}
-
-/* This method makes an action when the mouse is pressed on the workspace 
- * depending on the active mode: Selecting an object or Creating a path  
-*/
-
-void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method is executed while the mouse is pressed and on movement */
-
-void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method finishes the action started on the press method depending
- * on the active mode: Selecting an object or Creating a path
-*/
-
-void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (scene->currentFrameIndex() == k->initFrame) {
-        if (k->editMode == TupToolPlugin::Selection) {
-            if (scene->selectedItems().size() > 0) {
-                k->objects = scene->selectedItems();
-                k->configurator->notifySelection(true);
-                QGraphicsItem *item = k->objects.at(0);
-                QRectF rect = item->sceneBoundingRect();
-                k->origin = rect.center();
-            }
-        }
-    }
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-QMap<QString, TAction *> Tweener::actions() const
-{
-    return k->actions;
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-int Tweener::toolType() const
-{
-    return TupToolInterface::Tweener;
-}
-
-/* This method returns the tool panel associated to this plugin */
-
-QWidget *Tweener::configurator()
-{
-    if (!k->configurator) {
-        k->mode = TupToolPlugin::View;
-
-        k->configurator = new Configurator;
-        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
-        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
-        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
-        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
-        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode)));
-        connect(k->configurator, SIGNAL(clickedDefineAngle()), this, SLOT(setPropertiesMode()));
-        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
-        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    } 
-
-    return k->configurator;
-}
-
-/* This method is called when there's a change on/of scene */
-void Tweener::aboutToChangeScene(TupGraphicsScene *)
-{
-}
-
-/* This method is called when this plugin is off */
-
-void Tweener::aboutToChangeTool()
-{
-    if (k->editMode == TupToolPlugin::Selection) {
-        clearSelection();
-        disableSelection();
-
-        return;
-    }
-
-    if (k->editMode == TupToolPlugin::Properties)
-        k->scene->removeItem(k->target);
-}
-
-/* This method defines the actions contained in this plugin */
-
-void Tweener::setupActions()
-{
-    TAction *translater = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "rotation_tween.png"), 
-                                      tr("Rotation Tween"), this);
-    translater->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
-    translater->setShortcut(QKeySequence(tr("Shift+R")));
-
-    k->actions.insert(tr("Rotation Tween"), translater);
-}
-
-/* This method saves the settings of this plugin */
-
-void Tweener::saveConfig()
-{
-}
-
-/* This method updates the workspace when the plugin changes the scene */
-
-void Tweener::updateScene(TupGraphicsScene *scene)
-{ 
-    k->mode = k->configurator->mode();
-
-    if (k->mode == TupToolPlugin::Edit) {
-        int framesNumber = framesTotal();
-
-        if (k->configurator->startComboSize() < framesNumber)
-            k->configurator->initStartCombo(framesNumber, k->initFrame);
-
-        int tweenLimit = k->initFrame + (k->configurator->totalSteps() - 1);
-        if (scene->currentFrameIndex() >= k->initFrame && scene->currentFrameIndex() <= tweenLimit) {
-            k->scene->addItem(k->target);
-        }
-    } else if (k->mode == TupToolPlugin::Add) {
-               int total = framesTotal();
-
-               if (k->editMode == TupToolPlugin::Properties) {
-                   if (total > k->configurator->startComboSize()) {
-                       k->configurator->activateMode(TupToolPlugin::Selection);
-                       clearSelection();
-                       setSelection();
-                   } 
-               } else if (k->editMode == TupToolPlugin::Selection) {
-                          if (scene->currentFrameIndex() != k->initFrame)
-                              clearSelection();
-                          k->initFrame = scene->currentFrameIndex();
-                          setSelection();
-               }
-
-               if (k->configurator->startComboSize() < total) {
-                   k->configurator->initStartCombo(total, k->initFrame);
-               } else {
-                   if (scene->currentFrameIndex() != k->initFrame)
-                       k->configurator->setStartFrame(scene->currentFrameIndex());
-               }
-
-    } else {
-        if (scene->currentFrameIndex() != k->initFrame)
-            k->configurator->setStartFrame(scene->currentFrameIndex());
-    }
-}
-
-void Tweener::setCurrentTween(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    k->currentTween = scene->tween(name, TupItemTweener::Rotation);
-
-    if (k->currentTween)
-        k->configurator->setCurrentTween(k->currentTween);
-}
-
-int Tweener::framesTotal()
-{
-    int total = 1;
-    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
-    if (layer)
-        total = layer->framesTotal();
-
-    return total;
-}
-
-/* This method clears selection */
-
-void Tweener::clearSelection()
-{
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 if (item->isSelected())
-                     item->setSelected(false);
-        }
-        k->objects.clear();
-        k->configurator->notifySelection(false);
-    }
-}
-
-/* This method disables object selection */
-
-void Tweener::disableSelection()
-{
-    foreach (QGraphicsView *view, k->scene->views()) {
-             view->setDragMode (QGraphicsView::NoDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-/* This method initializes the "Select object" mode */
-
-void Tweener::setSelection()
-{
-    if (k->editMode == TupToolPlugin::Properties)
-        k->scene->removeItem(k->target);
-
-    k->editMode = TupToolPlugin::Selection;
-
-    int bottomBoundary = 20000 + (k->initLayer*10000);
-    int topBoundary = bottomBoundary + 10000;
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             view->setDragMode(QGraphicsView::RubberBandDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
-                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-             }
-    }
-
-    // When Object selection is enabled, previous selection is set
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                 item->setSelected(true);
-        }
-        k->configurator->notifySelection(true);
-    }
-}
-
-void Tweener::setPropertiesMode()
-{
-    k->editMode = TupToolPlugin::Properties;
-    disableSelection();
-
-    addTarget();
-}
-
-/* This method resets this plugin */
-
-void Tweener::applyReset()
-{
-    if ((k->mode == TupToolPlugin::Edit || k->mode == TupToolPlugin::Add) && k->editMode == TupToolPlugin::Properties)
-        k->scene->removeItem(k->target);
-
-    disableSelection();
-    clearSelection();
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-}
-
-/* This method applies to the project, the Tween created from this plugin */
-
-void Tweener::applyTween()
-{
-    QString name = k->configurator->currentTweenName();
-
-    if (name.length() == 0) {
-        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
-        return;
-    }
-
-    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Rotation)) {
-        k->initFrame = k->scene->currentFrameIndex();
-        k->initLayer = k->scene->currentLayerIndex();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 int objectIndex = -1;
-                 QPointF origin = item->mapFromParent(k->origin);
-
-                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = k->scene->currentFrame()->indexOf(svg);
-                 } else {
-                     objectIndex = k->scene->currentFrame()->indexOf(item);
-                     if (qgraphicsitem_cast<TupPathItem *>(item))
-                         origin = k->origin;
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex, QPointF(), k->scene->spaceMode(), type,
-                                             TupProjectRequest::SetTween,
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
-                 emit requested(&request);
-        }
-    } else {
-        removeTweenFromProject(name);
-        QList<QGraphicsItem *> newList;
-
-        k->initFrame = k->configurator->startFrame();
-        k->initLayer = k->currentTween->initLayer();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 TupProject *project = k->scene->scene()->project();
-                 TupScene *scene = project->scene(k->initScene);
-                 TupLayer *layer = scene->layer(k->initLayer);
-                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
-                 int objectIndex = -1;
-                 QPointF origin = item->mapFromParent(k->origin);
-                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
-
-                 if (svg) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = frame->indexOf(svg);
-                 } else {
-                     objectIndex = frame->indexOf(item);
-                     if (qgraphicsitem_cast<TupPathItem *>(item))
-                         origin = k->origin;
-                 }
-
-                 if (k->initFrame != k->currentTween->initFrame()) {
-                     QDomDocument dom;
-                     if (type == TupLibraryObject::Svg)
-                         dom.appendChild(svg->toXml(dom));
-                     else
-                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
-
-                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame, 
-                                                                                      0, QPointF(), k->scene->spaceMode(), 
-                                                                                      type, TupProjectRequest::Add, dom.toString());
-                     emit requested(&request);
-
-                     request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer,
-                                                                    k->currentTween->initFrame(),
-                                                                    objectIndex, QPointF(), k->scene->spaceMode(),
-                                                                    type, TupProjectRequest::Remove);
-                     emit requested(&request);
-
-                     frame = layer->frame(k->initFrame);
-                     if (type == TupLibraryObject::Item) {
-                         objectIndex = frame->graphicItemsCount() - 1;
-                         newList.append(frame->graphic(objectIndex)->item());
-                     } else {
-                         objectIndex = frame->svgItemsCount() - 1;
-                         newList.append(frame->svg(objectIndex));
-                     }
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex, QPointF(), k->scene->spaceMode(), 
-                                             type, TupProjectRequest::SetTween,
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
-                 emit requested(&request);
-        }
-
-        if (newList.size() > 0)
-            k->objects = newList;
-    }
-
-    int total = k->initFrame + k->configurator->totalSteps();
-    int framesNumber = framesTotal();
-    int layersTotal = k->scene->scene()->layersTotal();
-    TupProjectRequest request;
-
-    if (total >= framesNumber) {
-        for (int i = framesNumber; i < total; i++) {
-             for (int j = 0; j < layersTotal; j++) {
-                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i,
-                                                                  TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
-                  emit requested(&request);
-             }
-        }
-    }
-
-    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
-                                                    TupProjectRequest::Select, "1");
-    emit requested(&request);
-
-    setCurrentTween(name);
-    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
-}
-
-void Tweener::removeTweenFromProject(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    scene->removeTween(name, TupItemTweener::Rotation);
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      QString tip = item->toolTip();
-                      if (tip.startsWith(tr("Rotation Tween") + ": " + name))
-                          item->setToolTip("");
-             }
-    }
-}
-
-void Tweener::removeTween(const QString &name)
-{
-    removeTweenFromProject(name);
-    applyReset();
-}
-
-void Tweener::updateOriginPoint(const QPointF &point)
-{
-    k->origin = point;
-}
-
-void Tweener::addTarget()
-{
-    if (k->mode == TupToolPlugin::Add) {
-        k->target = new Target(k->origin, k->baseZValue, k->scene);
-        connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
-    } else {
-        if (k->objects.size() > 0) {
-            QGraphicsItem *item = k->objects.at(0);
-            k->origin = item->mapToParent(k->currentTween->transformOriginPoint());
-            k->target = new Target(k->origin, k->baseZValue, k->scene);
-            connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
-        }
-    }
-}
-
-void Tweener::updateMode(TupToolPlugin::Mode mode)
-{
-    k->mode = mode;
-
-    if (k->mode == TupToolPlugin::Edit) {
-        k->editMode = TupToolPlugin::Properties;
-
-        k->initScene = k->currentTween->initScene();
-        k->initLayer = k->currentTween->initLayer();
-        k->initFrame = k->currentTween->initFrame();
-
-        if (k->initFrame != k->scene->currentFrameIndex() || k->initLayer != k->scene->currentLayerIndex()) {
-            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene,
-                                                                              k->initLayer,
-                                                                              k->initFrame, TupProjectRequest::Select, "1");
-            emit requested(&request);
-        }
-
-        if (k->objects.isEmpty()) {
-            k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Rotation);
-            k->origin = k->currentTween->transformOriginPoint();
-        }
-
-        addTarget();
-    }
-}
-
-void Tweener::sceneResponse(const TupSceneResponse *event)
-{
-    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
-        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
-        init(k->scene);
-    }
-
-    if (event->action() == TupProjectRequest::Select)
-        init(k->scene);
-}
-
-void Tweener::layerResponse(const TupLayerResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove)
-        init(k->scene);
-}
-
-void Tweener::frameResponse(const TupFrameResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove && k->initLayer == event->layerIndex())
-        init(k->scene);
-
-    if (event->action() == TupProjectRequest::Select) {
-        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
-            init(k->scene);
-    }
-}
-
-TupToolPlugin::Mode Tweener::currentMode()
-{
-    return k->mode;
-}
-
-TupToolPlugin::EditMode Tweener::currentEditMode()
-{
-    return k->editMode;
-}
-
-Q_EXPORT_PLUGIN2(tup_tweener, Tweener);
diff -Nru tupi-0.2+git04/src/plugins/tools/rotationtool/tweener.h tupi-0.2+git05/src/plugins/tools/rotationtool/tweener.h
--- tupi-0.2+git04/src/plugins/tools/rotationtool/tweener.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/rotationtool/tweener.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef ROTATIONTWEENER_H
-#define ROTATIONTWEENER_H
-
-#include "tuptoolplugin.h"
-#include "settings.h"
-#include "tupprojectresponse.h"
-
-/**
- * @author Gustav Gonzalez 
- * 
-*/
-
-class Tweener : public TupToolPlugin
-{
-    Q_OBJECT
-
-    public:
-        Tweener();
-        virtual ~Tweener();
-        virtual void init(TupGraphicsScene *scene);
-
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-        virtual QWidget *configurator();
-
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-
-        virtual void updateScene(TupGraphicsScene *scene);
-        virtual void saveConfig();
-
-        virtual void sceneResponse(const TupSceneResponse *event);
-        virtual void layerResponse(const TupLayerResponse *event);
-        virtual void frameResponse(const TupFrameResponse *event);
-
-        virtual TupToolPlugin::Mode currentMode();
-        virtual TupToolPlugin::EditMode currentEditMode();
-
-    private:
-        void setupActions();
-        int framesTotal();
-        void clearSelection();
-        void disableSelection();
-        void addTarget();
-        void removeTweenFromProject(const QString &name);
-
-    private:
-        struct Private;
-        Private *const k;
-
-    private slots:
-        void setSelection();
-        void setPropertiesMode();
-        void updateMode(TupToolPlugin::Mode mode);
-        void applyReset();
-        void applyTween();
-        void removeTween(const QString &name);
-        void updateStartPoint(int index);
-        void setCurrentTween(const QString &name);
-        void updateOriginPoint(const QPointF &point);
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/scale/configurator.cpp tupi-0.2+git05/src/plugins/tools/scale/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/scale/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scale/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,309 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+#include "tweenmanager.h"
+#include "buttonspanel.h"
+#include "tupitemtweener.h"
+#include "tosd.h"
+
+struct Configurator::Private
+{
+    QBoxLayout *layout;
+    QBoxLayout *settingsLayout;
+    Settings *settingsPanel;
+    TweenManager *tweenManager;
+    ButtonsPanel *controlPanel;
+
+    TupItemTweener *currentTween;
+
+    int framesTotal;
+    int currentFrame;
+
+    TupToolPlugin::Mode mode;
+    Configurator::GuiState state;
+};
+
+Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
+{
+    k->framesTotal = 1;
+    k->currentFrame = 0;
+
+    k->mode = TupToolPlugin::View;
+    k->state = Configurator::Manager;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    QLabel *title = new QLabel(tr("Scale Tween"));
+    title->setAlignment(Qt::AlignHCenter);
+    title->setFont(QFont("Arial", 8, QFont::Bold));
+
+    k->layout->addWidget(title);
+
+    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    k->settingsLayout->setMargin(0);
+    k->settingsLayout->setSpacing(0);
+
+    setTweenManagerPanel();
+    setButtonsPanel();
+    setPropertiesPanel();
+
+    k->layout->addLayout(k->settingsLayout);
+    k->layout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    delete k;
+}
+
+void Configurator::loadTweenList(QList<QString> tweenList)
+{
+    k->tweenManager->loadTweenList(tweenList);
+    if (tweenList.count() > 0)
+        activeButtonsPanel(true);
+}
+
+void Configurator::setPropertiesPanel()
+{
+    k->settingsPanel = new Settings(this);
+
+    connect(k->settingsPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int)));
+    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
+    connect(k->settingsPanel, SIGNAL(clickedDefineProperties()), this, SIGNAL(clickedDefineProperties()));
+    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
+    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
+
+    k->settingsLayout->addWidget(k->settingsPanel);
+
+    activePropertiesPanel(false);
+}
+
+void Configurator::activePropertiesPanel(bool enable)
+{
+    if (enable)
+        k->settingsPanel->show();
+    else
+        k->settingsPanel->hide();
+}
+
+void Configurator::setCurrentTween(TupItemTweener *currentTween)
+{
+    k->currentTween = currentTween;
+}
+
+void Configurator::setTweenManagerPanel()
+{
+    k->tweenManager = new TweenManager(this);
+    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
+    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
+
+    k->settingsLayout->addWidget(k->tweenManager);
+    k->state = Configurator::Manager;
+}
+
+void Configurator::activeTweenManagerPanel(bool enable)
+{
+    if (enable)
+        k->tweenManager->show();
+    else
+        k->tweenManager->hide();
+
+    if (k->tweenManager->listSize() > 0)
+        activeButtonsPanel(enable);
+}
+
+void Configurator::setButtonsPanel()
+{
+    k->controlPanel = new ButtonsPanel(this);
+    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
+    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
+
+    k->settingsLayout->addWidget(k->controlPanel);
+
+    activeButtonsPanel(false);
+}
+
+void Configurator::activeButtonsPanel(bool enable)
+{
+    if (enable)
+        k->controlPanel->show();
+    else
+        k->controlPanel->hide();
+}
+
+void Configurator::initStartCombo(int framesTotal, int currentFrame)
+{
+    k->framesTotal = framesTotal;
+    k->currentFrame = currentFrame;
+    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
+}
+
+void Configurator::setStartFrame(int currentIndex)
+{
+    k->currentFrame = currentIndex;
+    k->settingsPanel->setStartFrame(currentIndex);
+}
+
+int Configurator::startFrame()
+{
+    return k->settingsPanel->startFrame();
+}
+
+int Configurator::startComboSize()
+{
+    return k->settingsPanel->startComboSize();
+}
+
+QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
+{
+    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame, point);
+}
+
+int Configurator::totalSteps()
+{
+    return k->settingsPanel->totalSteps();
+}
+
+void Configurator::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->settingsPanel->activateMode(mode);
+}
+
+void Configurator::addTween(const QString &name)
+{
+    activeTweenManagerPanel(false);
+
+    k->mode = TupToolPlugin::Add;
+    k->state = Configurator::Properties;
+
+    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
+    activePropertiesPanel(true);
+
+    emit setMode(k->mode);
+}
+
+void Configurator::editTween()
+{
+    activeTweenManagerPanel(false);
+
+    k->mode = TupToolPlugin::Edit;
+    k->state = Configurator::Properties;
+
+    k->settingsPanel->notifySelection(true);
+    k->settingsPanel->setParameters(k->currentTween);
+    activePropertiesPanel(true);
+
+    emit setMode(k->mode);
+}
+
+void Configurator::removeTween()
+{
+    QString name = k->tweenManager->currentTweenName();
+    k->tweenManager->removeItemFromList();
+
+    removeTween(name);
+}
+
+void Configurator::removeTween(const QString &name)
+{
+    if (k->tweenManager->listSize() == 0)
+        activeButtonsPanel(false);
+
+    emit clickedRemoveTween(name);
+}
+
+QString Configurator::currentTweenName() const
+{
+    QString oldName = k->tweenManager->currentTweenName();
+    QString newName = k->settingsPanel->currentTweenName();
+
+    if (oldName.compare(newName) != 0)
+        k->tweenManager->updateTweenName(newName);
+
+    return newName;
+}
+
+void Configurator::notifySelection(bool flag)
+{
+    k->settingsPanel->notifySelection(flag);
+}
+
+void Configurator::closeTweenProperties()
+{
+    if (k->mode == TupToolPlugin::Add)
+        k->tweenManager->removeItemFromList();
+
+    emit clickedResetInterface();
+
+    closeSettingsPanel();
+}
+
+void Configurator::closeSettingsPanel()
+{
+    if (k->state == Configurator::Properties) {
+        activeTweenManagerPanel(true);
+        activePropertiesPanel(false);
+        k->mode = TupToolPlugin::View;
+        k->state = Configurator::Manager;
+    }
+}
+
+TupToolPlugin::Mode Configurator::mode()
+{
+    return k->mode;
+}
+
+void Configurator::applyItem()
+{
+     k->mode = TupToolPlugin::Edit;
+     emit clickedApplyTween();
+}
+
+void Configurator::resetUI()
+{
+    k->tweenManager->resetUI();
+    closeSettingsPanel();
+    k->settingsPanel->notifySelection(false);
+}
+
+void Configurator::updateTweenData(const QString &name)
+{
+    emit getTweenData(name);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/scale/configurator.h tupi-0.2+git05/src/plugins/tools/scale/configurator.h
--- tupi-0.2+git04/src/plugins/tools/scale/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scale/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,114 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "tglobal.h"
+#include "settings.h"
+
+#include <QFrame>
+#include <QLabel>
+#include <QBoxLayout>
+#include <QGraphicsPathItem>
+#include <QListWidgetItem>
+
+// class QGraphicsPathItem;
+// class QListWidgetItem;
+class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Configurator : public QFrame
+{
+    Q_OBJECT
+
+    public:
+        enum GuiState { Manager = 1, Properties };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+
+        void loadTweenList(QList<QString> tweenList);
+
+        void initStartCombo(int framesTotal, int currentFrame);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+  
+        int totalSteps();
+        void activateMode(TupToolPlugin::EditMode mode);
+        void setCurrentTween(TupItemTweener *currentTween);
+        QString currentTweenName() const;
+        void notifySelection(bool flag);
+        int startComboSize();
+        void closeSettingsPanel();
+        TupToolPlugin::Mode mode();
+        void resetUI();
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
+        
+    private slots:
+        void applyItem();
+        void addTween(const QString &name);
+        void editTween();
+        void removeTween();
+        void removeTween(const QString &name);
+        void closeTweenProperties();
+        void updateTweenData(const QString &name);
+        
+    signals:
+        void startingPointChanged(int index);
+        void clickedSelect();
+        void clickedDefineProperties();
+        void clickedRemoveTween(const QString &name);
+        void setMode(TupToolPlugin::Mode mode);
+        void clickedApplyTween();
+        void clickedResetInterface();
+        void getTweenData(const QString &name);
+        
+    private:
+        void setPropertiesPanel();
+        void activePropertiesPanel(bool enable);
+        void setTweenManagerPanel();
+        void activeTweenManagerPanel(bool enable);
+        void setButtonsPanel();
+        void activeButtonsPanel(bool enable);
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/scale/scale.pro tupi-0.2+git05/src/plugins/tools/scale/scale.pro
--- tupi-0.2+git04/src/plugins/tools/scale/scale.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scale/scale.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,39 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += tweener.h \
+           configurator.h \
+           settings.h 
+
+SOURCES += tweener.cpp \
+           configurator.cpp \
+           settings.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupiscaletool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/scale/scaletool.json tupi-0.2+git05/src/plugins/tools/scale/scaletool.json
--- tupi-0.2+git04/src/plugins/tools/scale/scaletool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scale/scaletool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "ScaleTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/scale/settings.cpp tupi-0.2+git05/src/plugins/tools/scale/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/scale/settings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scale/settings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,561 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "settings.h"
+#include "tradiobuttongroup.h"
+#include "tupitemtweener.h"
+#include "tuptweenerstep.h"
+#include "timagebutton.h"
+#include "tseparator.h"
+#include "tosd.h"
+
+struct Settings::Private
+{
+    QWidget *innerPanel;
+    QWidget *rangePanel;
+    QWidget *clockPanel;
+
+    QBoxLayout *layout;
+    TupToolPlugin::Mode mode;
+    QLineEdit *input;
+    TRadioButtonGroup *options;
+
+    QSpinBox *comboInit;
+    QSpinBox *comboEnd;
+
+    QLabel *totalLabel;
+    int totalSteps;
+
+    TupItemTweener::TransformAxes scaleAxes;
+    QComboBox *comboAxes;
+    QDoubleSpinBox *comboFactor;
+    QSpinBox *comboIterations; 
+
+    QCheckBox *loopBox;
+    QCheckBox *reverseLoopBox;
+
+    bool selectionDone;
+    bool propertiesDone;
+
+    TImageButton *apply;
+    TImageButton *remove;
+};
+
+Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    k->scaleAxes = TupItemTweener::XY;
+    k->selectionDone = false;
+    k->totalSteps = 0;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    setFont(QFont("Arial", 8, QFont::Normal, false));
+
+    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
+    k->input = new QLineEdit;
+
+    QHBoxLayout *nameLayout = new QHBoxLayout;
+    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    nameLayout->setMargin(0);
+    nameLayout->setSpacing(0);
+    nameLayout->addWidget(nameLabel);
+    nameLayout->addWidget(k->input);
+
+    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
+    k->options->addItem(tr("Select object"), 0);
+    k->options->addItem(tr("Set Properties"), 1);
+    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
+
+    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
+    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
+
+    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
+    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(10);
+    buttonsLayout->addWidget(k->apply);
+    buttonsLayout->addWidget(k->remove);
+
+    k->layout->addLayout(nameLayout);
+    k->layout->addWidget(k->options);
+
+    setInnerForm();
+
+    k->layout->addSpacing(10);
+    k->layout->addLayout(buttonsLayout);
+    k->layout->setSpacing(5);
+
+    activateMode(TupToolPlugin::Selection);
+}
+
+Settings::~Settings()
+{
+    delete k;
+}
+
+void Settings::setInnerForm()
+{
+    k->innerPanel = new QWidget;
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
+    startingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboInit = new QSpinBox();
+    k->comboInit->setEnabled(false);
+    k->comboInit->setMaximum(999);
+    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(updateLastFrame()));
+
+    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
+    endingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboEnd = new QSpinBox();
+    k->comboEnd->setEnabled(true);
+    k->comboEnd->setValue(1);
+    k->comboEnd->setMaximum(999);
+    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(startingLabel);
+    startLayout->addWidget(k->comboInit);
+
+    QHBoxLayout *endLayout = new QHBoxLayout;
+    endLayout->setAlignment(Qt::AlignHCenter);
+    endLayout->setMargin(0);
+    endLayout->setSpacing(0);
+    endLayout->addWidget(endingLabel);
+    endLayout->addWidget(k->comboEnd);
+
+    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
+    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    QHBoxLayout *totalLayout = new QHBoxLayout;
+    totalLayout->setAlignment(Qt::AlignHCenter);
+    totalLayout->setMargin(0);
+    totalLayout->setSpacing(0);
+    totalLayout->addWidget(k->totalLabel);
+
+    k->comboAxes = new QComboBox();
+    k->comboAxes->addItem(tr("Width & Height"));
+    k->comboAxes->addItem(tr("Only Width"));
+    k->comboAxes->addItem(tr("Only Height"));
+    QLabel *axesLabel = new QLabel(tr("Scale in") + ": ");
+    axesLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *axesLayout = new QHBoxLayout;
+    axesLayout->setAlignment(Qt::AlignHCenter);
+    axesLayout->setMargin(0);
+    axesLayout->setSpacing(0);
+    axesLayout->addWidget(axesLabel);
+    axesLayout->addWidget(k->comboAxes);
+
+    k->comboFactor = new QDoubleSpinBox;
+    k->comboFactor->setDecimals(2);
+    k->comboFactor->setMinimum(0.0);
+    k->comboFactor->setMaximum(10);
+    k->comboFactor->setSingleStep(0.05);
+    k->comboFactor->setValue(1.10);
+
+    QLabel *speedLabel = new QLabel(tr("Scaling Factor") + ": ");
+    speedLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *speedLayout = new QHBoxLayout;
+    speedLayout->setAlignment(Qt::AlignHCenter);
+    speedLayout->setMargin(0);
+    speedLayout->setSpacing(0);
+    speedLayout->addWidget(speedLabel);
+    speedLayout->addWidget(k->comboFactor);
+
+    k->comboIterations = new QSpinBox;
+    k->comboIterations->setEnabled(true);
+    k->comboIterations->setMinimum(1);
+
+    QLabel *iterationsLabel = new QLabel(tr("Iterations") + ": ");
+    iterationsLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *iterationsLayout = new QHBoxLayout;
+    iterationsLayout->setAlignment(Qt::AlignHCenter);
+    iterationsLayout->setMargin(0);
+    iterationsLayout->setSpacing(0);
+    iterationsLayout->addWidget(iterationsLabel);
+    iterationsLayout->addWidget(k->comboIterations);
+
+    k->loopBox = new QCheckBox(tr("Loop"), k->innerPanel);
+    connect(k->loopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
+
+    QVBoxLayout *loopLayout = new QVBoxLayout;
+    loopLayout->setAlignment(Qt::AlignHCenter);
+    loopLayout->setMargin(0);
+    loopLayout->setSpacing(0);
+    loopLayout->addWidget(k->loopBox);
+
+    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->innerPanel);
+    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateLoopCheckbox(int)));
+
+    QVBoxLayout *reverseLayout = new QVBoxLayout;
+    reverseLayout->setAlignment(Qt::AlignHCenter);
+    reverseLayout->setMargin(0);
+    reverseLayout->setSpacing(0);
+    reverseLayout->addWidget(k->reverseLoopBox);
+
+    innerLayout->addLayout(startLayout);
+    innerLayout->addLayout(endLayout);
+    innerLayout->addLayout(totalLayout);
+
+    innerLayout->addSpacing(15);
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    innerLayout->addLayout(axesLayout);
+    innerLayout->addLayout(speedLayout);
+    innerLayout->addLayout(iterationsLayout);
+    innerLayout->addLayout(loopLayout);
+    innerLayout->addLayout(reverseLayout);
+
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    k->layout->addWidget(k->innerPanel);
+
+    activeInnerForm(false);
+}
+
+void Settings::activeInnerForm(bool enable)
+{
+    if (enable && !k->innerPanel->isVisible()) {
+        k->propertiesDone = true;
+        k->innerPanel->show();
+    } else {
+        k->propertiesDone = false;
+        k->innerPanel->hide();
+    }
+}
+
+// Adding new Tween
+
+void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
+{
+    Q_UNUSED(framesTotal);
+
+    k->mode = TupToolPlugin::Add;
+    k->input->setText(name);
+
+    activateMode(TupToolPlugin::Selection);
+    k->apply->setToolTip(tr("Save Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
+    k->remove->setToolTip(tr("Cancel Tween"));
+
+    k->comboInit->setValue(initFrame + 1);
+    k->comboInit->setEnabled(false);
+}
+
+// Editing new Tween
+
+void Settings::setParameters(TupItemTweener *currentTween)
+{
+    setEditMode();
+    activateMode(TupToolPlugin::Properties);
+
+    k->input->setText(currentTween->name());
+
+    k->comboInit->setEnabled(true); 
+    k->comboInit->setValue(currentTween->initFrame() + 1);
+
+    k->comboEnd->setValue(currentTween->initFrame() + currentTween->frames());
+
+    checkFramesRange();
+
+    k->comboAxes->setCurrentIndex(currentTween->tweenScaleAxes());
+    k->comboFactor->setValue(currentTween->tweenScaleFactor());
+
+    k->comboIterations->setValue(currentTween->tweenScaleIterations());
+
+    k->loopBox->setChecked(currentTween->tweenScaleLoop());
+    k->reverseLoopBox->setChecked(currentTween->tweenScaleReverseLoop());
+}
+
+void Settings::initStartCombo(int framesTotal, int currentIndex)
+{
+    k->comboInit->clear();
+    k->comboEnd->clear();
+
+    k->comboInit->setMinimum(1);
+    k->comboInit->setMaximum(framesTotal);
+    k->comboInit->setValue(currentIndex + 1);
+
+    k->comboEnd->setMinimum(1);
+    k->comboEnd->setValue(framesTotal);
+}
+
+void Settings::setStartFrame(int currentIndex)
+{
+    k->comboInit->setValue(currentIndex + 1);
+    int end = k->comboEnd->value();
+    if (end < currentIndex+1)
+        k->comboEnd->setValue(currentIndex + 1);
+}
+
+int Settings::startFrame()
+{
+    return k->comboInit->value() - 1;
+}
+
+int Settings::startComboSize()
+{
+    return k->comboInit->maximum();
+}
+
+int Settings::totalSteps()
+{
+    return k->comboEnd->value() - (k->comboInit->value() - 1);
+}
+
+void Settings::setEditMode()
+{
+    k->mode = TupToolPlugin::Edit;
+    k->apply->setToolTip(tr("Update Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
+    k->remove->setToolTip(tr("Close Tween properties"));
+}
+
+void Settings::applyTween()
+{
+    if (!k->selectionDone) {
+        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
+        return;
+    }
+
+    if (!k->propertiesDone) {
+        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
+        return;
+    }
+
+    // SQA: Verify Tween is really well applied before call setEditMode!
+    setEditMode();
+
+    if (!k->comboInit->isEnabled())
+        k->comboInit->setEnabled(true);
+
+    emit clickedApplyTween();
+}
+
+void Settings::notifySelection(bool flag)
+{
+    k->selectionDone = flag;
+}
+
+QString Settings::currentTweenName() const
+{
+    QString tweenName = k->input->text();
+    if (tweenName.length() > 0)
+        k->input->setFocus();
+
+    return tweenName;
+}
+
+void Settings::emitOptionChanged(int option)
+{
+    switch (option) {
+            case 0:
+             {
+                 activeInnerForm(false);
+                 emit clickedSelect();
+             }
+            break;
+            case 1:
+             {
+                 if (k->selectionDone) {
+                     activeInnerForm(true);
+                     emit clickedDefineProperties();
+                 } else {
+                     k->options->setCurrentIndex(0);
+                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
+                 }
+             }
+    }
+}
+
+QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
+{
+    QDomDocument doc;
+
+    QDomElement root = doc.createElement("tweening");
+    root.setAttribute("name", currentTweenName());
+    root.setAttribute("type", TupItemTweener::Scale);
+    root.setAttribute("initFrame", currentFrame);
+    root.setAttribute("initLayer", currentLayer);
+    root.setAttribute("initScene", currentScene);
+
+    checkFramesRange();
+    root.setAttribute("frames", k->totalSteps);
+    root.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
+    k->scaleAxes = TupItemTweener::TransformAxes(k->comboAxes->currentIndex());
+    root.setAttribute("scaleAxes", k->scaleAxes);
+
+    double factor = k->comboFactor->value();
+    root.setAttribute("scaleFactor", factor);
+
+    int iterations = k->comboIterations->value();
+    if (iterations == 0) {
+        iterations = 1;
+        k->comboIterations->setValue(iterations);
+    }
+    root.setAttribute("scaleIterations", iterations);
+
+    bool loop = k->loopBox->isChecked();
+    if (loop)
+        root.setAttribute("scaleLoop", "1");
+    else
+        root.setAttribute("scaleLoop", "0");
+
+    bool reverse = k->reverseLoopBox->isChecked();
+    if (reverse)
+        root.setAttribute("scaleReverseLoop", "1");
+    else
+        root.setAttribute("scaleReverseLoop", "0");
+
+    double factorX = 1.0;
+    double factorY = 1.0;
+    double scaleX = 1.0;
+    double scaleY = 1.0;
+
+    if (k->scaleAxes == TupItemTweener::XY) {
+        factorX = factor;
+        factorY = factor;
+    } else if (k->scaleAxes == TupItemTweener::X) {
+               factorX = factor;
+    } else {
+        factorY = factor;
+    }
+
+    int cycle = 1;
+    int reverseTop = (iterations*2)-2;
+
+    for (int i=0; i < k->totalSteps; i++) {
+         if (cycle <= iterations) {
+             if (cycle == 1) {
+                 scaleX = 1.0;
+                 scaleY = 1.0;
+             } else {
+                 scaleX *= factorX;
+                 scaleY *= factorY;
+             }
+             cycle++;
+         } else {
+             // if repeat option is enabled
+             if (loop) {
+                 cycle = 2;
+                 scaleX = 1.0;
+                 scaleY = 1.0;
+             } else if (reverse) { // if reverse option is enabled
+                        scaleX /= factorX;
+                        scaleY /= factorY;
+
+                        if (cycle < reverseTop)
+                            cycle++;
+                        else
+                            cycle = 1;
+
+             } else { // If cycle is done and no loop and no reverse
+                 scaleX = 1.0;
+                 scaleY = 1.0;
+             }
+         }
+
+         TupTweenerStep *step = new TupTweenerStep(i);
+         step->setScale(scaleX, scaleY);
+         root.appendChild(step->toXml(doc));
+    }
+
+    doc.appendChild(root);
+
+    return doc.toString();
+}
+
+void Settings::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->options->setCurrentIndex(mode);
+}
+
+void Settings::updateLastFrame()
+{
+    int end = k->comboInit->value() + k->totalSteps - 1;
+    k->comboEnd->setValue(end);
+}
+
+void Settings::checkTopLimit(int index)
+{
+    Q_UNUSED(index);
+    checkFramesRange();
+}
+
+void Settings::checkFramesRange()
+{
+    int begin = k->comboInit->value();
+    int end = k->comboEnd->value();
+
+    if (begin > end) {
+        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
+        end = k->comboEnd->value();
+    }
+
+    k->totalSteps = end - begin + 1;
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
+}
+
+void Settings::updateLoopCheckbox(int state)
+{
+    Q_UNUSED(state);
+
+    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
+        k->loopBox->setChecked(false);
+}
+
+void Settings::updateReverseCheckbox(int state)
+{
+    Q_UNUSED(state);
+
+    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
+        k->reverseLoopBox->setChecked(false);
+}
+
+void Settings::updateTotalSteps(const QString &text)
+{
+    Q_UNUSED(text);
+    checkFramesRange();
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/scale/settings.h tupi-0.2+git05/src/plugins/tools/scale/settings.h
--- tupi-0.2+git04/src/plugins/tools/scale/settings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scale/settings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,107 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+
+#include <QWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QBoxLayout>
+#include <QComboBox>
+#include <QSpinBox>
+#include <QDoubleSpinBox>
+#include <QCheckBox>
+#include <QDir>
+
+class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Settings : public QWidget 
+{
+    Q_OBJECT
+
+    public:
+        Settings(QWidget *parent = 0);
+        ~Settings();
+
+        void setParameters(const QString &name, int framesTotal, int startFrame);
+        void setParameters(TupItemTweener *currentTween);
+        void initStartCombo(int totalFrames, int currentIndex);
+        void setStartFrame(int currentIndex);
+        int startFrame();
+
+        int totalSteps();
+
+        void notifySelection(bool flag);
+        int startComboSize();
+        QString currentTweenName() const;
+        void activateMode(TupToolPlugin::EditMode mode);
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
+
+    private slots:
+        void applyTween();
+        void emitOptionChanged(int option);
+        // void checkBottomLimit(int index);
+        void checkTopLimit(int index);
+        void updateTotalSteps(const QString &text);
+        void updateLoopCheckbox(int state);
+        void updateReverseCheckbox(int state);
+        void updateLastFrame();
+        
+    signals:
+        void clickedSelect();
+        void clickedDefineProperties();
+        void clickedApplyTween();
+        void clickedResetTween();
+        void startingPointChanged(int index);
+        
+    private:
+        void setInnerForm();
+        void activeInnerForm(bool enable);
+        void setEditMode();
+        void checkFramesRange();
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/scale/tweener.cpp tupi-0.2+git05/src/plugins/tools/scale/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/scale/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scale/tweener.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,629 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tweener.h"
+#include "configurator.h"
+#include "taction.h"
+#include "tosd.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicsscene.h"
+#include "tupgraphicobject.h"
+#include "tupsvgitem.h"
+#include "tuppathitem.h"
+#include "tuppixmapitem.h"
+#include "tupitemtweener.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+
+struct Tweener::Private
+{
+    QMap<QString, TAction *> actions;
+    Configurator *configurator;
+
+    TupGraphicsScene *scene;
+    QList<QGraphicsItem *> objects;
+
+    TupItemTweener *currentTween;
+    int initFrame;
+    int initLayer;
+    int initScene;
+
+    QPointF origin;
+    // Target *target;
+
+    TupToolPlugin::Mode mode;
+    TupToolPlugin::EditMode editMode;
+
+    int baseZValue;
+};
+
+Tweener::Tweener() : TupToolPlugin(), k(new Private)
+{
+    setupActions();
+
+    k->configurator = 0;
+    k->initFrame = 0;
+    // k->target = 0;
+}
+
+Tweener::~Tweener()
+{
+    delete k;
+}
+
+/* This method initializes the plugin */
+
+void Tweener::init(TupGraphicsScene *scene)
+{
+    k->scene = scene;
+    k->objects.clear();
+    // if (k->target)
+    //     k->scene->removeItem(k->target);
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+
+    k->configurator->resetUI();
+
+    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Scale);
+    if (tweenList.size() > 0) {
+        k->configurator->loadTweenList(tweenList);
+        QString tweenName = tweenList.at(0);
+        setCurrentTween(tweenName);
+    }
+
+    int total = framesTotal();
+    k->configurator->initStartCombo(total, k->initFrame);
+}
+
+void Tweener::updateStartPoint(int index)
+{
+     if (k->initFrame != index && index >= 0)
+         k->initFrame = index;
+}
+
+/* This method returns the plugin name */
+
+QStringList Tweener::keys() const
+{
+    return QStringList() << tr("Scale Tween");
+}
+
+/* This method makes an action when the mouse is pressed on the workspace 
+ * depending on the active mode: Selecting an object or Creating a path  
+*/
+
+void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::press()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method is executed while the mouse is pressed and on movement */
+
+void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method finishes the action started on the press method depending
+ * on the active mode: Selecting an object or Creating a path
+*/
+
+void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::release()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (scene->currentFrameIndex() == k->initFrame) {
+        if (k->editMode == TupToolPlugin::Selection) {
+            if (scene->selectedItems().size() > 0) {
+                k->objects = scene->selectedItems();
+                k->configurator->notifySelection(true);
+                QGraphicsItem *item = k->objects.at(0);
+                QRectF rect = item->sceneBoundingRect();
+                k->origin = rect.center();
+            }
+        }
+    }
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+QMap<QString, TAction *> Tweener::actions() const
+{
+    return k->actions;
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+int Tweener::toolType() const
+{
+    return TupToolInterface::Tweener;
+}
+
+/* This method returns the tool panel associated to this plugin */
+
+QWidget *Tweener::configurator()
+{
+    if (!k->configurator) {
+        k->mode = TupToolPlugin::View;
+
+        k->configurator = new Configurator;
+        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
+        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
+        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
+        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
+        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode)));
+        connect(k->configurator, SIGNAL(clickedDefineProperties()), this, SLOT(setPropertiesMode()));
+        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
+        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    } 
+
+    return k->configurator;
+}
+
+/* This method is called when there's a change on/of scene */
+void Tweener::aboutToChangeScene(TupGraphicsScene *)
+{
+}
+
+/* This method is called when this plugin is off */
+
+void Tweener::aboutToChangeTool()
+{
+    if (k->editMode == TupToolPlugin::Selection) {
+        clearSelection();
+        disableSelection();
+
+        return;
+    }
+
+    // if (k->editMode == TupToolPlugin::Properties)
+    //     k->scene->removeItem(k->target);
+}
+
+/* This method defines the actions contained in this plugin */
+
+void Tweener::setupActions()
+{
+    TAction *translater = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "scale_tween.png"), 
+                                      tr("Scale Tween"), this);
+    translater->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
+    translater->setShortcut(QKeySequence(tr("Shift+S")));
+
+    k->actions.insert(tr("Scale Tween"), translater);
+}
+
+/* This method saves the settings of this plugin */
+
+void Tweener::saveConfig()
+{
+}
+
+/* This method updates the workspace when the plugin changes the scene */
+
+void Tweener::updateScene(TupGraphicsScene *scene)
+{ 
+    k->mode = k->configurator->mode();
+
+    if (k->mode == TupToolPlugin::Edit) {
+       int framesNumber = framesTotal();
+
+       if (k->configurator->startComboSize() < framesNumber)
+           k->configurator->initStartCombo(framesNumber, k->initFrame);
+
+       // int tweenLimit = k->initFrame + (k->configurator->totalSteps() - 1);
+       // if (scene->currentFrameIndex() >= k->initFrame && scene->currentFrameIndex() <= tweenLimit) {
+       //     k->scene->addItem(k->target);
+       // }
+    } else if (k->mode == TupToolPlugin::Add) {
+               int total = framesTotal();
+
+               if (k->editMode == TupToolPlugin::Properties) {
+                   if (total > k->configurator->startComboSize()) {
+                       k->configurator->activateMode(TupToolPlugin::Selection);
+                       clearSelection();
+                       setSelection();
+                   } 
+               } else if (k->editMode == TupToolPlugin::Selection) {
+                          if (scene->currentFrameIndex() != k->initFrame)
+                              clearSelection();
+                          k->initFrame = scene->currentFrameIndex();
+                          setSelection();
+               }
+
+               if (k->configurator->startComboSize() < total) {
+                   k->configurator->initStartCombo(total, k->initFrame);
+               } else {
+                   if (scene->currentFrameIndex() != k->initFrame)
+                       k->configurator->setStartFrame(scene->currentFrameIndex());
+               }
+
+    } else {
+             if (scene->currentFrameIndex() != k->initFrame)
+                 k->configurator->setStartFrame(scene->currentFrameIndex());
+    }
+}
+
+void Tweener::setCurrentTween(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    k->currentTween = scene->tween(name, TupItemTweener::Scale);
+
+    if (k->currentTween)
+        k->configurator->setCurrentTween(k->currentTween);
+}
+
+int Tweener::framesTotal()
+{
+    int total = 1;
+    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
+    if (layer)
+        total = layer->framesTotal();
+
+    return total;
+}
+
+/* This method clears selection */
+
+void Tweener::clearSelection()
+{
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 if (item->isSelected())
+                     item->setSelected(false);
+        }
+        k->objects.clear();
+        k->configurator->notifySelection(false);
+    }
+}
+
+/* This method disables object selection */
+
+void Tweener::disableSelection()
+{
+    foreach (QGraphicsView *view, k->scene->views()) {
+             view->setDragMode (QGraphicsView::NoDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+/* This method initializes the "Select object" mode */
+
+void Tweener::setSelection()
+{
+    // if (k->editMode == TupToolPlugin::Properties)
+    //     k->scene->removeItem(k->target);
+
+    k->editMode = TupToolPlugin::Selection;
+
+    int bottomBoundary = 20000 + (k->initLayer*10000);
+    int topBoundary = bottomBoundary + 10000;
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             view->setDragMode(QGraphicsView::RubberBandDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
+                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+             }
+    }
+
+    // When Object selection is enabled, previous selection is set
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                 item->setSelected(true);
+        }
+        k->configurator->notifySelection(true);
+    }
+
+}
+
+void Tweener::setPropertiesMode()
+{
+    k->editMode = TupToolPlugin::Properties;
+    disableSelection();
+
+    // addTarget();
+}
+
+/* This method resets this plugin */
+
+void Tweener::applyReset()
+{
+    // if ((k->mode == TupToolPlugin::Edit || k->mode == TupToolPlugin::Add) && k->editMode == TupToolPlugin::Properties)
+    //     k->scene->removeItem(k->target);
+
+    disableSelection();
+    clearSelection();
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+}
+
+/* This method applies to the project, the Tween created from this plugin */
+
+void Tweener::applyTween()
+{
+    QString name = k->configurator->currentTweenName();
+
+    if (name.length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
+        return;
+    }
+
+    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Scale)) {
+        k->initFrame = k->scene->currentFrameIndex();
+        k->initLayer = k->scene->currentLayerIndex();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 int objectIndex = k->scene->currentFrame()->indexOf(item);
+                 // QRectF rect = item->sceneBoundingRect();
+                 QPointF origin = item->mapFromParent(k->origin);
+
+                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = k->scene->currentFrame()->indexOf(svg);
+                 } else {
+                     if (qgraphicsitem_cast<TupPathItem *>(item))
+                         origin = k->origin;
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex, QPointF(), k->scene->spaceMode(), 
+                                             type, TupProjectRequest::SetTween,
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
+                 emit requested(&request);
+        }
+    } else {
+        removeTweenFromProject(name);
+        QList<QGraphicsItem *> newList;
+
+        k->initFrame = k->configurator->startFrame();
+        k->initLayer = k->currentTween->initLayer();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 TupProject *project = k->scene->scene()->project();
+                 TupScene *scene = project->scene(k->initScene);
+                 TupLayer *layer = scene->layer(k->initLayer);
+                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
+                 int objectIndex = frame->indexOf(item);
+                 QPointF origin = item->mapFromParent(k->origin);
+                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
+
+                 if (svg) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = frame->indexOf(svg);
+                 } else {
+                     if (qgraphicsitem_cast<TupPathItem *>(item))
+                         origin = k->origin;
+                 }
+
+                 if (k->initFrame != k->currentTween->initFrame()) {
+                     QDomDocument dom;
+                     if (type == TupLibraryObject::Svg)
+                         dom.appendChild(svg->toXml(dom));
+                     else
+                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
+
+                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame,
+                                                                                      0, QPointF(), k->scene->spaceMode(),   
+                                                                                      type, TupProjectRequest::Add, dom.toString());
+                     emit requested(&request);
+
+                     request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer,
+                                                                    k->currentTween->initFrame(),
+                                                                    objectIndex, QPointF(), k->scene->spaceMode(), 
+                                                                    type, TupProjectRequest::Remove);
+                     emit requested(&request);
+
+                     frame = layer->frame(k->initFrame);
+                     if (type == TupLibraryObject::Item) {
+                         objectIndex = frame->graphicItemsCount() - 1;
+                         newList.append(frame->graphic(objectIndex)->item());
+                     } else {
+                         objectIndex = frame->svgItemsCount() - 1;
+                         newList.append(frame->svg(objectIndex));
+                     }
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                             k->initScene, k->initLayer, k->initFrame,
+                                             objectIndex, QPointF(), k->scene->spaceMode(), 
+                                             type, TupProjectRequest::SetTween,
+                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
+                 emit requested(&request);
+        }
+
+        if (newList.size() > 0)
+            k->objects = newList;
+    }
+
+    int total = k->initFrame + k->configurator->totalSteps();
+    int framesNumber = framesTotal();
+    int layersTotal = k->scene->scene()->layersTotal();
+    TupProjectRequest request;
+
+    if (total >= framesNumber) {
+        for (int i = framesNumber; i < total; i++) {
+             for (int j = 0; j < layersTotal; j++) {
+                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i,
+                                                                  TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
+                  emit requested(&request);
+             }
+        }
+    }
+
+    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
+                                                    TupProjectRequest::Select, "1");
+    emit requested(&request);
+
+
+    setCurrentTween(name);
+    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
+}
+
+void Tweener::removeTweenFromProject(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    scene->removeTween(name, TupItemTweener::Scale);
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      QString tip = item->toolTip();
+                      if (tip.startsWith(tr("Scale Tween") + ": " + name))
+                          item->setToolTip("");
+             }
+    }
+}
+
+void Tweener::removeTween(const QString &name)
+{
+    removeTweenFromProject(name);
+    applyReset();
+}
+
+void Tweener::updateOriginPoint(const QPointF &point)
+{
+    k->origin = point;
+}
+
+/*
+void Tweener::addTarget()
+{
+    if (k->mode == TupToolPlugin::Add) {
+        k->target = new Target(k->origin, k->baseZValue, k->scene);
+        connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
+    } else {
+        if (k->objects.size() > 0) {
+            QGraphicsItem *item = k->objects.at(0);
+            k->origin = item->mapToParent(k->currentTween->transformOriginPoint());
+            k->target = new Target(k->origin, k->baseZValue, k->scene);
+            connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
+        }
+    }
+}
+*/
+
+void Tweener::updateMode(TupToolPlugin::Mode mode)
+{
+    k->mode = mode;
+
+    if (k->mode == TupToolPlugin::Edit) {
+        k->initScene = k->currentTween->initScene();
+        k->initLayer = k->currentTween->initLayer();
+        k->initFrame = k->currentTween->initFrame();
+
+        if (k->initFrame != k->scene->currentFrameIndex()) {
+            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene,
+                                                                              k->initLayer,
+                                                                              k->initFrame, TupProjectRequest::Select, "1");
+            emit requested(&request);
+        }
+
+        if (k->objects.isEmpty()) {
+            k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Rotation);
+            k->origin = k->currentTween->transformOriginPoint();
+        }
+    }
+}
+
+void Tweener::sceneResponse(const TupSceneResponse *event)
+{
+    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
+        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
+        init(k->scene);
+    }
+
+    if (event->action() == TupProjectRequest::Select)
+        init(k->scene);
+}
+
+void Tweener::layerResponse(const TupLayerResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove)
+        init(k->scene);
+}
+
+void Tweener::frameResponse(const TupFrameResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
+        init(k->scene);
+
+    if (event->action() == TupProjectRequest::Select) {
+        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
+            init(k->scene);
+    }
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/scale/tweener.h tupi-0.2+git05/src/plugins/tools/scale/tweener.h
--- tupi-0.2+git04/src/plugins/tools/scale/tweener.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scale/tweener.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,110 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SCALETWEENER_H
+#define SCALETWEENER_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "settings.h"
+#include "tupprojectresponse.h"
+
+#include <QPointF>
+#include <QKeySequence>
+#include <QMatrix>
+#include <QGraphicsView>
+#include <QDomDocument>
+#include <QDir>
+
+/**
+ * @author Gustav Gonzalez 
+ * 
+*/
+
+class TUPI_PLUGIN Tweener : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "scaletool.json")
+
+    public:
+        Tweener();
+        virtual ~Tweener();
+        virtual void init(TupGraphicsScene *scene);
+
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+
+        virtual void updateScene(TupGraphicsScene *scene);
+        virtual void saveConfig();
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+        virtual void layerResponse(const TupLayerResponse *event);
+        virtual void frameResponse(const TupFrameResponse *event);
+
+    private:
+        void setupActions();
+        int framesTotal();
+        void clearSelection();
+        void disableSelection();
+        // void addTarget();
+        void removeTweenFromProject(const QString &name);
+        // int maxZValue();
+
+    private:
+        struct Private;
+        Private *const k;
+
+    private slots:
+        void setSelection();
+        void setPropertiesMode();
+        void updateMode(TupToolPlugin::Mode mode);
+        void applyReset();
+        void applyTween();
+        void removeTween(const QString &name);
+        void updateStartPoint(int index);
+        void setCurrentTween(const QString &name);
+        void updateOriginPoint(const QPointF &point);
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/scaletool/configurator.cpp tupi-0.2+git05/src/plugins/tools/scaletool/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/scaletool/configurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scaletool/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,314 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "configurator.h"
-#include "tweenmanager.h"
-#include "buttonspanel.h"
-
-#include "tupitemtweener.h"
-#include "tosd.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QBoxLayout>
-
-struct Configurator::Private
-{
-    QBoxLayout *layout;
-    QBoxLayout *settingsLayout;
-    Settings *settingsPanel;
-    TweenManager *tweenManager;
-    ButtonsPanel *controlPanel;
-
-    TupItemTweener *currentTween;
-
-    int framesTotal;
-    int currentFrame;
-
-    TupToolPlugin::Mode mode;
-    Configurator::GuiState state;
-};
-
-Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
-{
-    k->framesTotal = 1;
-    k->currentFrame = 0;
-
-    k->mode = TupToolPlugin::View;
-    k->state = Configurator::Manager;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-
-    QLabel *title = new QLabel(tr("Scale Tween"));
-    title->setAlignment(Qt::AlignHCenter);
-    title->setFont(QFont("Arial", 8, QFont::Bold));
-
-    k->layout->addWidget(title);
-
-    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    k->settingsLayout->setMargin(0);
-    k->settingsLayout->setSpacing(0);
-
-    setTweenManagerPanel();
-    setButtonsPanel();
-    setPropertiesPanel();
-
-    k->layout->addLayout(k->settingsLayout);
-    k->layout->addStretch(2);
-}
-
-Configurator::~Configurator()
-{
-    delete k;
-}
-
-void Configurator::loadTweenList(QList<QString> tweenList)
-{
-    k->tweenManager->loadTweenList(tweenList);
-    if (tweenList.count() > 0)
-        activeButtonsPanel(true);
-}
-
-void Configurator::setPropertiesPanel()
-{
-    k->settingsPanel = new Settings(this);
-
-    connect(k->settingsPanel, SIGNAL(startingPointChanged(int)), this, SIGNAL(startingPointChanged(int)));
-    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
-    connect(k->settingsPanel, SIGNAL(clickedDefineProperties()), this, SIGNAL(clickedDefineProperties()));
-    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
-    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
-
-    k->settingsLayout->addWidget(k->settingsPanel);
-
-    activePropertiesPanel(false);
-}
-
-void Configurator::activePropertiesPanel(bool enable)
-{
-    if (enable)
-        k->settingsPanel->show();
-    else
-        k->settingsPanel->hide();
-}
-
-void Configurator::setCurrentTween(TupItemTweener *currentTween)
-{
-    k->currentTween = currentTween;
-}
-
-void Configurator::setTweenManagerPanel()
-{
-    k->tweenManager = new TweenManager(this);
-    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
-    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
-
-    k->settingsLayout->addWidget(k->tweenManager);
-    k->state = Configurator::Manager;
-}
-
-void Configurator::activeTweenManagerPanel(bool enable)
-{
-    if (enable)
-        k->tweenManager->show();
-    else
-        k->tweenManager->hide();
-
-    if (k->tweenManager->listSize() > 0)
-        activeButtonsPanel(enable);
-}
-
-void Configurator::setButtonsPanel()
-{
-    k->controlPanel = new ButtonsPanel(this);
-    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
-    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
-
-    k->settingsLayout->addWidget(k->controlPanel);
-
-    activeButtonsPanel(false);
-}
-
-void Configurator::activeButtonsPanel(bool enable)
-{
-    if (enable)
-        k->controlPanel->show();
-    else
-        k->controlPanel->hide();
-}
-
-void Configurator::initStartCombo(int framesTotal, int currentFrame)
-{
-    k->framesTotal = framesTotal;
-    k->currentFrame = currentFrame;
-    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
-}
-
-void Configurator::setStartFrame(int currentIndex)
-{
-    k->currentFrame = currentIndex;
-    k->settingsPanel->setStartFrame(currentIndex);
-}
-
-int Configurator::startFrame()
-{
-    return k->settingsPanel->startFrame();
-}
-
-int Configurator::startComboSize()
-{
-    return k->settingsPanel->startComboSize();
-}
-
-QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
-{
-    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame, point);
-}
-
-int Configurator::totalSteps()
-{
-    return k->settingsPanel->totalSteps();
-}
-
-void Configurator::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->settingsPanel->activateMode(mode);
-}
-
-void Configurator::addTween(const QString &name)
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Add;
-    k->state = Configurator::Properties;
-
-    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
-    activePropertiesPanel(true);
-
-    emit setMode(k->mode);
-}
-
-void Configurator::editTween()
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Edit;
-    k->state = Configurator::Properties;
-
-    k->settingsPanel->notifySelection(true);
-    k->settingsPanel->setParameters(k->currentTween);
-    activePropertiesPanel(true);
-
-    emit setMode(k->mode);
-}
-
-void Configurator::removeTween()
-{
-    QString name = k->tweenManager->currentTweenName();
-    k->tweenManager->removeItemFromList();
-
-    removeTween(name);
-}
-
-void Configurator::removeTween(const QString &name)
-{
-    if (k->tweenManager->listSize() == 0)
-        activeButtonsPanel(false);
-
-    emit clickedRemoveTween(name);
-}
-
-QString Configurator::currentTweenName() const
-{
-    QString oldName = k->tweenManager->currentTweenName();
-    QString newName = k->settingsPanel->currentTweenName();
-
-    if (oldName.compare(newName) != 0)
-        k->tweenManager->updateTweenName(newName);
-
-    return newName;
-}
-
-void Configurator::notifySelection(bool flag)
-{
-    k->settingsPanel->notifySelection(flag);
-}
-
-void Configurator::closeTweenProperties()
-{
-    if (k->mode == TupToolPlugin::Add)
-        k->tweenManager->removeItemFromList();
-
-    emit clickedResetInterface();
-
-    closeSettingsPanel();
-}
-
-void Configurator::closeSettingsPanel()
-{
-    if (k->state == Configurator::Properties) {
-        activeTweenManagerPanel(true);
-        activePropertiesPanel(false);
-        k->mode = TupToolPlugin::View;
-        k->state = Configurator::Manager;
-    }
-}
-
-TupToolPlugin::Mode Configurator::mode()
-{
-    return k->mode;
-}
-
-void Configurator::applyItem()
-{
-     k->mode = TupToolPlugin::Edit;
-     emit clickedApplyTween();
-}
-
-void Configurator::resetUI()
-{
-    k->tweenManager->resetUI();
-    closeSettingsPanel();
-    k->settingsPanel->notifySelection(false);
-}
-
-void Configurator::updateTweenData(const QString &name)
-{
-    emit getTweenData(name);
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/scaletool/configurator.h tupi-0.2+git05/src/plugins/tools/scaletool/configurator.h
--- tupi-0.2+git04/src/plugins/tools/scaletool/configurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scaletool/configurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONFIGURATOR_H
-#define CONFIGURATOR_H
-
-#include "settings.h"
-#include <QFrame>
-
-class QGraphicsPathItem;
-class QListWidgetItem;
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Configurator : public QFrame
-{
-    Q_OBJECT
-
-    public:
-        enum GuiState { Manager = 1, Properties };
-
-        Configurator(QWidget *parent = 0);
-        ~Configurator();
-
-        void loadTweenList(QList<QString> tweenList);
-
-        void initStartCombo(int framesTotal, int currentFrame);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-  
-        int totalSteps();
-        void activateMode(TupToolPlugin::EditMode mode);
-        void setCurrentTween(TupItemTweener *currentTween);
-        QString currentTweenName() const;
-        void notifySelection(bool flag);
-        int startComboSize();
-        void closeSettingsPanel();
-        TupToolPlugin::Mode mode();
-        void resetUI();
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
-        
-    private slots:
-        void applyItem();
-        void addTween(const QString &name);
-        void editTween();
-        void removeTween();
-        void removeTween(const QString &name);
-        void closeTweenProperties();
-        void updateTweenData(const QString &name);
-        
-    signals:
-        void startingPointChanged(int index);
-        void clickedSelect();
-        void clickedDefineProperties();
-        void clickedRemoveTween(const QString &name);
-        void setMode(TupToolPlugin::Mode mode);
-        void clickedApplyTween();
-        void clickedResetInterface();
-        void getTweenData(const QString &name);
-        
-    private:
-        void setPropertiesPanel();
-        void activePropertiesPanel(bool enable);
-        void setTweenManagerPanel();
-        void activeTweenManagerPanel(bool enable);
-        void setButtonsPanel();
-        void activeButtonsPanel(bool enable);
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/scaletool/scaletool.json tupi-0.2+git05/src/plugins/tools/scaletool/scaletool.json
--- tupi-0.2+git04/src/plugins/tools/scaletool/scaletool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scaletool/scaletool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "ScaleTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/scaletool/scaletool.pro tupi-0.2+git05/src/plugins/tools/scaletool/scaletool.pro
--- tupi-0.2+git04/src/plugins/tools/scaletool/scaletool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scaletool/scaletool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/scaletool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += tweener.h \
-           configurator.h \
-           settings.h 
-
-SOURCES += tweener.cpp \
-           configurator.cpp \
-           settings.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupiscaletool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/scaletool/settings.cpp tupi-0.2+git05/src/plugins/tools/scaletool/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/scaletool/settings.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scaletool/settings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,569 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "settings.h"
-#include "tdebug.h"
-#include "tradiobuttongroup.h"
-#include "tupitemtweener.h"
-#include "tuptweenerstep.h"
-#include "timagebutton.h"
-#include "tseparator.h"
-#include "tosd.h"
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QBoxLayout>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
-#include <QCheckBox>
-#include <QDir>
-
-struct Settings::Private
-{
-    QWidget *innerPanel;
-    QWidget *rangePanel;
-    QWidget *clockPanel;
-
-    QBoxLayout *layout;
-    TupToolPlugin::Mode mode;
-    QLineEdit *input;
-    TRadioButtonGroup *options;
-
-    QSpinBox *comboInit;
-    QSpinBox *comboEnd;
-
-    QLabel *totalLabel;
-    int totalSteps;
-
-    TupItemTweener::TransformAxes scaleAxes;
-    QComboBox *comboAxes;
-    QDoubleSpinBox *comboFactor;
-    QSpinBox *comboIterations; 
-
-    QCheckBox *loopBox;
-    QCheckBox *reverseLoopBox;
-
-    bool selectionDone;
-    bool propertiesDone;
-
-    TImageButton *apply;
-    TImageButton *remove;
-};
-
-Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    k->scaleAxes = TupItemTweener::XY;
-    k->selectionDone = false;
-    k->totalSteps = 0;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    setFont(QFont("Arial", 8, QFont::Normal, false));
-
-    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
-    k->input = new QLineEdit;
-
-    QHBoxLayout *nameLayout = new QHBoxLayout;
-    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    nameLayout->setMargin(0);
-    nameLayout->setSpacing(0);
-    nameLayout->addWidget(nameLabel);
-    nameLayout->addWidget(k->input);
-
-    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
-    k->options->addItem(tr("Select object"), 0);
-    k->options->addItem(tr("Set Properties"), 1);
-    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
-
-    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
-    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
-
-    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
-    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    buttonsLayout->setMargin(0);
-    buttonsLayout->setSpacing(10);
-    buttonsLayout->addWidget(k->apply);
-    buttonsLayout->addWidget(k->remove);
-
-    k->layout->addLayout(nameLayout);
-    k->layout->addWidget(k->options);
-
-    setInnerForm();
-
-    k->layout->addSpacing(10);
-    k->layout->addLayout(buttonsLayout);
-    k->layout->setSpacing(5);
-
-    activateMode(TupToolPlugin::Selection);
-}
-
-Settings::~Settings()
-{
-    delete k;
-}
-
-void Settings::setInnerForm()
-{
-    k->innerPanel = new QWidget;
-
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
-    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
-    startingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboInit = new QSpinBox();
-    k->comboInit->setEnabled(false);
-    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(updateLastFrame()));
-
-    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
-    endingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboEnd = new QSpinBox();
-    k->comboEnd->setEnabled(true);
-    k->comboEnd->setValue(1);
-    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
-
-    QHBoxLayout *startLayout = new QHBoxLayout;
-    startLayout->setAlignment(Qt::AlignHCenter);
-    startLayout->setMargin(0);
-    startLayout->setSpacing(0);
-    startLayout->addWidget(startingLabel);
-    startLayout->addWidget(k->comboInit);
-
-    QHBoxLayout *endLayout = new QHBoxLayout;
-    endLayout->setAlignment(Qt::AlignHCenter);
-    endLayout->setMargin(0);
-    endLayout->setSpacing(0);
-    endLayout->addWidget(endingLabel);
-    endLayout->addWidget(k->comboEnd);
-
-    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
-    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    QHBoxLayout *totalLayout = new QHBoxLayout;
-    totalLayout->setAlignment(Qt::AlignHCenter);
-    totalLayout->setMargin(0);
-    totalLayout->setSpacing(0);
-    totalLayout->addWidget(k->totalLabel);
-
-    k->comboAxes = new QComboBox();
-    k->comboAxes->addItem(tr("Width & Height"));
-    k->comboAxes->addItem(tr("Only Width"));
-    k->comboAxes->addItem(tr("Only Height"));
-    QLabel *axesLabel = new QLabel(tr("Scale in") + ": ");
-    axesLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *axesLayout = new QHBoxLayout;
-    axesLayout->setAlignment(Qt::AlignHCenter);
-    axesLayout->setMargin(0);
-    axesLayout->setSpacing(0);
-    axesLayout->addWidget(axesLabel);
-    axesLayout->addWidget(k->comboAxes);
-
-    k->comboFactor = new QDoubleSpinBox;
-    k->comboFactor->setDecimals(2);
-    k->comboFactor->setMinimum(0.0);
-    k->comboFactor->setMaximum(10);
-    k->comboFactor->setSingleStep(0.05);
-    k->comboFactor->setValue(1.10);
-
-    QLabel *speedLabel = new QLabel(tr("Scaling Factor") + ": ");
-    speedLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *speedLayout = new QHBoxLayout;
-    speedLayout->setAlignment(Qt::AlignHCenter);
-    speedLayout->setMargin(0);
-    speedLayout->setSpacing(0);
-    speedLayout->addWidget(speedLabel);
-    speedLayout->addWidget(k->comboFactor);
-
-    k->comboIterations = new QSpinBox;
-    k->comboIterations->setEnabled(true);
-    k->comboIterations->setMinimum(1);
-
-    QLabel *iterationsLabel = new QLabel(tr("Iterations") + ": ");
-    iterationsLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *iterationsLayout = new QHBoxLayout;
-    iterationsLayout->setAlignment(Qt::AlignHCenter);
-    iterationsLayout->setMargin(0);
-    iterationsLayout->setSpacing(0);
-    iterationsLayout->addWidget(iterationsLabel);
-    iterationsLayout->addWidget(k->comboIterations);
-
-    k->loopBox = new QCheckBox(tr("Loop"), k->innerPanel);
-    connect(k->loopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
-
-    QVBoxLayout *loopLayout = new QVBoxLayout;
-    loopLayout->setAlignment(Qt::AlignHCenter);
-    loopLayout->setMargin(0);
-    loopLayout->setSpacing(0);
-    loopLayout->addWidget(k->loopBox);
-
-    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->innerPanel);
-    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateLoopCheckbox(int)));
-
-    QVBoxLayout *reverseLayout = new QVBoxLayout;
-    reverseLayout->setAlignment(Qt::AlignHCenter);
-    reverseLayout->setMargin(0);
-    reverseLayout->setSpacing(0);
-    reverseLayout->addWidget(k->reverseLoopBox);
-
-    innerLayout->addLayout(startLayout);
-    innerLayout->addLayout(endLayout);
-    innerLayout->addLayout(totalLayout);
-
-    innerLayout->addSpacing(15);
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    innerLayout->addLayout(axesLayout);
-    innerLayout->addLayout(speedLayout);
-    innerLayout->addLayout(iterationsLayout);
-    innerLayout->addLayout(loopLayout);
-    innerLayout->addLayout(reverseLayout);
-
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    k->layout->addWidget(k->innerPanel);
-
-    activeInnerForm(false);
-}
-
-void Settings::activeInnerForm(bool enable)
-{
-    if (enable && !k->innerPanel->isVisible()) {
-        k->propertiesDone = true;
-        k->innerPanel->show();
-    } else {
-        k->propertiesDone = false;
-        k->innerPanel->hide();
-    }
-}
-
-// Adding new Tween
-
-void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
-{
-    Q_UNUSED(framesTotal);
-
-    k->mode = TupToolPlugin::Add;
-    k->input->setText(name);
-
-    activateMode(TupToolPlugin::Selection);
-    k->apply->setToolTip(tr("Save Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
-    k->remove->setToolTip(tr("Cancel Tween"));
-
-    k->comboInit->setValue(initFrame + 1);
-    k->comboInit->setEnabled(false);
-}
-
-// Editing new Tween
-
-void Settings::setParameters(TupItemTweener *currentTween)
-{
-    setEditMode();
-    activateMode(TupToolPlugin::Properties);
-
-    k->input->setText(currentTween->name());
-
-    k->comboInit->setEnabled(true); 
-    k->comboInit->setValue(currentTween->initFrame() + 1);
-
-    k->comboEnd->setValue(currentTween->initFrame() + currentTween->frames());
-
-    checkFramesRange();
-
-    k->comboAxes->setCurrentIndex(currentTween->tweenScaleAxes());
-    k->comboFactor->setValue(currentTween->tweenScaleFactor());
-
-    k->comboIterations->setValue(currentTween->tweenScaleIterations());
-
-    k->loopBox->setChecked(currentTween->tweenScaleLoop());
-    k->reverseLoopBox->setChecked(currentTween->tweenScaleReverseLoop());
-}
-
-void Settings::initStartCombo(int framesTotal, int currentIndex)
-{
-    k->comboInit->clear();
-    k->comboEnd->clear();
-
-    k->comboInit->setMinimum(1);
-    k->comboInit->setMaximum(framesTotal);
-    k->comboInit->setValue(currentIndex + 1);
-
-    k->comboEnd->setMinimum(1);
-    k->comboEnd->setValue(framesTotal);
-}
-
-void Settings::setStartFrame(int currentIndex)
-{
-    k->comboInit->setValue(currentIndex + 1);
-    int end = k->comboEnd->value();
-    if (end < currentIndex+1)
-        k->comboEnd->setValue(currentIndex + 1);
-}
-
-int Settings::startFrame()
-{
-    return k->comboInit->value() - 1;
-}
-
-int Settings::startComboSize()
-{
-    return k->comboInit->maximum();
-}
-
-int Settings::totalSteps()
-{
-    return k->comboEnd->value() - (k->comboInit->value() - 1);
-}
-
-void Settings::setEditMode()
-{
-    k->mode = TupToolPlugin::Edit;
-    k->apply->setToolTip(tr("Update Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
-    k->remove->setToolTip(tr("Close Tween properties"));
-}
-
-void Settings::applyTween()
-{
-    if (!k->selectionDone) {
-        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
-        return;
-    }
-
-    if (!k->propertiesDone) {
-        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
-        return;
-    }
-
-    // SQA: Verify Tween is really well applied before call setEditMode!
-    setEditMode();
-
-    if (!k->comboInit->isEnabled())
-        k->comboInit->setEnabled(true);
-
-    emit clickedApplyTween();
-}
-
-void Settings::notifySelection(bool flag)
-{
-    k->selectionDone = flag;
-}
-
-QString Settings::currentTweenName() const
-{
-    QString tweenName = k->input->text();
-    if (tweenName.length() > 0)
-        k->input->setFocus();
-
-    return tweenName;
-}
-
-void Settings::emitOptionChanged(int option)
-{
-    switch (option) {
-            case 0:
-             {
-                 activeInnerForm(false);
-                 emit clickedSelect();
-             }
-            break;
-            case 1:
-             {
-                 if (k->selectionDone) {
-                     activeInnerForm(true);
-                     emit clickedDefineProperties();
-                 } else {
-                     k->options->setCurrentIndex(0);
-                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
-                 }
-             }
-    }
-}
-
-QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
-{
-    QDomDocument doc;
-
-    QDomElement root = doc.createElement("tweening");
-    root.setAttribute("name", currentTweenName());
-    root.setAttribute("type", TupItemTweener::Scale);
-    root.setAttribute("initFrame", currentFrame);
-    root.setAttribute("initLayer", currentLayer);
-    root.setAttribute("initScene", currentScene);
-
-    checkFramesRange();
-    root.setAttribute("frames", k->totalSteps);
-    root.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
-    k->scaleAxes = TupItemTweener::TransformAxes(k->comboAxes->currentIndex());
-    root.setAttribute("scaleAxes", k->scaleAxes);
-
-    double factor = k->comboFactor->value();
-    root.setAttribute("scaleFactor", factor);
-
-    int iterations = k->comboIterations->value();
-    if (iterations == 0) {
-        iterations = 1;
-        k->comboIterations->setValue(iterations);
-    }
-    root.setAttribute("scaleIterations", iterations);
-
-    bool loop = k->loopBox->isChecked();
-    if (loop)
-        root.setAttribute("scaleLoop", "1");
-    else
-        root.setAttribute("scaleLoop", "0");
-
-    bool reverse = k->reverseLoopBox->isChecked();
-    if (reverse)
-        root.setAttribute("scaleReverseLoop", "1");
-    else
-        root.setAttribute("scaleReverseLoop", "0");
-
-    double factorX = 1.0;
-    double factorY = 1.0;
-    double scaleX = 1.0;
-    double scaleY = 1.0;
-
-    if (k->scaleAxes == TupItemTweener::XY) {
-        factorX = factor;
-        factorY = factor;
-    } else if (k->scaleAxes == TupItemTweener::X) {
-               factorX = factor;
-    } else {
-        factorY = factor;
-    }
-
-    int cycle = 1;
-    int reverseTop = (iterations*2)-2;
-
-    for (int i=0; i < k->totalSteps; i++) {
-         if (cycle <= iterations) {
-             if (cycle == 1) {
-                 scaleX = 1.0;
-                 scaleY = 1.0;
-             } else {
-                 scaleX *= factorX;
-                 scaleY *= factorY;
-             }
-             cycle++;
-         } else {
-             // if repeat option is enabled
-             if (loop) {
-                 cycle = 2;
-                 scaleX = 1.0;
-                 scaleY = 1.0;
-             } else if (reverse) { // if reverse option is enabled
-                        scaleX /= factorX;
-                        scaleY /= factorY;
-
-                        if (cycle < reverseTop)
-                            cycle++;
-                        else
-                            cycle = 1;
-
-             } else { // If cycle is done and no loop and no reverse
-                 scaleX = 1.0;
-                 scaleY = 1.0;
-             }
-         }
-
-         TupTweenerStep *step = new TupTweenerStep(i);
-         step->setScale(scaleX, scaleY);
-         root.appendChild(step->toXml(doc));
-    }
-
-    doc.appendChild(root);
-
-    return doc.toString();
-}
-
-void Settings::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->options->setCurrentIndex(mode);
-}
-
-void Settings::updateLastFrame()
-{
-    int end = k->comboInit->value() + k->totalSteps - 1;
-    k->comboEnd->setValue(end);
-}
-
-void Settings::checkTopLimit(int index)
-{
-    Q_UNUSED(index);
-    checkFramesRange();
-}
-
-void Settings::checkFramesRange()
-{
-    int begin = k->comboInit->value();
-    int end = k->comboEnd->value();
-
-    if (begin > end) {
-        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
-        end = k->comboEnd->value();
-    }
-
-    k->totalSteps = end - begin + 1;
-    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
-}
-
-void Settings::updateLoopCheckbox(int state)
-{
-    Q_UNUSED(state);
-
-    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
-        k->loopBox->setChecked(false);
-}
-
-void Settings::updateReverseCheckbox(int state)
-{
-    Q_UNUSED(state);
-
-    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
-        k->reverseLoopBox->setChecked(false);
-}
-
-void Settings::updateTotalSteps(const QString &text)
-{
-    Q_UNUSED(text);
-    checkFramesRange();
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/scaletool/settings.h tupi-0.2+git05/src/plugins/tools/scaletool/settings.h
--- tupi-0.2+git04/src/plugins/tools/scaletool/settings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scaletool/settings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
-#include "tuptoolplugin.h"
-#include <QWidget>
-
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Settings : public QWidget 
-{
-    Q_OBJECT
-
-    public:
-        Settings(QWidget *parent = 0);
-        ~Settings();
-
-        void setParameters(const QString &name, int framesTotal, int startFrame);
-        void setParameters(TupItemTweener *currentTween);
-        void initStartCombo(int totalFrames, int currentIndex);
-        void setStartFrame(int currentIndex);
-        int startFrame();
-
-        int totalSteps();
-
-        void notifySelection(bool flag);
-        int startComboSize();
-        QString currentTweenName() const;
-        void activateMode(TupToolPlugin::EditMode mode);
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
-
-    private slots:
-        void applyTween();
-        void emitOptionChanged(int option);
-        void checkBottomLimit(int index);
-        void checkTopLimit(int index);
-        void updateTotalSteps(const QString &text);
-        void updateLoopCheckbox(int state);
-        void updateReverseCheckbox(int state);
-        void updateLastFrame();
-        
-    signals:
-        void clickedSelect();
-        void clickedDefineProperties();
-        void clickedApplyTween();
-        void clickedResetTween();
-        void startingPointChanged(int index);
-        
-    private:
-        void setInnerForm();
-        void activeInnerForm(bool enable);
-        void setEditMode();
-        void checkFramesRange();
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/scaletool/tweener.cpp tupi-0.2+git05/src/plugins/tools/scaletool/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/scaletool/tweener.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scaletool/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,631 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tweener.h"
-#include "configurator.h"
-#include "target.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "taction.h"
-#include "tosd.h"
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicsscene.h"
-#include "tupgraphicobject.h"
-#include "tupsvgitem.h"
-#include "tuppathitem.h"
-#include "tuppixmapitem.h"
-#include "tupitemtweener.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QMatrix>
-#include <QGraphicsView>
-#include <QDomDocument>
-#include <QDir>
-
-struct Tweener::Private
-{
-    QMap<QString, TAction *> actions;
-    Configurator *configurator;
-
-    TupGraphicsScene *scene;
-    QList<QGraphicsItem *> objects;
-
-    TupItemTweener *currentTween;
-    int initFrame;
-    int initLayer;
-    int initScene;
-
-    QPointF origin;
-    Target *target;
-
-    TupToolPlugin::Mode mode;
-    TupToolPlugin::EditMode editMode;
-
-    int baseZValue;
-};
-
-Tweener::Tweener() : TupToolPlugin(), k(new Private)
-{
-    setupActions();
-
-    k->configurator = 0;
-    k->initFrame = 0;
-    k->target = 0;
-}
-
-Tweener::~Tweener()
-{
-    delete k;
-}
-
-/* This method initializes the plugin */
-
-void Tweener::init(TupGraphicsScene *scene)
-{
-    k->scene = scene;
-    k->objects.clear();
-    if (k->target)
-        k->scene->removeItem(k->target);
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-
-    k->configurator->resetUI();
-
-    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Scale);
-    if (tweenList.size() > 0) {
-        k->configurator->loadTweenList(tweenList);
-        QString tweenName = tweenList.at(0);
-        setCurrentTween(tweenName);
-    }
-
-    int total = framesTotal();
-    k->configurator->initStartCombo(total, k->initFrame);
-}
-
-void Tweener::updateStartPoint(int index)
-{
-     if (k->initFrame != index && index >= 0)
-         k->initFrame = index;
-}
-
-/* This method returns the plugin name */
-
-QStringList Tweener::keys() const
-{
-    return QStringList() << tr("Scale Tween");
-}
-
-/* This method makes an action when the mouse is pressed on the workspace 
- * depending on the active mode: Selecting an object or Creating a path  
-*/
-
-void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method is executed while the mouse is pressed and on movement */
-
-void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method finishes the action started on the press method depending
- * on the active mode: Selecting an object or Creating a path
-*/
-
-void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (scene->currentFrameIndex() == k->initFrame) {
-        if (k->editMode == TupToolPlugin::Selection) {
-            if (scene->selectedItems().size() > 0) {
-                k->objects = scene->selectedItems();
-                k->configurator->notifySelection(true);
-                QGraphicsItem *item = k->objects.at(0);
-                QRectF rect = item->sceneBoundingRect();
-                k->origin = rect.center();
-            }
-        }
-    }
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-QMap<QString, TAction *> Tweener::actions() const
-{
-    return k->actions;
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-int Tweener::toolType() const
-{
-    return TupToolInterface::Tweener;
-}
-
-/* This method returns the tool panel associated to this plugin */
-
-QWidget *Tweener::configurator()
-{
-    if (!k->configurator) {
-        k->mode = TupToolPlugin::View;
-
-        k->configurator = new Configurator;
-        connect(k->configurator, SIGNAL(startingPointChanged(int)), this, SLOT(updateStartPoint(int)));
-        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
-        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
-        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
-        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode)));
-        connect(k->configurator, SIGNAL(clickedDefineProperties()), this, SLOT(setPropertiesMode()));
-        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
-        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    } 
-
-    return k->configurator;
-}
-
-/* This method is called when there's a change on/of scene */
-void Tweener::aboutToChangeScene(TupGraphicsScene *)
-{
-}
-
-/* This method is called when this plugin is off */
-
-void Tweener::aboutToChangeTool()
-{
-    if (k->editMode == TupToolPlugin::Selection) {
-        clearSelection();
-        disableSelection();
-
-        return;
-    }
-
-    if (k->editMode == TupToolPlugin::Properties)
-        k->scene->removeItem(k->target);
-}
-
-/* This method defines the actions contained in this plugin */
-
-void Tweener::setupActions()
-{
-    TAction *translater = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "scale_tween.png"), 
-                                      tr("Scale Tween"), this);
-    translater->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
-    translater->setShortcut(QKeySequence(tr("Shift+S")));
-
-    k->actions.insert(tr("Scale Tween"), translater);
-}
-
-/* This method saves the settings of this plugin */
-
-void Tweener::saveConfig()
-{
-}
-
-/* This method updates the workspace when the plugin changes the scene */
-
-void Tweener::updateScene(TupGraphicsScene *scene)
-{ 
-    k->mode = k->configurator->mode();
-
-    if (k->mode == TupToolPlugin::Edit) {
-       int framesNumber = framesTotal();
-
-       if (k->configurator->startComboSize() < framesNumber)
-           k->configurator->initStartCombo(framesNumber, k->initFrame);
-
-       int tweenLimit = k->initFrame + (k->configurator->totalSteps() - 1);
-       if (scene->currentFrameIndex() >= k->initFrame && scene->currentFrameIndex() <= tweenLimit) {
-           k->scene->addItem(k->target);
-       }
-    } else if (k->mode == TupToolPlugin::Add) {
-               int total = framesTotal();
-
-               if (k->editMode == TupToolPlugin::Properties) {
-                   if (total > k->configurator->startComboSize()) {
-                       k->configurator->activateMode(TupToolPlugin::Selection);
-                       clearSelection();
-                       setSelection();
-                   } 
-               } else if (k->editMode == TupToolPlugin::Selection) {
-                          if (scene->currentFrameIndex() != k->initFrame)
-                              clearSelection();
-                          k->initFrame = scene->currentFrameIndex();
-                          setSelection();
-               }
-
-               if (k->configurator->startComboSize() < total) {
-                   k->configurator->initStartCombo(total, k->initFrame);
-               } else {
-                   if (scene->currentFrameIndex() != k->initFrame)
-                       k->configurator->setStartFrame(scene->currentFrameIndex());
-               }
-
-    } else {
-             if (scene->currentFrameIndex() != k->initFrame)
-                 k->configurator->setStartFrame(scene->currentFrameIndex());
-    }
-}
-
-void Tweener::setCurrentTween(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    k->currentTween = scene->tween(name, TupItemTweener::Scale);
-
-    if (k->currentTween)
-        k->configurator->setCurrentTween(k->currentTween);
-}
-
-int Tweener::framesTotal()
-{
-    int total = 1;
-    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
-    if (layer)
-        total = layer->framesTotal();
-
-    return total;
-}
-
-/* This method clears selection */
-
-void Tweener::clearSelection()
-{
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 if (item->isSelected())
-                     item->setSelected(false);
-        }
-        k->objects.clear();
-        k->configurator->notifySelection(false);
-    }
-}
-
-/* This method disables object selection */
-
-void Tweener::disableSelection()
-{
-    foreach (QGraphicsView *view, k->scene->views()) {
-             view->setDragMode (QGraphicsView::NoDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-/* This method initializes the "Select object" mode */
-
-void Tweener::setSelection()
-{
-    if (k->editMode == TupToolPlugin::Properties)
-        k->scene->removeItem(k->target);
-
-    k->editMode = TupToolPlugin::Selection;
-
-    int bottomBoundary = 20000 + (k->initLayer*10000);
-    int topBoundary = bottomBoundary + 10000;
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             view->setDragMode(QGraphicsView::RubberBandDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
-                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-             }
-    }
-
-    // When Object selection is enabled, previous selection is set
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                 item->setSelected(true);
-        }
-        k->configurator->notifySelection(true);
-    }
-
-}
-
-void Tweener::setPropertiesMode()
-{
-    k->editMode = TupToolPlugin::Properties;
-    disableSelection();
-
-    addTarget();
-}
-
-/* This method resets this plugin */
-
-void Tweener::applyReset()
-{
-    if ((k->mode == TupToolPlugin::Edit || k->mode == TupToolPlugin::Add) && k->editMode == TupToolPlugin::Properties)
-        k->scene->removeItem(k->target);
-
-    disableSelection();
-    clearSelection();
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-}
-
-/* This method applies to the project, the Tween created from this plugin */
-
-void Tweener::applyTween()
-{
-    QString name = k->configurator->currentTweenName();
-
-    if (name.length() == 0) {
-        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
-        return;
-    }
-
-    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Scale)) {
-        k->initFrame = k->scene->currentFrameIndex();
-        k->initLayer = k->scene->currentLayerIndex();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 int objectIndex = k->scene->currentFrame()->indexOf(item);
-                 // QRectF rect = item->sceneBoundingRect();
-                 QPointF origin = item->mapFromParent(k->origin);
-
-                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = k->scene->currentFrame()->indexOf(svg);
-                 } else {
-                     if (qgraphicsitem_cast<TupPathItem *>(item))
-                         origin = k->origin;
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex, QPointF(), k->scene->spaceMode(), 
-                                             type, TupProjectRequest::SetTween,
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
-                 emit requested(&request);
-        }
-    } else {
-        removeTweenFromProject(name);
-        QList<QGraphicsItem *> newList;
-
-        k->initFrame = k->configurator->startFrame();
-        k->initLayer = k->currentTween->initLayer();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 TupProject *project = k->scene->scene()->project();
-                 TupScene *scene = project->scene(k->initScene);
-                 TupLayer *layer = scene->layer(k->initLayer);
-                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
-                 int objectIndex = frame->indexOf(item);
-                 QPointF origin = item->mapFromParent(k->origin);
-                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
-
-                 if (svg) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = frame->indexOf(svg);
-                 } else {
-                     if (qgraphicsitem_cast<TupPathItem *>(item))
-                         origin = k->origin;
-                 }
-
-                 if (k->initFrame != k->currentTween->initFrame()) {
-                     QDomDocument dom;
-                     if (type == TupLibraryObject::Svg)
-                         dom.appendChild(svg->toXml(dom));
-                     else
-                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
-
-                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame,
-                                                                                      0, QPointF(), k->scene->spaceMode(),   
-                                                                                      type, TupProjectRequest::Add, dom.toString());
-                     emit requested(&request);
-
-                     request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer,
-                                                                    k->currentTween->initFrame(),
-                                                                    objectIndex, QPointF(), k->scene->spaceMode(), 
-                                                                    type, TupProjectRequest::Remove);
-                     emit requested(&request);
-
-                     frame = layer->frame(k->initFrame);
-                     if (type == TupLibraryObject::Item) {
-                         objectIndex = frame->graphicItemsCount() - 1;
-                         newList.append(frame->graphic(objectIndex)->item());
-                     } else {
-                         objectIndex = frame->svgItemsCount() - 1;
-                         newList.append(frame->svg(objectIndex));
-                     }
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                             k->initScene, k->initLayer, k->initFrame,
-                                             objectIndex, QPointF(), k->scene->spaceMode(), 
-                                             type, TupProjectRequest::SetTween,
-                                             k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
-                 emit requested(&request);
-        }
-
-        if (newList.size() > 0)
-            k->objects = newList;
-    }
-
-    int total = k->initFrame + k->configurator->totalSteps();
-    int framesNumber = framesTotal();
-    int layersTotal = k->scene->scene()->layersTotal();
-    TupProjectRequest request;
-
-    if (total >= framesNumber) {
-        for (int i = framesNumber; i < total; i++) {
-             for (int j = 0; j < layersTotal; j++) {
-                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i,
-                                                                  TupProjectRequest::Add, tr("Frame %1").arg(i + 1));
-                  emit requested(&request);
-             }
-        }
-    }
-
-    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
-                                                    TupProjectRequest::Select, "1");
-    emit requested(&request);
-
-
-    setCurrentTween(name);
-    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
-}
-
-void Tweener::removeTweenFromProject(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    scene->removeTween(name, TupItemTweener::Scale);
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      QString tip = item->toolTip();
-                      if (tip.startsWith(tr("Scale Tween") + ": " + name))
-                          item->setToolTip("");
-             }
-    }
-}
-
-void Tweener::removeTween(const QString &name)
-{
-    removeTweenFromProject(name);
-    applyReset();
-}
-
-void Tweener::updateOriginPoint(const QPointF &point)
-{
-    k->origin = point;
-}
-
-void Tweener::addTarget()
-{
-    if (k->mode == TupToolPlugin::Add) {
-        k->target = new Target(k->origin, k->baseZValue, k->scene);
-        connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
-    } else {
-        if (k->objects.size() > 0) {
-            QGraphicsItem *item = k->objects.at(0);
-            k->origin = item->mapToParent(k->currentTween->transformOriginPoint());
-            k->target = new Target(k->origin, k->baseZValue, k->scene);
-            connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
-        }
-    }
-}
-
-void Tweener::updateMode(TupToolPlugin::Mode mode)
-{
-    k->mode = mode;
-
-    if (k->mode == TupToolPlugin::Edit) {
-        k->initScene = k->currentTween->initScene();
-        k->initLayer = k->currentTween->initLayer();
-        k->initFrame = k->currentTween->initFrame();
-
-        if (k->initFrame != k->scene->currentFrameIndex()) {
-            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene,
-                                                                              k->initLayer,
-                                                                              k->initFrame, TupProjectRequest::Select, "1");
-            emit requested(&request);
-        }
-
-        if (k->objects.isEmpty()) {
-            k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Rotation);
-            k->origin = k->currentTween->transformOriginPoint();
-        }
-    }
-}
-
-void Tweener::sceneResponse(const TupSceneResponse *event)
-{
-    if ((event->action() == TupProjectRequest::Remove || event->action() == TupProjectRequest::Reset)
-        && (k->scene->currentSceneIndex() == event->sceneIndex())) {
-        init(k->scene);
-    }
-
-    if (event->action() == TupProjectRequest::Select)
-        init(k->scene);
-}
-
-void Tweener::layerResponse(const TupLayerResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove)
-        init(k->scene);
-}
-
-void Tweener::frameResponse(const TupFrameResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove && k->scene->currentLayerIndex() == event->layerIndex())
-        init(k->scene);
-
-    if (event->action() == TupProjectRequest::Select) {
-        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
-            init(k->scene);
-    }
-}
-
-Q_EXPORT_PLUGIN2(tup_tweener, Tweener);
diff -Nru tupi-0.2+git04/src/plugins/tools/scaletool/tweener.h tupi-0.2+git05/src/plugins/tools/scaletool/tweener.h
--- tupi-0.2+git04/src/plugins/tools/scaletool/tweener.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scaletool/tweener.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SCALETWEENER_H
-#define SCALETWEENER_H
-
-#include "tuptoolplugin.h"
-#include "settings.h"
-#include "tupprojectresponse.h"
-
-/**
- * @author Gustav Gonzalez 
- * 
-*/
-
-class Tweener : public TupToolPlugin
-{
-    Q_OBJECT
-
-    public:
-        Tweener();
-        virtual ~Tweener();
-        virtual void init(TupGraphicsScene *scene);
-
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-        virtual QWidget *configurator();
-
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-
-        virtual void updateScene(TupGraphicsScene *scene);
-        virtual void saveConfig();
-
-        virtual void sceneResponse(const TupSceneResponse *event);
-        virtual void layerResponse(const TupLayerResponse *event);
-        virtual void frameResponse(const TupFrameResponse *event);
-
-    private:
-        void setupActions();
-        int framesTotal();
-        void clearSelection();
-        void disableSelection();
-        void addTarget();
-        void removeTweenFromProject(const QString &name);
-        // int maxZValue();
-
-    private:
-        struct Private;
-        Private *const k;
-
-    private slots:
-        void setSelection();
-        void setPropertiesMode();
-        void updateMode(TupToolPlugin::Mode mode);
-        void applyReset();
-        void applyTween();
-        void removeTween(const QString &name);
-        void updateStartPoint(int index);
-        void setCurrentTween(const QString &name);
-        void updateOriginPoint(const QPointF &point);
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/scheme/configurator.cpp tupi-0.2+git05/src/plugins/tools/scheme/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/scheme/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scheme/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,168 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+
+Configurator::Configurator(QWidget *parent) :QWidget(parent)
+{
+    #ifdef K_DEBUG
+           TINIT;
+    #endif
+
+    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+
+    QTextEdit *textArea = new QTextEdit; 
+    textArea->setFixedHeight(170);
+    textArea->setHtml("<p>" + tr("This tool is just a <b>proof-of-concept</b> of the basic algorithm for the Tupi's free-tracing vectorial brushes") + "</p>"); 
+    mainLayout->addWidget(textArea);
+
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *label = new QLabel(tr("Parameters"));
+    label->setAlignment(Qt::AlignHCenter);
+    layout->addWidget(label);
+    mainLayout->addLayout(layout);
+
+    QBoxLayout *structureLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *structureLabel = new QLabel(tr("Structure"));
+    structureLabel->setAlignment(Qt::AlignHCenter);
+    structureLayout->addWidget(structureLabel);
+
+    structureCombo = new QComboBox();
+    structureCombo->addItem(tr("Basic"));
+    structureCombo->addItem(tr("Axial"));
+    structureCombo->addItem(tr("Organic"));
+    structureCombo->setCurrentIndex(2);
+    structureLayout->addWidget(structureCombo);
+
+    mainLayout->addLayout(structureLayout);
+
+    QBoxLayout *spaceLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *spaceLabel = new QLabel(tr("Dot Spacing"));
+    spaceLabel->setAlignment(Qt::AlignHCenter);
+    spaceLayout->addWidget(spaceLabel);
+
+    spacingBox = new QSpinBox();
+    spacingBox->setSingleStep(1);
+    spacingBox->setMinimum(1);
+    spacingBox->setMaximum(10);
+    spacingBox->setValue(2);
+    spaceLayout->addWidget(spacingBox);
+
+    connect(spacingBox, SIGNAL(valueChanged(int)), this, SIGNAL(updateSpacing(int)));
+
+    mainLayout->addLayout(spaceLayout);
+
+    QBoxLayout *sizeLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *sizeLabel = new QLabel(tr("Size Tolerance"));
+    sizeLabel->setAlignment(Qt::AlignHCenter);
+    sizeLayout->addWidget(sizeLabel);
+
+    sizeBox = new QSpinBox();
+    sizeBox->setSingleStep(10);
+    sizeBox->setMinimum(0);
+    sizeBox->setMaximum(200);
+    sizeBox->setValue(0);
+    sizeLayout->addWidget(sizeBox);
+
+    connect(sizeBox, SIGNAL(valueChanged(int)), this, SIGNAL(updateSizeTolerance(int)));
+
+    mainLayout->addLayout(sizeLayout);
+
+    QBoxLayout *checkLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    checkBox = new QCheckBox(tr("Run simulation"));
+    checkLayout->addWidget(checkBox);
+
+    connect(checkBox, SIGNAL(stateChanged(int)), this, SLOT(updateInterface(int)));
+
+    mainLayout->addLayout(checkLayout);
+
+    QBoxLayout *smoothLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    QLabel *smoothLabel = new QLabel(tr("Smoothness"));
+    smoothLabel->setAlignment(Qt::AlignHCenter);
+    smoothLayout->addWidget(smoothLabel);
+    smoothBox = new QDoubleSpinBox();
+
+    smoothBox->setValue(2.0);
+    smoothBox->setDecimals(2);
+    smoothBox->setSingleStep(0.1);
+    smoothBox->setMaximum(100);
+    smoothLayout->addWidget(smoothBox);
+
+    mainLayout->addLayout(smoothLayout);
+    smoothBox->setDisabled(true);
+
+    mainLayout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    #ifdef K_DEBUG
+           TEND;
+    #endif
+}
+
+int Configurator::spacingValue()
+{
+    return spacingBox->value();
+}
+
+qreal Configurator::sizeToleranceValue()
+{
+    return sizeBox->value();
+}
+
+bool Configurator::runSimulation()
+{
+    return checkBox->isChecked();
+}
+
+void Configurator::updateInterface(int state)
+{ 
+    if (state == 2)
+        smoothBox->setDisabled(false);
+    else
+        smoothBox->setDisabled(true);
+}
+
+double Configurator::smoothness() const
+{
+    return smoothBox->value();
+}
+
+Configurator::Structure Configurator::structureType()
+{
+    int index = structureCombo->currentIndex();
+    return Structure(index);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/scheme/configurator.h tupi-0.2+git05/src/plugins/tools/scheme/configurator.h
--- tupi-0.2+git04/src/plugins/tools/scheme/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scheme/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,83 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "tglobal.h"
+
+#include <QLabel>
+#include <QComboBox>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include <QBoxLayout>
+#include <QTextEdit>
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_EXPORT Configurator : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        enum Structure { Basic = 0, Axial, Organic };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+        int spacingValue();
+        qreal sizeToleranceValue();
+        bool runSimulation();
+        double smoothness() const;
+        Configurator::Structure structureType();
+
+    signals:
+        void updateSpacing(int value);
+        void updateSizeTolerance(int value);
+
+    private slots:
+        void updateInterface(int state);
+
+    private:
+        QComboBox *structureCombo;
+        QSpinBox *spacingBox;
+        QSpinBox *sizeBox;
+        QCheckBox *checkBox;
+        QDoubleSpinBox *smoothBox;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/scheme/schemetool.cpp tupi-0.2+git05/src/plugins/tools/scheme/schemetool.cpp
--- tupi-0.2+git04/src/plugins/tools/scheme/schemetool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scheme/schemetool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,771 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "schemetool.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicalgorithm.h"
+#include "tupgraphicsscene.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupellipseitem.h"
+#include "tuplineitem.h"
+#include "tuptextitem.h"
+#include "taction.h"
+#include "talgorithm.h"
+#include "tconfig.h"
+
+struct SchemeTool::Private
+{
+    QPointF firstPoint;
+    QPointF oldPos;
+    QPointF previewPoint;
+    QPointF oldPosRight;
+    QPointF oldPosLeft;
+    QPointF connector;
+    QPainterPath path;
+    QPainterPath pathRight;
+    QPainterPath pathLeft;
+    Configurator *configurator;
+    QMap<QString, TAction *> actions;
+    TupPathItem *item;
+    TupPathItem *itemRight;
+    TupPathItem *itemLeft;
+    int dotsCounter;
+    qreal penWidth;
+    qreal oldSlope;
+    int spacing;
+    qreal tolerance;
+    qreal widthVar;
+    int arrowSize;
+    int firstArrow;
+    QCursor cursor;
+};
+
+SchemeTool::SchemeTool() : k(new Private)
+{
+    k->configurator = 0;
+    k->item = 0;
+    k->cursor = QCursor(kAppProp->themeDir() + "cursors/contour.png", 0, 15);
+
+    setupActions();
+}
+
+SchemeTool::~SchemeTool()
+{
+}
+
+void SchemeTool::init(TupGraphicsScene *scene)
+{
+    k->spacing = k->configurator->spacingValue();
+
+    TCONFIG->beginGroup("PenParameters");
+    int thickness = TCONFIG->value("Thickness", -1).toInt();
+    k->tolerance = k->configurator->sizeToleranceValue()/(qreal)100;
+
+    k->widthVar = k->tolerance*thickness;
+
+    if (k->widthVar < 1)
+        k->widthVar = 1; 
+
+    tError() << "SchemeTool::init() - thickness: " << thickness;
+    tError() << "SchemeTool::init() - k->tolerance: " << k->tolerance;
+    tError() << "SchemeTool::init() - k->widthVar: " << k->widthVar;
+
+    TupTextItem *textItem = new TupTextItem;
+    textItem->setPos(QPointF(5, 0));
+    textItem->setDefaultTextColor(QColor(0, 0, 0, 80));
+    textItem->setFont(QFont("Times", 10, QFont::Bold));
+    textItem->setPlainText("Note: Remember, this is just an experimental plugin for R&D issues");
+    scene->includeObject(textItem);
+
+    foreach (QGraphicsView * view, scene->views()) {
+             view->setDragMode(QGraphicsView::NoDrag);
+             Q_CHECK_PTR(view->scene());
+             if (QGraphicsScene *scene = qobject_cast<QGraphicsScene *>(view->scene())) {
+                 foreach (QGraphicsItem *item, scene->items()) {
+                          item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                          item->setFlag(QGraphicsItem::ItemIsMovable, false);
+                 }
+             }
+    }
+}
+
+QStringList SchemeTool::keys() const
+{
+    return QStringList() << tr("Scheme");
+}
+
+void SchemeTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    k->oldSlope = 0;
+    k->penWidth = brushManager->pen().widthF()/2;
+
+    k->dotsCounter = 1;
+    k->firstPoint = input->pos();
+    k->connector = k->firstPoint;
+
+    k->path = QPainterPath();
+    k->path.moveTo(k->firstPoint);
+
+    k->pathRight = QPainterPath();
+    k->pathRight.moveTo(k->firstPoint);
+    k->pathLeft = QPainterPath();
+    k->pathLeft.moveTo(k->firstPoint);
+
+    k->oldPos = input->pos();
+    k->oldPosRight = input->pos();
+    k->oldPosLeft = input->pos();
+    k->previewPoint = input->pos();
+
+    k->item = new TupPathItem();
+    QPen pen(Qt::lightGray, 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
+    k->item->setPen(pen);
+
+    scene->includeObject(k->item);
+
+    QPointF inception = input->pos() - QPointF(0.5, 0.5);
+    TupEllipseItem *m_ellipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
+    QPen firstPointPen(QColor(255, 106, 255), 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+    m_ellipse->setPen(firstPointPen);
+    scene->includeObject(m_ellipse);
+
+    if (k->configurator->structureType() == Configurator::Organic) {
+        k->itemRight = new TupPathItem();
+        QPen rightPen(Qt::red, 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
+        k->itemRight->setPen(rightPen);
+
+        scene->includeObject(k->itemRight);
+
+        k->itemLeft = new TupPathItem();
+        QPen leftPen(Qt::blue, 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
+        k->itemLeft->setPen(leftPen);
+
+        scene->includeObject(k->itemLeft);
+    }
+
+    k->firstArrow = rand() % 10 + 1;
+    k->arrowSize = -1;
+}
+
+void SchemeTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(brushManager);
+
+    k->dotsCounter++;
+
+    foreach (QGraphicsView * view, scene->views())
+             view->setDragMode(QGraphicsView::NoDrag);
+
+    QPointF currentPoint = input->pos();
+
+    qreal my = currentPoint.y() - k->previewPoint.y(); 
+    qreal mx = currentPoint.x() - k->previewPoint.x();
+    qreal m;
+
+    if (currentPoint != k->previewPoint) {
+        if (mx != 0)
+            m = my / mx;
+        else
+            m = 100;
+
+        k->path.moveTo(k->previewPoint);
+        k->path.lineTo(currentPoint);
+
+        k->item->setPath(k->path);
+
+        tError() << "SchemeTool::move() - Flag 1";
+
+        qreal slopeVar = abs(k->oldSlope - m);
+        qreal distance = sqrt(pow(abs(currentPoint.x() - k->oldPos.x()), 2) + pow(abs(currentPoint.y() - k->oldPos.y()), 2));
+
+        tError() << "SchemeTool::move() - k->firstArrow: " << k->firstArrow;
+        tError() << "SchemeTool::move() - k->dotsCounter: " << k->dotsCounter;
+
+        if ((k->dotsCounter > k->firstArrow) && ((k->dotsCounter % k->spacing == 0) || ((slopeVar >= 1) && (distance > 10)))) {
+
+            if (k->arrowSize == -1) {
+                tError() << "SchemeTool::move() - Flag 3";
+                qreal pow1 = pow(currentPoint.x() - k->firstPoint.x(), 2);
+                qreal pow2 = pow(currentPoint.y() - k->firstPoint.y(), 2); 
+                k->arrowSize = sqrt(pow1 + pow2);
+                tError() << "SchemeTool::move() - Flag 3A - pow1: " << pow1;
+                tError() << "SchemeTool::move() - Flag 3A - pow2: " << pow2;
+                tError() << "SchemeTool::move() - Flag 3A - k->arrowSize: " << k->arrowSize;
+                if (k->arrowSize > 0)
+                    k->arrowSize = (rand() % k->arrowSize) + 1; 
+                else
+                    k->arrowSize = 5;
+            }
+
+            tError() << "SchemeTool::move() - Arrow Size: " << k->arrowSize;
+
+            k->oldSlope = m;
+
+            qreal pm;  
+            qreal x0;
+            qreal y0;
+            qreal x1;
+            qreal y1;
+            bool isNAN = false;
+
+            if (m == 0) {
+                isNAN = true;
+                pm = 100; 
+            } else {
+                pm = (-1) * (1/m);
+            } 
+
+            #ifdef K_DEBUG
+                   if (m == 100)
+                       tError() << "SchemeTool::move() - M: NAN";
+                   else
+                       tError() << "SchemeTool::move() - M: " << m;
+
+                   if (isNAN)
+                       tError() << "SchemeTool::move() - M(inv): NAN";
+                   else
+                       tError() << "SchemeTool::move() - M(inv): " << pm;
+            #endif
+
+            qreal hypotenuse;
+
+            if (fabs(pm) < 5) { // Line's slope is close to 0
+
+                int cutter = k->penWidth;
+                bool found = false;
+                qreal limit = 0;
+                int iterations = 0;
+
+                if (k->tolerance < 1) {
+                    while (!found) {
+                       iterations++;
+                       x0 = currentPoint.x() - cutter;
+                       y0 = (pm*(x0 - currentPoint.x())) + currentPoint.y();
+
+                       x1 = currentPoint.x() + cutter;
+                       y1 = (pm*(x1 - currentPoint.x())) + currentPoint.y();
+                       hypotenuse = sqrt(pow(x1 - x0, 2) + pow(y1 - y0, 2));
+
+                       limit = hypotenuse - brushManager->pen().widthF();
+
+                       if (fabs(limit) > k->widthVar) {
+                           if (limit > 0) {
+                                   cutter -= 0.2;
+                                   if (cutter == 0)
+                                       found = true;
+                           } else {
+                                   cutter += 0.2;
+                           }
+                       } else {
+                               found = true;
+                       }
+
+                       if (iterations >10)
+                           found = true;
+                    }
+                } else {
+                       int random = rand() % 101;
+
+                       qreal plus = (qreal)random/(qreal)100 * (k->penWidth*k->tolerance);
+
+                       x0 = currentPoint.x() - plus;
+                       y0 = (pm*(x0 - currentPoint.x())) + currentPoint.y();
+
+                       x1 = currentPoint.x() + plus;
+                       y1 = (pm*(x1 - currentPoint.x())) + currentPoint.y();
+                       hypotenuse = sqrt(pow(x1 - x0, 2) + pow(y1 - y0, 2));
+                }
+
+                tError() << "SchemeTool::move() - H1: " << hypotenuse;
+                tError() << "SchemeTool::move() - Width: " << brushManager->pen().width();
+                tError() << "SchemeTool::move() - limit: " << limit;
+                tError() << "SchemeTool::move() - k->tolerance: " << k->tolerance;
+                tError() << "SchemeTool::move() - iterations: " << iterations;
+                    
+            } else { // Line's slope is 0 or very very close to
+
+                    qreal delta;
+                    qreal plus;
+                    int random = rand() % 101;
+
+                    if (k->tolerance == 0) {
+                        plus = 0; 
+                    } else if (k->tolerance < 1) {
+                               if (k->widthVar > 0)
+                                   plus = rand() % (int) k->widthVar;
+                               else
+                                   plus = rand() % 5;
+                    } else {
+                        plus = (qreal)random/(qreal)100 * (k->penWidth*k->tolerance);
+                    }
+
+                    delta = k->penWidth + plus;
+
+                    x0 = currentPoint.x();
+                    y0 = currentPoint.y() - delta;
+
+                    x1 = currentPoint.x();
+                    y1 = currentPoint.y() + delta;
+
+                    hypotenuse = fabs(y1 - y0);
+
+                    tError() << "SchemeTool::move() - Line's slope is 0!";
+                    tError() << "SchemeTool::move() - k->widthVar: " << k->widthVar;
+                    tError() << "SchemeTool::move() - k->tolerance: " << k->tolerance;
+                    tError() << "SchemeTool::move() - H2: " << hypotenuse;
+                    tError() << "SchemeTool::move() - Width: " << brushManager->pen().width();
+            }
+
+
+            if (k->configurator->structureType() != Configurator::Basic) {
+
+                QPen perPen;
+
+                int h = hypotenuse;
+                if (h == brushManager->pen().width()) {
+                    tError() << "SchemeTool::move() - VioLeT!: " << h;
+                    perPen = QPen(QColor(255, 106, 255, 100), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+                } else {
+                    tError() << "SchemeTool::move() - Black!: " << h;
+                    perPen = QPen(Qt::black, 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
+                }
+
+                TupLineItem *perpendicularLine = new TupLineItem();
+                perpendicularLine->setPen(perPen);
+                perpendicularLine->setLine(QLineF(x0, y0, x1, y1));
+                scene->includeObject(perpendicularLine);
+            }
+
+            QPointF right;
+            QPointF left;
+
+            if (k->previewPoint.x() < currentPoint.x()) {
+                if (k->previewPoint.y() < currentPoint.y()) {
+                    #ifdef K_DEBUG
+                           tDebug() << "    -> SchemeTool::move() - Going down-right";
+                           tDebug() << "";
+                    #endif
+                    if (y0 > y1) {
+                        left = QPointF(x0, y0);
+                        right = QPointF(x1, y1);
+                    } else {
+                        left = QPointF(x1, y1);
+                        right = QPointF(x0, y0);
+                    }
+
+                    qreal endX = currentPoint.x() + k->arrowSize;
+                    qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                    k->connector = QPoint(endX, endY);
+
+                } else if (k->previewPoint.y() > currentPoint.y()) {
+                           #ifdef K_DEBUG
+                                  tDebug() << "    -> SchemeTool::move() - Going up-right";
+                                  tDebug() << "";
+                           #endif
+                           if (x0 > x1) {
+                               left = QPointF(x0, y0);
+                               right = QPointF(x1, y1);
+                           } else {
+                               left = QPointF(x1, y1);
+                               right = QPointF(x0, y0);
+                           }
+
+                           qreal endX = currentPoint.x() + k->arrowSize;
+                           qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                           k->connector = QPoint(endX, endY);
+                } else {
+                     #ifdef K_DEBUG
+                            tDebug() << "    -> SchemeTool::move() - Going right";
+                            tDebug() << "";
+                     #endif
+                     if (y0 > y1) {
+                         left = QPointF(x0, y0);
+                         right = QPointF(x1, y1);
+                     } else {
+                         left = QPointF(x1, y1);
+                         right = QPointF(x0, y0);
+                     }
+
+                     qreal endX = currentPoint.x() + k->arrowSize;
+                     qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                     k->connector = QPoint(endX, endY);
+                }
+            } else if (k->previewPoint.x() > currentPoint.x()) {
+                if (k->previewPoint.y() < currentPoint.y()) {
+                     #ifdef K_DEBUG
+                            tDebug() << "    -> SchemeTool::move() - Going down-left";
+                            tDebug() << "";
+                     #endif
+
+                    if (y0 > y1) {
+                        right = QPointF(x0, y0);
+                        left = QPointF(x1, y1);
+                    } else {
+                        right = QPointF(x1, y1);
+                        left = QPointF(x0, y0);
+                    }
+
+                    qreal endX = currentPoint.x() - k->arrowSize;
+                    qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                    k->connector = QPoint(endX, endY);
+
+                } else if (k->previewPoint.y() > currentPoint.y()) {
+                           #ifdef K_DEBUG
+                                  tDebug() << "    -> SchemeTool::move() - Going up-left";
+                                  tDebug() << "";
+                           #endif
+
+                           if (x0 > x1) {
+                               left = QPointF(x0, y0);
+                               right = QPointF(x1, y1);
+                           } else {
+                               if (x0 < x1) {
+                                   left = QPointF(x1, y1);
+                                   right = QPointF(x0, y0);
+                               } else { // x0 == x1
+                                   if (y0 > y1) {
+                                       left = QPointF(x1, y1);
+                                       right = QPointF(x0, y0);
+                                   } else {
+                                       left = QPointF(x0, y0);
+                                       right = QPointF(x1, y1);
+                                   }
+                               }
+                           }
+
+                           qreal endX = currentPoint.x() - k->arrowSize;
+                           qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                           k->connector = QPoint(endX, endY);
+
+                } else {
+                     #ifdef K_DEBUG
+                            tDebug() << "    -> SchemeTool::move() - Going left";
+                            tDebug() << "";
+                     #endif
+                     if (y0 > y1) {
+                         right = QPointF(x0, y0);
+                         left = QPointF(x1, y1);
+                     } else {
+                         right = QPointF(x1, y1);
+                         left = QPointF(x0, y0);
+                     }
+
+                     qreal endX = currentPoint.x() - k->arrowSize;
+                     qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
+                     k->connector = QPoint(endX, endY);
+                }
+            } else if (k->previewPoint.x() == currentPoint.x()) {
+                       if (k->previewPoint.y() > currentPoint.y()) {
+                           #ifdef K_DEBUG
+                                  tDebug() << "    -> SchemeTool::move() - Going up";
+                                  tDebug() << "";
+                           #endif
+                           if (x0 > x1) {
+                               left = QPointF(x0, y0);
+                               right = QPointF(x1, y1);
+                           } else {
+                               left = QPointF(x1, y1);
+                               right = QPointF(x0, y0);
+                           }
+
+                           qreal endX = currentPoint.x();
+                           qreal endY = currentPoint.y() - k->arrowSize;
+                           k->connector = QPoint(endX, endY);
+                       } else {
+                           #ifdef K_DEBUG
+                                  tDebug() << "    -> SchemeTool::move() - Going down";
+                                  tDebug() << "";
+                           #endif
+                           if (x0 > x1) {
+                               right = QPointF(x0, y0);
+                               left = QPointF(x1, y1);
+                           } else {
+                               right = QPointF(x1, y1);
+                               left = QPointF(x0, y0);
+                           }
+
+                           qreal endX = currentPoint.x();
+                           qreal endY = currentPoint.y() + k->arrowSize;
+                           k->connector = QPoint(endX, endY);
+                       }
+            }
+
+            if (k->configurator->structureType() == Configurator::Organic) {
+                TupLineItem *rightAuxLine = new TupLineItem();
+                QPen redAuxPen(QColor(255, 93, 0), 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
+                rightAuxLine->setPen(redAuxPen);
+
+                TupLineItem *leftAuxLine = new TupLineItem();
+                QPen leftAuxPen(QColor(0, 195, 255), 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
+                leftAuxLine->setPen(leftAuxPen);
+
+                rightAuxLine->setLine(QLineF(k->previewPoint.x(), k->previewPoint.y(), right.x(), right.y()));
+                leftAuxLine->setLine(QLineF(k->previewPoint.x(), k->previewPoint.y(), left.x(), left.y()));
+                scene->includeObject(rightAuxLine);
+                scene->includeObject(leftAuxLine);
+            }
+
+            if (k->configurator->structureType() != Configurator::Basic) {
+                QPointF inception = left - QPointF(0.5, 0.5);
+                TupEllipseItem *blueEllipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
+                QPen bluePen(Qt::blue, 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+                blueEllipse->setPen(bluePen);
+                scene->includeObject(blueEllipse);
+
+                inception = right - QPointF(0.5, 0.5);
+                TupEllipseItem *redEllipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
+                QPen redPen(Qt::red, 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+                redEllipse->setPen(redPen);
+                scene->includeObject(redEllipse);
+            }
+
+            k->pathRight.moveTo(k->oldPosRight);
+            k->pathRight.lineTo(right);
+            k->oldPosRight = right;
+
+            k->pathLeft.moveTo(k->oldPosLeft);
+            k->pathLeft.lineTo(left);
+            k->oldPosLeft = left;
+
+            if (k->configurator->structureType() == Configurator::Organic) {
+                k->itemRight->setPath(k->pathRight);
+                k->itemLeft->setPath(k->pathLeft);
+            }
+
+            k->oldPos = currentPoint;
+        }
+
+        QPointF inception = currentPoint - QPointF(0.5, 0.5);
+        TupEllipseItem *m_ellipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
+        QPen pen(Qt::green, 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+        m_ellipse->setPen(pen);
+        scene->includeObject(m_ellipse);
+    }
+
+    k->previewPoint = currentPoint;
+}
+
+void SchemeTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(scene);
+
+    QPointF currentPoint = input->pos();
+    qreal radius = brushManager->pen().width();
+
+    if (k->firstPoint == currentPoint && k->pathRight.elementCount() == 1) {
+        k->pathRight.addEllipse(input->pos().x()-(radius/2), input->pos().y()-(radius/2), radius, radius);
+        k->pathLeft.addEllipse(input->pos().x() - (radius/2 + 1), input->pos().y() - (radius/2 + 1), radius + 2, radius + 2);
+    } else {
+        QPointF inception = k->connector - QPointF(0.5, 0.5);
+        TupEllipseItem *lastEllipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
+        QPen greenPen(QColor(255, 106, 255), 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+        lastEllipse->setPen(greenPen);
+        scene->includeObject(lastEllipse);
+    } 
+
+    k->path.moveTo(k->oldPos);
+    k->path.lineTo(k->connector);
+    k->pathRight.moveTo(k->oldPosRight);
+    k->pathRight.lineTo(k->connector);
+    k->pathLeft.moveTo(k->oldPosLeft);
+    k->pathLeft.lineTo(k->connector);
+
+    k->item->setPath(k->path);
+
+    if (k->configurator->structureType() == Configurator::Organic) {
+        k->itemRight->setPath(k->pathRight);
+        k->itemLeft->setPath(k->pathLeft);
+    }
+
+    if (k->configurator->runSimulation()) {
+
+        QPen blackPen(Qt::black, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+
+        if (k->firstPoint != currentPoint) {
+
+            tError() << "SchemeTool::release() - Flag 1";
+            tError() << "SchemeTool::release() - Connector: [" << k->connector.x() << ", " << k->connector.y() << "]";
+
+            k->pathRight.moveTo(k->connector);
+            k->pathRight.lineTo(QPoint(0, 0));
+            k->pathLeft.moveTo(k->connector);
+            k->pathLeft.lineTo(QPoint(0, 0));
+
+            smoothPath(k->pathRight, k->configurator->smoothness());
+
+            tError() << "SchemeTool::release() - Flag 2";
+
+            smoothPath(k->pathLeft, k->configurator->smoothness());
+
+            tError() << "SchemeTool::release() - Flag 3";
+
+            TupPathItem *blackRight = new TupPathItem();
+            blackRight->setPen(blackPen);
+            blackRight->setPath(k->pathRight);
+            scene->includeObject(blackRight);
+
+            tError() << "SchemeTool::release() - Flag 4";
+
+            TupPathItem *blackLeft = new TupPathItem();
+            blackLeft->setPen(blackPen);
+            blackLeft->setPath(k->pathLeft);
+            scene->includeObject(blackLeft);
+
+            tError() << "SchemeTool::release() - Flag 5";
+
+            QDomDocument doc;
+            doc.appendChild(blackRight->toXml(doc));
+            TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
+                                                                             0, QPointF(), scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
+                                                                             doc.toString());
+            emit requested(&request);
+
+            doc.clear();
+            doc.appendChild(blackLeft->toXml(doc));
+            request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
+                                                           0, QPointF(), scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
+                                                           doc.toString());
+            emit requested(&request);
+
+        } else {
+            QPointF distance((radius + 2)/2, (radius + 2)/2);
+            TupEllipseItem *blackEllipse = new TupEllipseItem(QRectF(k->connector - distance, QSize(radius + 2, radius + 2)));
+            blackEllipse->setPen(blackPen);
+            scene->includeObject(blackEllipse);
+
+            QDomDocument doc;
+            doc.appendChild(blackEllipse->toXml(doc));
+            TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
+                                                                             0, currentPoint, scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
+                                                                             doc.toString());
+            emit requested(&request);
+        }
+    }
+}
+
+void SchemeTool::setupActions()
+{
+    TAction *schemePen = new TAction(QPixmap(kAppProp->themeDir() + "icons/scheme.png"), tr("Scheme"), this);
+    schemePen->setShortcut(QKeySequence(tr("M")));
+    schemePen->setCursor(k->cursor);
+
+    k->actions.insert(tr("Scheme"), schemePen);
+}
+
+QMap<QString, TAction *> SchemeTool::actions() const
+{
+    return k->actions;
+}
+
+int SchemeTool::toolType() const
+{
+    return TupToolInterface::Brush;
+}
+
+QWidget *SchemeTool::configurator() 
+{
+    if (! k->configurator) {
+        k->configurator = new Configurator;
+        connect(k->configurator, SIGNAL(updateSpacing(int)), this, SLOT(updateSpacingVar(int)));
+        connect(k->configurator, SIGNAL(updateSizeTolerance(int)), this, SLOT(updateSizeToleranceVar(int)));
+    }
+
+    return k->configurator;
+}
+
+void SchemeTool::aboutToChangeTool() 
+{
+}
+
+void SchemeTool::saveConfig()
+{
+}
+
+void SchemeTool::updateSpacingVar(int value)
+{
+    k->spacing = value;
+}
+
+void SchemeTool::updateSizeToleranceVar(int value)
+{
+    tError() << "SchemeTool::updateSizeToleranceVar() - Value: " << value;
+    k->tolerance = (qreal)value/(qreal)100;
+}
+
+void SchemeTool::smoothPath(QPainterPath &path, double smoothness, int from, int to)
+{
+    QPolygonF pol;
+    QList<QPolygonF> polygons = path.toSubpathPolygons();
+
+    QList<QPolygonF>::iterator it = polygons.begin();
+
+    QPolygonF::iterator pointIt;
+
+    while (it != polygons.end()) {
+           pointIt = (*it).begin();
+
+           while (pointIt <= (*it).end()-2) {
+                  pol << (*pointIt);
+                  pointIt += 2;
+           }
+           ++it;
+    }
+
+    if (smoothness > 0) {
+        path = TupGraphicalAlgorithm::bezierFit(pol, smoothness, from, to);
+    } else {
+        path = QPainterPath();
+        path.addPolygon(pol);
+    }
+}
+
+void SchemeTool::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
+        emit closeHugeCanvas();
+    // } else if (event->modifiers() != Qt::ShiftModifier && event->modifiers() != Qt::ControlModifier) {
+    } else {
+        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+        if (flags.first != -1 && flags.second != -1)
+            emit callForPlugin(flags.first, flags.second);
+    }
+}
+
+QCursor SchemeTool::cursor() const
+{
+    return k->cursor;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/scheme/schemetool.h tupi-0.2+git05/src/plugins/tools/scheme/schemetool.h
--- tupi-0.2+git04/src/plugins/tools/scheme/schemetool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scheme/schemetool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,126 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SCHEMETOOL_H
+#define SCHEMETOOL_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "configurator.h"
+#include "tuppathitem.h"
+
+#include <QObject>
+#include <QSpinBox>
+#include <QTimer>
+#include <QPointF>
+#include <QKeySequence>
+#include <QGraphicsPathItem>
+#include <QPainterPath>
+#include <QMatrix>
+#include <QGraphicsLineItem>
+#include <QGraphicsView>
+#include <QBrush>
+#include <cmath>
+
+/**
+ * @author David Cuadrado
+*/
+
+class TUPI_EXPORT SchemeTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "schemetool.json")
+
+    public:
+        SchemeTool();
+        virtual ~SchemeTool();
+        
+        virtual void init(TupGraphicsScene *scene);
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+        virtual void aboutToChangeTool();
+        virtual void saveConfig();
+        virtual void keyPressEvent(QKeyEvent *event);
+        virtual QCursor cursor() const;
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+        
+    private:
+        void setupActions();
+        void smoothPath(QPainterPath &path, double smoothness, int from = 0, int to = -1);
+
+    private slots:
+        void updateSpacingVar(int value);
+        void updateSizeToleranceVar(int value);
+
+    private:
+        struct Private;
+        Private *const k;
+
+    /*        
+    private:
+        QPointF m_firstPoint;
+        QPointF m_oldPos;
+        QPointF previewPoint;
+        QPointF oldPosRight;
+        QPointF oldPosLeft;
+        QPointF connector;
+        QPainterPath m_path;
+        QPainterPath pathRight; 
+        QPainterPath pathLeft;
+        Configurator *m_configurator;
+        QMap<QString, TAction *> m_actions;
+        TupPathItem *m_item;
+        TupPathItem *itemRight;
+        TupPathItem *itemLeft;
+        int dotsCounter;
+        qreal penWidth;
+        qreal oldSlope;
+        int spacing;
+        qreal tolerance;
+        qreal widthVar; 
+        int arrowSize;
+        int firstArrow;
+    */
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/scheme/schemetool.json tupi-0.2+git05/src/plugins/tools/scheme/schemetool.json
--- tupi-0.2+git04/src/plugins/tools/scheme/schemetool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scheme/schemetool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "SchemeTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/scheme/schemetool.pro tupi-0.2+git05/src/plugins/tools/scheme/schemetool.pro
--- tupi-0.2+git04/src/plugins/tools/scheme/schemetool.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/scheme/schemetool.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,35 @@
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += schemetool.h \
+           configurator.h
+SOURCES += schemetool.cpp \
+           configurator.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib 
+TARGET = tupischemetool
+
+INCLUDEPATH += ../../../libbase
+INCLUDEPATH += ../../../store
+INCLUDEPATH += ../../../libtupi
+INCLUDEPATH += = ../common
+LIBS += -L../../../libbase
+LIBS += -L../../../store
+LIBS += -L../../../libtupi
+LIBS += -L../common
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+include(../tools_config.pri)
+
+unix {
+    !include(../../../../tupiglobal.pri) {
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+~
diff -Nru tupi-0.2+git04/src/plugins/tools/schemetool/configurator.cpp tupi-0.2+git05/src/plugins/tools/schemetool/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/schemetool/configurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/schemetool/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "configurator.h"
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QBoxLayout>
-#include <QTextEdit>
-
-Configurator::Configurator(QWidget *parent) :QWidget(parent)
-{
-    #ifdef K_DEBUG
-           TINIT;
-    #endif
-
-    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-
-    QTextEdit *textArea = new QTextEdit; 
-    textArea->setFixedHeight(170);
-    textArea->setHtml("<p>" + tr("This tool is just a <b>proof-of-concept</b> of the basic algorithm for the Tupi's free-tracing vectorial brushes") + "</p>"); 
-    mainLayout->addWidget(textArea);
-
-    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *label = new QLabel(tr("Parameters"));
-    label->setAlignment(Qt::AlignHCenter);
-    layout->addWidget(label);
-    mainLayout->addLayout(layout);
-
-    QBoxLayout *structureLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *structureLabel = new QLabel(tr("Structure"));
-    structureLabel->setAlignment(Qt::AlignHCenter);
-    structureLayout->addWidget(structureLabel);
-
-    structureCombo = new QComboBox();
-    structureCombo->addItem(tr("Basic"));
-    structureCombo->addItem(tr("Axial"));
-    structureCombo->addItem(tr("Organic"));
-    structureCombo->setCurrentIndex(2);
-    structureLayout->addWidget(structureCombo);
-
-    mainLayout->addLayout(structureLayout);
-
-    QBoxLayout *spaceLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *spaceLabel = new QLabel(tr("Dot Spacing"));
-    spaceLabel->setAlignment(Qt::AlignHCenter);
-    spaceLayout->addWidget(spaceLabel);
-
-    spacingBox = new QSpinBox();
-    spacingBox->setSingleStep(1);
-    spacingBox->setMinimum(1);
-    spacingBox->setMaximum(10);
-    spacingBox->setValue(2);
-    spaceLayout->addWidget(spacingBox);
-
-    connect(spacingBox, SIGNAL(valueChanged(int)), this, SIGNAL(updateSpacing(int)));
-
-    mainLayout->addLayout(spaceLayout);
-
-    QBoxLayout *sizeLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *sizeLabel = new QLabel(tr("Size Tolerance"));
-    sizeLabel->setAlignment(Qt::AlignHCenter);
-    sizeLayout->addWidget(sizeLabel);
-
-    sizeBox = new QSpinBox();
-    sizeBox->setSingleStep(10);
-    sizeBox->setMinimum(0);
-    sizeBox->setMaximum(200);
-    sizeBox->setValue(0);
-    sizeLayout->addWidget(sizeBox);
-
-    connect(sizeBox, SIGNAL(valueChanged(int)), this, SIGNAL(updateSizeTolerance(int)));
-
-    mainLayout->addLayout(sizeLayout);
-
-    QBoxLayout *checkLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    checkBox = new QCheckBox(tr("Run simulation"));
-    checkLayout->addWidget(checkBox);
-
-    connect(checkBox, SIGNAL(stateChanged(int)), this, SLOT(updateInterface(int)));
-
-    mainLayout->addLayout(checkLayout);
-
-    QBoxLayout *smoothLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    QLabel *smoothLabel = new QLabel(tr("Smoothness"));
-    smoothLabel->setAlignment(Qt::AlignHCenter);
-    smoothLayout->addWidget(smoothLabel);
-    smoothBox = new QDoubleSpinBox();
-
-    smoothBox->setValue(2.0);
-    smoothBox->setDecimals(2);
-    smoothBox->setSingleStep(0.1);
-    smoothBox->setMaximum(100);
-    smoothLayout->addWidget(smoothBox);
-
-    mainLayout->addLayout(smoothLayout);
-    smoothBox->setDisabled(true);
-
-    mainLayout->addStretch(2);
-}
-
-Configurator::~Configurator()
-{
-    #ifdef K_DEBUG
-           TEND;
-    #endif
-}
-
-int Configurator::spacingValue()
-{
-    return spacingBox->value();
-}
-
-qreal Configurator::sizeToleranceValue()
-{
-    return sizeBox->value();
-}
-
-bool Configurator::runSimulation()
-{
-    return checkBox->isChecked();
-}
-
-void Configurator::updateInterface(int state)
-{ 
-    if (state == 2)
-        smoothBox->setDisabled(false);
-    else
-        smoothBox->setDisabled(true);
-}
-
-double Configurator::smoothness() const
-{
-    return smoothBox->value();
-}
-
-Configurator::Structure Configurator::structureType()
-{
-    int index = structureCombo->currentIndex();
-    return Structure(index);
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/schemetool/configurator.h tupi-0.2+git05/src/plugins/tools/schemetool/configurator.h
--- tupi-0.2+git04/src/plugins/tools/schemetool/configurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/schemetool/configurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONFIGURATOR_H
-#define CONFIGURATOR_H
-
-#include <QLabel>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QDoubleSpinBox>
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Configurator : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        enum Structure { Basic = 0, Axial, Organic };
-
-        Configurator(QWidget *parent = 0);
-        ~Configurator();
-        int spacingValue();
-        qreal sizeToleranceValue();
-        bool runSimulation();
-        double smoothness() const;
-        Configurator::Structure structureType();
-
-    signals:
-        void updateSpacing(int value);
-        void updateSizeTolerance(int value);
-
-    private slots:
-        void updateInterface(int state);
-
-    private:
-        QComboBox *structureCombo;
-        QSpinBox *spacingBox;
-        QSpinBox *sizeBox;
-        QCheckBox *checkBox;
-        QDoubleSpinBox *smoothBox;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/schemetool/schemetool.cpp tupi-0.2+git05/src/plugins/tools/schemetool/schemetool.cpp
--- tupi-0.2+git04/src/plugins/tools/schemetool/schemetool.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/schemetool/schemetool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,788 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez                                                     *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "schemetool.h"
-// #include "ink.xpm"
-
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicalgorithm.h"
-#include "tupgraphicsscene.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupellipseitem.h"
-#include "tuplineitem.h"
-#include "tuptextitem.h"
-
-#include "taction.h"
-#include "talgorithm.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "tconfig.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QGraphicsPathItem>
-#include <QPainterPath>
-#include <QMatrix>
-#include <QGraphicsLineItem>
-#include <QGraphicsView>
-#include <QBrush>
-#include <cmath>
-
-struct SchemeTool::Private
-{
-    QPointF firstPoint;
-    QPointF oldPos;
-    QPointF previewPoint;
-    QPointF oldPosRight;
-    QPointF oldPosLeft;
-    QPointF connector;
-    QPainterPath path;
-    QPainterPath pathRight;
-    QPainterPath pathLeft;
-    Configurator *configurator;
-    QMap<QString, TAction *> actions;
-    TupPathItem *item;
-    TupPathItem *itemRight;
-    TupPathItem *itemLeft;
-    int dotsCounter;
-    qreal penWidth;
-    qreal oldSlope;
-    int spacing;
-    qreal tolerance;
-    qreal widthVar;
-    int arrowSize;
-    int firstArrow;
-    QCursor cursor;
-};
-
-SchemeTool::SchemeTool() : k(new Private)
-{
-    k->configurator = 0;
-    k->item = 0;
-    k->cursor = QCursor(kAppProp->themeDir() + "cursors/contour.png", 0, 15);
-
-    setupActions();
-}
-
-SchemeTool::~SchemeTool()
-{
-}
-
-void SchemeTool::init(TupGraphicsScene *scene)
-{
-    k->spacing = k->configurator->spacingValue();
-
-    TCONFIG->beginGroup("PenParameters");
-    int thickness = TCONFIG->value("Thickness", -1).toInt();
-    k->tolerance = k->configurator->sizeToleranceValue()/(qreal)100;
-
-    k->widthVar = k->tolerance*thickness;
-
-    if (k->widthVar < 1)
-        k->widthVar = 1; 
-
-    tError() << "SchemeTool::init() - thickness: " << thickness;
-    tError() << "SchemeTool::init() - k->tolerance: " << k->tolerance;
-    tError() << "SchemeTool::init() - k->widthVar: " << k->widthVar;
-
-    TupTextItem *textItem = new TupTextItem;
-    textItem->setPos(QPointF(5, 0));
-    textItem->setDefaultTextColor(QColor(0, 0, 0, 80));
-    textItem->setFont(QFont("Times", 10, QFont::Bold));
-    textItem->setPlainText("Note: Remember, this is just an experimental plugin for R&D issues");
-    scene->includeObject(textItem);
-
-    foreach (QGraphicsView * view, scene->views()) {
-             view->setDragMode(QGraphicsView::NoDrag);
-             Q_CHECK_PTR(view->scene());
-             if (QGraphicsScene *scene = qobject_cast<QGraphicsScene *>(view->scene())) {
-                 foreach (QGraphicsItem *item, scene->items()) {
-                          item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                          item->setFlag(QGraphicsItem::ItemIsMovable, false);
-                 }
-             }
-    }
-}
-
-QStringList SchemeTool::keys() const
-{
-    return QStringList() << tr("Scheme");
-}
-
-void SchemeTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    k->oldSlope = 0;
-    k->penWidth = brushManager->pen().widthF()/2;
-
-    k->dotsCounter = 1;
-    k->firstPoint = input->pos();
-    k->connector = k->firstPoint;
-
-    k->path = QPainterPath();
-    k->path.moveTo(k->firstPoint);
-
-    k->pathRight = QPainterPath();
-    k->pathRight.moveTo(k->firstPoint);
-    k->pathLeft = QPainterPath();
-    k->pathLeft.moveTo(k->firstPoint);
-
-    k->oldPos = input->pos();
-    k->oldPosRight = input->pos();
-    k->oldPosLeft = input->pos();
-    k->previewPoint = input->pos();
-
-    k->item = new TupPathItem();
-    QPen pen(Qt::lightGray, 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
-    k->item->setPen(pen);
-
-    scene->includeObject(k->item);
-
-    QPointF inception = input->pos() - QPointF(0.5, 0.5);
-    TupEllipseItem *m_ellipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
-    QPen firstPointPen(QColor(255, 106, 255), 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-    m_ellipse->setPen(firstPointPen);
-    scene->includeObject(m_ellipse);
-
-    if (k->configurator->structureType() == Configurator::Organic) {
-        k->itemRight = new TupPathItem();
-        QPen rightPen(Qt::red, 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
-        k->itemRight->setPen(rightPen);
-
-        scene->includeObject(k->itemRight);
-
-        k->itemLeft = new TupPathItem();
-        QPen leftPen(Qt::blue, 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
-        k->itemLeft->setPen(leftPen);
-
-        scene->includeObject(k->itemLeft);
-    }
-
-    k->firstArrow = rand() % 10 + 1;
-    k->arrowSize = -1;
-}
-
-void SchemeTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(brushManager);
-
-    k->dotsCounter++;
-
-    foreach (QGraphicsView * view, scene->views())
-             view->setDragMode(QGraphicsView::NoDrag);
-
-    QPointF currentPoint = input->pos();
-
-    qreal my = currentPoint.y() - k->previewPoint.y(); 
-    qreal mx = currentPoint.x() - k->previewPoint.x();
-    qreal m;
-
-    if (currentPoint != k->previewPoint) {
-        if (mx != 0)
-            m = my / mx;
-        else
-            m = 100;
-
-        k->path.moveTo(k->previewPoint);
-        k->path.lineTo(currentPoint);
-
-        k->item->setPath(k->path);
-
-        tError() << "SchemeTool::move() - Flag 1";
-
-        qreal slopeVar = abs(k->oldSlope - m);
-        qreal distance = sqrt(pow(abs(currentPoint.x() - k->oldPos.x()), 2) + pow(abs(currentPoint.y() - k->oldPos.y()), 2));
-
-        tError() << "SchemeTool::move() - k->firstArrow: " << k->firstArrow;
-        tError() << "SchemeTool::move() - k->dotsCounter: " << k->dotsCounter;
-
-        if ((k->dotsCounter > k->firstArrow) && ((k->dotsCounter % k->spacing == 0) || ((slopeVar >= 1) && (distance > 10)))) {
-
-            if (k->arrowSize == -1) {
-                tError() << "SchemeTool::move() - Flag 3";
-                qreal pow1 = pow(currentPoint.x() - k->firstPoint.x(), 2);
-                qreal pow2 = pow(currentPoint.y() - k->firstPoint.y(), 2); 
-                k->arrowSize = sqrt(pow1 + pow2);
-                tError() << "SchemeTool::move() - Flag 3A - pow1: " << pow1;
-                tError() << "SchemeTool::move() - Flag 3A - pow2: " << pow2;
-                tError() << "SchemeTool::move() - Flag 3A - k->arrowSize: " << k->arrowSize;
-                if (k->arrowSize > 0)
-                    k->arrowSize = (rand() % k->arrowSize) + 1; 
-                else
-                    k->arrowSize = 5;
-            }
-
-            tError() << "SchemeTool::move() - Arrow Size: " << k->arrowSize;
-
-            k->oldSlope = m;
-
-            qreal pm;  
-            qreal x0;
-            qreal y0;
-            qreal x1;
-            qreal y1;
-            bool isNAN = false;
-
-            if (m == 0) {
-                isNAN = true;
-                pm = 100; 
-            } else {
-                pm = (-1) * (1/m);
-            } 
-
-            #ifdef K_DEBUG
-                   if (m == 100)
-                       tError() << "SchemeTool::move() - M: NAN";
-                   else
-                       tError() << "SchemeTool::move() - M: " << m;
-
-                   if (isNAN)
-                       tError() << "SchemeTool::move() - M(inv): NAN";
-                   else
-                       tError() << "SchemeTool::move() - M(inv): " << pm;
-            #endif
-
-            qreal hypotenuse;
-
-            if (fabs(pm) < 5) { // Line's slope is close to 0
-
-                int cutter = k->penWidth;
-                bool found = false;
-                qreal limit = 0;
-                int iterations = 0;
-
-                if (k->tolerance < 1) {
-                    while (!found) {
-                       iterations++;
-                       x0 = currentPoint.x() - cutter;
-                       y0 = (pm*(x0 - currentPoint.x())) + currentPoint.y();
-
-                       x1 = currentPoint.x() + cutter;
-                       y1 = (pm*(x1 - currentPoint.x())) + currentPoint.y();
-                       hypotenuse = sqrt(pow(x1 - x0, 2) + pow(y1 - y0, 2));
-
-                       limit = hypotenuse - brushManager->pen().widthF();
-
-                       if (fabs(limit) > k->widthVar) {
-                           if (limit > 0) {
-                                   cutter -= 0.2;
-                                   if (cutter == 0)
-                                       found = true;
-                           } else {
-                                   cutter += 0.2;
-                           }
-                       } else {
-                               found = true;
-                       }
-
-                       if (iterations >10)
-                           found = true;
-                    }
-                } else {
-                       int random = rand() % 101;
-
-                       qreal plus = (qreal)random/(qreal)100 * (k->penWidth*k->tolerance);
-
-                       x0 = currentPoint.x() - plus;
-                       y0 = (pm*(x0 - currentPoint.x())) + currentPoint.y();
-
-                       x1 = currentPoint.x() + plus;
-                       y1 = (pm*(x1 - currentPoint.x())) + currentPoint.y();
-                       hypotenuse = sqrt(pow(x1 - x0, 2) + pow(y1 - y0, 2));
-                }
-
-                tError() << "SchemeTool::move() - H1: " << hypotenuse;
-                tError() << "SchemeTool::move() - Width: " << brushManager->pen().width();
-                tError() << "SchemeTool::move() - limit: " << limit;
-                tError() << "SchemeTool::move() - k->tolerance: " << k->tolerance;
-                tError() << "SchemeTool::move() - iterations: " << iterations;
-                    
-            } else { // Line's slope is 0 or very very close to
-
-                    qreal delta;
-                    qreal plus;
-                    int random = rand() % 101;
-
-                    if (k->tolerance == 0) {
-                        plus = 0; 
-                    } else if (k->tolerance < 1) {
-                               if (k->widthVar > 0)
-                                   plus = rand() % (int) k->widthVar;
-                               else
-                                   plus = rand() % 5;
-                    } else {
-                        plus = (qreal)random/(qreal)100 * (k->penWidth*k->tolerance);
-                    }
-
-                    delta = k->penWidth + plus;
-
-                    x0 = currentPoint.x();
-                    y0 = currentPoint.y() - delta;
-
-                    x1 = currentPoint.x();
-                    y1 = currentPoint.y() + delta;
-
-                    hypotenuse = fabs(y1 - y0);
-
-                    tError() << "SchemeTool::move() - Line's slope is 0!";
-                    tError() << "SchemeTool::move() - k->widthVar: " << k->widthVar;
-                    tError() << "SchemeTool::move() - k->tolerance: " << k->tolerance;
-                    tError() << "SchemeTool::move() - H2: " << hypotenuse;
-                    tError() << "SchemeTool::move() - Width: " << brushManager->pen().width();
-            }
-
-
-            if (k->configurator->structureType() != Configurator::Basic) {
-
-                QPen perPen;
-
-                int h = hypotenuse;
-                if (h == brushManager->pen().width()) {
-                    tError() << "SchemeTool::move() - VioLeT!: " << h;
-                    perPen = QPen(QColor(255, 106, 255, 100), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-                } else {
-                    tError() << "SchemeTool::move() - Black!: " << h;
-                    perPen = QPen(Qt::black, 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
-                }
-
-                TupLineItem *perpendicularLine = new TupLineItem();
-                perpendicularLine->setPen(perPen);
-                perpendicularLine->setLine(QLineF(x0, y0, x1, y1));
-                scene->includeObject(perpendicularLine);
-            }
-
-            QPointF right;
-            QPointF left;
-
-            if (k->previewPoint.x() < currentPoint.x()) {
-                if (k->previewPoint.y() < currentPoint.y()) {
-                    #ifdef K_DEBUG
-                           tDebug() << "    -> SchemeTool::move() - Going down-right";
-                           tDebug() << "";
-                    #endif
-                    if (y0 > y1) {
-                        left = QPointF(x0, y0);
-                        right = QPointF(x1, y1);
-                    } else {
-                        left = QPointF(x1, y1);
-                        right = QPointF(x0, y0);
-                    }
-
-                    qreal endX = currentPoint.x() + k->arrowSize;
-                    qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                    k->connector = QPoint(endX, endY);
-
-                } else if (k->previewPoint.y() > currentPoint.y()) {
-                           #ifdef K_DEBUG
-                                  tDebug() << "    -> SchemeTool::move() - Going up-right";
-                                  tDebug() << "";
-                           #endif
-                           if (x0 > x1) {
-                               left = QPointF(x0, y0);
-                               right = QPointF(x1, y1);
-                           } else {
-                               left = QPointF(x1, y1);
-                               right = QPointF(x0, y0);
-                           }
-
-                           qreal endX = currentPoint.x() + k->arrowSize;
-                           qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                           k->connector = QPoint(endX, endY);
-                } else {
-                     #ifdef K_DEBUG
-                            tDebug() << "    -> SchemeTool::move() - Going right";
-                            tDebug() << "";
-                     #endif
-                     if (y0 > y1) {
-                         left = QPointF(x0, y0);
-                         right = QPointF(x1, y1);
-                     } else {
-                         left = QPointF(x1, y1);
-                         right = QPointF(x0, y0);
-                     }
-
-                     qreal endX = currentPoint.x() + k->arrowSize;
-                     qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                     k->connector = QPoint(endX, endY);
-                }
-            } else if (k->previewPoint.x() > currentPoint.x()) {
-                if (k->previewPoint.y() < currentPoint.y()) {
-                     #ifdef K_DEBUG
-                            tDebug() << "    -> SchemeTool::move() - Going down-left";
-                            tDebug() << "";
-                     #endif
-
-                    if (y0 > y1) {
-                        right = QPointF(x0, y0);
-                        left = QPointF(x1, y1);
-                    } else {
-                        right = QPointF(x1, y1);
-                        left = QPointF(x0, y0);
-                    }
-
-                    qreal endX = currentPoint.x() - k->arrowSize;
-                    qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                    k->connector = QPoint(endX, endY);
-
-                } else if (k->previewPoint.y() > currentPoint.y()) {
-                           #ifdef K_DEBUG
-                                  tDebug() << "    -> SchemeTool::move() - Going up-left";
-                                  tDebug() << "";
-                           #endif
-
-                           if (x0 > x1) {
-                               left = QPointF(x0, y0);
-                               right = QPointF(x1, y1);
-                           } else {
-                               if (x0 < x1) {
-                                   left = QPointF(x1, y1);
-                                   right = QPointF(x0, y0);
-                               } else { // x0 == x1
-                                   if (y0 > y1) {
-                                       left = QPointF(x1, y1);
-                                       right = QPointF(x0, y0);
-                                   } else {
-                                       left = QPointF(x0, y0);
-                                       right = QPointF(x1, y1);
-                                   }
-                               }
-                           }
-
-                           qreal endX = currentPoint.x() - k->arrowSize;
-                           qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                           k->connector = QPoint(endX, endY);
-
-                } else {
-                     #ifdef K_DEBUG
-                            tDebug() << "    -> SchemeTool::move() - Going left";
-                            tDebug() << "";
-                     #endif
-                     if (y0 > y1) {
-                         right = QPointF(x0, y0);
-                         left = QPointF(x1, y1);
-                     } else {
-                         right = QPointF(x1, y1);
-                         left = QPointF(x0, y0);
-                     }
-
-                     qreal endX = currentPoint.x() - k->arrowSize;
-                     qreal endY = (m*(endX - currentPoint.x())) + currentPoint.y();
-                     k->connector = QPoint(endX, endY);
-                }
-            } else if (k->previewPoint.x() == currentPoint.x()) {
-                       if (k->previewPoint.y() > currentPoint.y()) {
-                           #ifdef K_DEBUG
-                                  tDebug() << "    -> SchemeTool::move() - Going up";
-                                  tDebug() << "";
-                           #endif
-                           if (x0 > x1) {
-                               left = QPointF(x0, y0);
-                               right = QPointF(x1, y1);
-                           } else {
-                               left = QPointF(x1, y1);
-                               right = QPointF(x0, y0);
-                           }
-
-                           qreal endX = currentPoint.x();
-                           qreal endY = currentPoint.y() - k->arrowSize;
-                           k->connector = QPoint(endX, endY);
-                       } else {
-                           #ifdef K_DEBUG
-                                  tDebug() << "    -> SchemeTool::move() - Going down";
-                                  tDebug() << "";
-                           #endif
-                           if (x0 > x1) {
-                               right = QPointF(x0, y0);
-                               left = QPointF(x1, y1);
-                           } else {
-                               right = QPointF(x1, y1);
-                               left = QPointF(x0, y0);
-                           }
-
-                           qreal endX = currentPoint.x();
-                           qreal endY = currentPoint.y() + k->arrowSize;
-                           k->connector = QPoint(endX, endY);
-                       }
-            }
-
-            if (k->configurator->structureType() == Configurator::Organic) {
-                TupLineItem *rightAuxLine = new TupLineItem();
-                QPen redAuxPen(QColor(255, 93, 0), 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
-                rightAuxLine->setPen(redAuxPen);
-
-                TupLineItem *leftAuxLine = new TupLineItem();
-                QPen leftAuxPen(QColor(0, 195, 255), 0.5, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin);
-                leftAuxLine->setPen(leftAuxPen);
-
-                rightAuxLine->setLine(QLineF(k->previewPoint.x(), k->previewPoint.y(), right.x(), right.y()));
-                leftAuxLine->setLine(QLineF(k->previewPoint.x(), k->previewPoint.y(), left.x(), left.y()));
-                scene->includeObject(rightAuxLine);
-                scene->includeObject(leftAuxLine);
-            }
-
-            if (k->configurator->structureType() != Configurator::Basic) {
-                QPointF inception = left - QPointF(0.5, 0.5);
-                TupEllipseItem *blueEllipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
-                QPen bluePen(Qt::blue, 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-                blueEllipse->setPen(bluePen);
-                scene->includeObject(blueEllipse);
-
-                inception = right - QPointF(0.5, 0.5);
-                TupEllipseItem *redEllipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
-                QPen redPen(Qt::red, 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-                redEllipse->setPen(redPen);
-                scene->includeObject(redEllipse);
-            }
-
-            k->pathRight.moveTo(k->oldPosRight);
-            k->pathRight.lineTo(right);
-            k->oldPosRight = right;
-
-            k->pathLeft.moveTo(k->oldPosLeft);
-            k->pathLeft.lineTo(left);
-            k->oldPosLeft = left;
-
-            if (k->configurator->structureType() == Configurator::Organic) {
-                k->itemRight->setPath(k->pathRight);
-                k->itemLeft->setPath(k->pathLeft);
-            }
-
-            k->oldPos = currentPoint;
-        }
-
-        QPointF inception = currentPoint - QPointF(0.5, 0.5);
-        TupEllipseItem *m_ellipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
-        QPen pen(Qt::green, 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-        m_ellipse->setPen(pen);
-        scene->includeObject(m_ellipse);
-    }
-
-    k->previewPoint = currentPoint;
-}
-
-void SchemeTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(scene);
-
-    QPointF currentPoint = input->pos();
-    qreal radius = brushManager->pen().width();
-
-    if (k->firstPoint == currentPoint && k->pathRight.elementCount() == 1) {
-        k->pathRight.addEllipse(input->pos().x()-(radius/2), input->pos().y()-(radius/2), radius, radius);
-        k->pathLeft.addEllipse(input->pos().x() - (radius/2 + 1), input->pos().y() - (radius/2 + 1), radius + 2, radius + 2);
-    } else {
-        QPointF inception = k->connector - QPointF(0.5, 0.5);
-        TupEllipseItem *lastEllipse = new TupEllipseItem(QRectF(inception, QSize(1, 1)));
-        QPen greenPen(QColor(255, 106, 255), 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-        lastEllipse->setPen(greenPen);
-        scene->includeObject(lastEllipse);
-    } 
-
-    k->path.moveTo(k->oldPos);
-    k->path.lineTo(k->connector);
-    k->pathRight.moveTo(k->oldPosRight);
-    k->pathRight.lineTo(k->connector);
-    k->pathLeft.moveTo(k->oldPosLeft);
-    k->pathLeft.lineTo(k->connector);
-
-    k->item->setPath(k->path);
-
-    if (k->configurator->structureType() == Configurator::Organic) {
-        k->itemRight->setPath(k->pathRight);
-        k->itemLeft->setPath(k->pathLeft);
-    }
-
-    if (k->configurator->runSimulation()) {
-
-        QPen blackPen(Qt::black, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-
-        if (k->firstPoint != currentPoint) {
-
-            tError() << "SchemeTool::release() - Flag 1";
-            tError() << "SchemeTool::release() - Connector: [" << k->connector.x() << ", " << k->connector.y() << "]";
-
-            k->pathRight.moveTo(k->connector);
-            k->pathRight.lineTo(QPoint(0, 0));
-            k->pathLeft.moveTo(k->connector);
-            k->pathLeft.lineTo(QPoint(0, 0));
-
-            smoothPath(k->pathRight, k->configurator->smoothness());
-
-            tError() << "SchemeTool::release() - Flag 2";
-
-            smoothPath(k->pathLeft, k->configurator->smoothness());
-
-            tError() << "SchemeTool::release() - Flag 3";
-
-            TupPathItem *blackRight = new TupPathItem();
-            blackRight->setPen(blackPen);
-            blackRight->setPath(k->pathRight);
-            scene->includeObject(blackRight);
-
-            tError() << "SchemeTool::release() - Flag 4";
-
-            TupPathItem *blackLeft = new TupPathItem();
-            blackLeft->setPen(blackPen);
-            blackLeft->setPath(k->pathLeft);
-            scene->includeObject(blackLeft);
-
-            tError() << "SchemeTool::release() - Flag 5";
-
-            QDomDocument doc;
-            doc.appendChild(blackRight->toXml(doc));
-            TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
-                                                                             0, QPointF(), scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
-                                                                             doc.toString());
-            emit requested(&request);
-
-            doc.clear();
-            doc.appendChild(blackLeft->toXml(doc));
-            request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
-                                                           0, QPointF(), scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
-                                                           doc.toString());
-            emit requested(&request);
-
-        } else {
-            QPointF distance((radius + 2)/2, (radius + 2)/2);
-            TupEllipseItem *blackEllipse = new TupEllipseItem(QRectF(k->connector - distance, QSize(radius + 2, radius + 2)));
-            blackEllipse->setPen(blackPen);
-            scene->includeObject(blackEllipse);
-
-            QDomDocument doc;
-            doc.appendChild(blackEllipse->toXml(doc));
-            TupProjectRequest request = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), scene->currentFrameIndex(),
-                                                                             0, currentPoint, scene->spaceMode(), TupLibraryObject::Item, TupProjectRequest::Add, 
-                                                                             doc.toString());
-            emit requested(&request);
-        }
-    }
-}
-
-void SchemeTool::setupActions()
-{
-    TAction *schemePen = new TAction(QPixmap(kAppProp->themeDir() + "icons/scheme.png"), tr("Scheme"), this);
-    schemePen->setShortcut(QKeySequence(tr("M")));
-    schemePen->setCursor(k->cursor);
-
-    k->actions.insert(tr("Scheme"), schemePen);
-}
-
-QMap<QString, TAction *> SchemeTool::actions() const
-{
-    return k->actions;
-}
-
-int SchemeTool::toolType() const
-{
-    return TupToolInterface::Brush;
-}
-
-QWidget *SchemeTool::configurator() 
-{
-    if (! k->configurator) {
-        k->configurator = new Configurator;
-        connect(k->configurator, SIGNAL(updateSpacing(int)), this, SLOT(updateSpacingVar(int)));
-        connect(k->configurator, SIGNAL(updateSizeTolerance(int)), this, SLOT(updateSizeToleranceVar(int)));
-    }
-
-    return k->configurator;
-}
-
-void SchemeTool::aboutToChangeTool() 
-{
-}
-
-void SchemeTool::saveConfig()
-{
-}
-
-void SchemeTool::updateSpacingVar(int value)
-{
-    k->spacing = value;
-}
-
-void SchemeTool::updateSizeToleranceVar(int value)
-{
-    tError() << "SchemeTool::updateSizeToleranceVar() - Value: " << value;
-    k->tolerance = (qreal)value/(qreal)100;
-}
-
-void SchemeTool::smoothPath(QPainterPath &path, double smoothness, int from, int to)
-{
-    QPolygonF pol;
-    QList<QPolygonF> polygons = path.toSubpathPolygons();
-
-    QList<QPolygonF>::iterator it = polygons.begin();
-
-    QPolygonF::iterator pointIt;
-
-    while (it != polygons.end()) {
-           pointIt = (*it).begin();
-
-           while (pointIt <= (*it).end()-2) {
-                  pol << (*pointIt);
-                  pointIt += 2;
-           }
-           ++it;
-    }
-
-    if (smoothness > 0) {
-        path = TupGraphicalAlgorithm::bezierFit(pol, smoothness, from, to);
-    } else {
-        path = QPainterPath();
-        path.addPolygon(pol);
-    }
-}
-
-void SchemeTool::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
-        emit closeHugeCanvas();
-    // } else if (event->modifiers() != Qt::ShiftModifier && event->modifiers() != Qt::ControlModifier) {
-    } else {
-        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-        if (flags.first != -1 && flags.second != -1)
-            emit callForPlugin(flags.first, flags.second);
-    }
-}
-
-QCursor SchemeTool::cursor() const
-{
-    return k->cursor;
-}
-
-Q_EXPORT_PLUGIN2(tup_brush, SchemeTool);
diff -Nru tupi-0.2+git04/src/plugins/tools/schemetool/schemetool.h tupi-0.2+git05/src/plugins/tools/schemetool/schemetool.h
--- tupi-0.2+git04/src/plugins/tools/schemetool/schemetool.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/schemetool/schemetool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez                                                     *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SCHEMETOOL_H
-#define SCHEMETOOL_H
-
-#include "tuptoolplugin.h"
-#include "configurator.h"
-#include "tuppathitem.h"
-
-#include <QObject>
-#include <QSpinBox>
-#include <QTimer>
-
-class QKeySequence;
-
-/**
- * @author David Cuadrado
-*/
-
-class SchemeTool : public TupToolPlugin
-{
-    Q_OBJECT
-    
-    public:
-        SchemeTool();
-        virtual ~SchemeTool();
-        
-        virtual void init(TupGraphicsScene *scene);
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-        virtual QWidget *configurator();
-        virtual void aboutToChangeTool();
-        virtual void saveConfig();
-        virtual void keyPressEvent(QKeyEvent *event);
-        virtual QCursor cursor() const;
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
-        
-    private:
-        void setupActions();
-        void smoothPath(QPainterPath &path, double smoothness, int from = 0, int to = -1);
-
-    private slots:
-        void updateSpacingVar(int value);
-        void updateSizeToleranceVar(int value);
-
-    private:
-        struct Private;
-        Private *const k;
-
-    /*        
-    private:
-        QPointF m_firstPoint;
-        QPointF m_oldPos;
-        QPointF previewPoint;
-        QPointF oldPosRight;
-        QPointF oldPosLeft;
-        QPointF connector;
-        QPainterPath m_path;
-        QPainterPath pathRight; 
-        QPainterPath pathLeft;
-        Configurator *m_configurator;
-        QMap<QString, TAction *> m_actions;
-        TupPathItem *m_item;
-        TupPathItem *itemRight;
-        TupPathItem *itemLeft;
-        int dotsCounter;
-        qreal penWidth;
-        qreal oldSlope;
-        int spacing;
-        qreal tolerance;
-        qreal widthVar; 
-        int arrowSize;
-        int firstArrow;
-    */
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/schemetool/schemetool.pro tupi-0.2+git05/src/plugins/tools/schemetool/schemetool.pro
--- tupi-0.2+git04/src/plugins/tools/schemetool/schemetool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/schemetool/schemetool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/schemetool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += schemetool.h \
-           configurator.h
-SOURCES += schemetool.cpp \
-           configurator.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib 
-TARGET = tupischemetool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/node.cpp tupi-0.2+git05/src/plugins/tools/selection/node.cpp
--- tupi-0.2+git04/src/plugins/tools/selection/node.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/node.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,321 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "node.h"
+#include "nodemanager.h"
+#include "tupgraphicalgorithm.h"
+#include "tupgraphicobject.h"
+
+/**
+ * This class defines the data structure for a node, and all the methods required to manipulate it.
+ * 
+ * @author David Cuadrado
+*/
+
+struct Node::Private
+{
+    TypeNode typeNode;
+    ActionNode action;
+    bool notChange;
+    ActionNode generalState; 
+    QGraphicsItem *parent;
+    NodeManager *manager;
+    QSizeF size;
+};
+
+Node::Node(TypeNode node, ActionNode action, const QPointF &pos, NodeManager *manager, QGraphicsItem *parent, int zValue) : 
+           QGraphicsItem(0), k(new Private)
+{
+    QGraphicsItem::setCursor(QCursor(Qt::PointingHandCursor));
+    setFlag(ItemIsSelectable, false);
+    setFlag(ItemIsMovable, true);
+    setFlag(ItemIsFocusable, true);
+    setPos(pos);
+
+    k->typeNode = node;
+    k->action = action;
+    k->manager = manager;
+    k->parent = parent;
+    k->size = QSizeF(10, 10);
+    k->generalState = Scale;
+
+    setZValue(zValue);
+}
+
+Node::~Node()
+{
+    delete k;
+}
+
+void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *w)
+{
+    Q_UNUSED(w);
+    Q_UNUSED(option);
+    
+    QColor color;
+   
+    if (k->typeNode != Center) {
+        if (k->action == Rotate) {
+            color = QColor(255, 102, 0);
+            color.setAlpha(180);
+        } else {
+            color = QColor("green");
+            color.setAlpha(200);
+        }
+    } else {
+        if (k->generalState == Scale) {
+            color = QColor(150, 150, 150);
+        } else {
+           color = QColor(255, 0, 0);
+        }
+        color.setAlpha(150);
+    }
+
+    QRectF square = boundingRect();
+    painter->setBrush(color);
+    painter->drawRoundRect(square);
+
+    /* SQA: Code for debugging purposes
+    #ifdef K_DEBUG
+        painter->setFont(QFont(painter->font().family(), 5));
+        painter->drawText(square, QString::number(k->typeNode));
+    #endif
+    */
+
+    if (k->typeNode == Center) {
+        painter->save();
+        color = QColor("white");
+        color.setAlpha(220);
+        painter->setPen(color);
+
+        QPointF point1 = QPointF(square.topLeft().x() + 2, square.topLeft().y() + 2);
+        QPointF point2 = QPointF(square.bottomRight().x() - 2, square.bottomRight().y() - 2);
+        QPointF point3 = QPointF(square.bottomLeft().x() + 2, square.bottomLeft().y() - 2);
+        QPointF point4 = QPointF(square.topRight().x() - 2, square.topRight().y() + 2);
+
+        painter->drawLine(point1, point2);
+        painter->drawLine(point3, point4);
+        painter->restore();
+    }
+}
+
+QRectF Node::boundingRect() const
+{
+    QRectF rect(QPointF(-k->size.width()/2, -k->size.height()/2), k->size);
+    return rect;
+}
+
+QVariant Node::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    /*
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Node::itemChange()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+    */
+
+    if (change == ItemSelectedChange) {
+        setVisible(true);
+        if (value.toBool())
+            k->parent->setSelected(true);
+        k->manager->show();
+    }
+
+    return QGraphicsItem::itemChange(change, value);
+}
+
+void Node::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Node::mousePressEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    k->manager->setPress(true);
+    QGraphicsItem::mousePressEvent(event);
+}
+
+void Node::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Node::mouseReleaseEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    QGraphicsItem::mouseReleaseEvent(event);
+    k->parent->setSelected(true);
+    k->manager->setPress(false);
+}
+
+void Node::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    QPointF newPos(event->scenePos());
+
+    if (k->notChange) {
+        k->notChange = false;
+    } else {
+        if (k->action == Scale) {
+            QRectF rect = k->parent->sceneBoundingRect();
+            QRectF parentRect  = k->parent->sceneBoundingRect();
+            QRectF parentSquare  = k->parent->boundingRect();
+            
+            // SQA: Lines for debugging purposes
+            /*
+            scene()->addRect(rect, QPen(Qt::red));
+            scene()->addRect(parentRect, QPen(Qt::green));
+            */
+            
+            switch (k->typeNode) {
+                    case TopLeft:
+                    {
+                         k->manager->setAnchor(parentSquare.bottomRight());
+                         rect.setTopLeft(newPos);
+                         break;
+                    }
+                    case TopRight:
+                    {
+                         k->manager->setAnchor(parentSquare.bottomLeft());
+                         rect.setTopRight(newPos);
+                         break;
+                    }
+                    case BottomRight:
+                    {
+                         k->manager->setAnchor(parentSquare.topLeft());
+                         rect.setBottomRight(newPos);
+                         break;
+                    }
+                    case BottomLeft:
+                    {
+                         k->manager->setAnchor(parentSquare.topRight());
+                         rect.setBottomLeft(newPos);
+                         break;
+                    }
+                    case Center:
+                    {
+                         break;
+                    }
+            };
+            
+            float sx = 1, sy = 1;
+            sx = static_cast<float>(rect.width()) / static_cast<float>(parentRect.width());
+            sy = static_cast<float>(rect.height()) / static_cast<float>(parentRect.height());
+
+            if (k->manager->proportionalScale()) {
+                k->manager->scale(sx, sx);
+            } else {
+                if (sx > 0 && sy > 0) {
+                    k->manager->scale(sx, sy);
+                } else {
+                    if (sx > 0)
+                        k->manager->scale(sx, 1);
+
+                    if (sy > 0)
+                        k->manager->scale(1, sy);
+                }
+            }
+        } else if (k->action == Rotate) {
+                   QPointF p1 = newPos;
+                   QPointF p2 = k->parent->sceneBoundingRect().center();
+                   k->manager->setAnchor(k->parent->boundingRect().center());
+                
+                   double a = (180 * TupGraphicalAlgorithm::angleForPos(p1, p2)) / M_PI;
+                   k->manager->rotate(a-45);
+        }
+    }
+
+    if (k->typeNode == Center) {
+        k->parent->moveBy(event->scenePos().x() - scenePos().x() , event->scenePos().y() - scenePos().y());
+        event->accept();
+    }
+}
+
+void Node::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Node::mouseDoubleClickEvent()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    k->manager->toggleAction();
+    QGraphicsItem::mouseDoubleClickEvent(event);
+}
+
+int Node::typeNode() const
+{
+    return k->typeNode;
+}
+
+void Node::setAction(ActionNode action)
+{
+    if (k->typeNode != Center)
+        k->action = action;
+    else
+        k->action = Scale;
+
+    if (k->generalState == Scale)
+        k->generalState = Rotate;
+    else
+        k->generalState = Scale;
+
+    update();
+}
+
+int Node::actionNode()
+{
+    return k->action;
+}
+
+void Node::keyReleaseEvent(QKeyEvent *event)
+{
+    Q_UNUSED(event);
+    k->manager->setProportion(false);
+}
+
+void Node::resize(qreal factor)
+{
+    setScale(factor);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/node.h tupi-0.2+git05/src/plugins/tools/selection/node.h
--- tupi-0.2+git04/src/plugins/tools/selection/node.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/node.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,97 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef NODE_H
+#define NODE_H
+
+#include "tglobal.h"
+
+#include <QGraphicsItem>
+#include <QObject>
+#include <QPointF>
+#include <QKeyEvent>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QStyleOption>
+#include <QStyleOptionButton>
+#include <QApplication>
+#include <QCursor>
+#include <cmath> //atan
+
+class NodeManager;
+
+/**
+ * @author Jorge Cuadrado 
+*/
+
+class TUPI_PLUGIN Node : public QObject, public QGraphicsItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsItem)
+    
+    public:
+        enum TypeNode { TopLeft  = 0, TopRight, BottomLeft, BottomRight, Center };
+        enum ActionNode { NoAction = 0, Scale, Rotate };
+        
+        Node(TypeNode node, ActionNode action, const QPointF &pos=QPoint(0,0), NodeManager *manager=0, QGraphicsItem *parent=0, int zValue=0);
+        ~Node();
+        
+        void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *);
+        QRectF boundingRect() const;
+        void resize(qreal factor);
+        
+        void setAction(ActionNode action);
+        int actionNode();
+        
+        enum { Type = UserType + 1 };
+        int type() const { return Type; }
+        
+        int typeNode() const;
+
+    protected:
+        QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+        void mousePressEvent(QGraphicsSceneMouseEvent *event);
+        void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+        void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
+        void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * event);
+        void keyReleaseEvent(QKeyEvent *event);
+        
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/nodemanager.cpp tupi-0.2+git05/src/plugins/tools/selection/nodemanager.cpp
--- tupi-0.2+git04/src/plugins/tools/selection/nodemanager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/nodemanager.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,251 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "nodemanager.h"
+#include "tupgraphicobject.h"
+
+/**
+ * This class handles the methods required to manipulate a set of nodes.
+ * 
+ * @author Jorge Cuadrado
+*/
+
+NodeManager::NodeManager(QGraphicsItem * parent, QGraphicsScene  *scene, int zValue): 
+                         m_parent(parent), m_scene(scene), m_anchor(0,0), m_press(false), m_rotation(0)
+{
+    QRectF rect = parent->sceneBoundingRect();
+    Node *topLeft = new Node(Node::TopLeft, Node::Scale, rect.topLeft(), this, parent, zValue);
+    Node *topRight = new Node(Node::TopRight, Node::Scale, rect.topRight(), this, parent, zValue);
+    Node *bottomLeft = new Node(Node::BottomLeft,Node::Scale, rect.bottomLeft(),this, parent, zValue);
+    Node *bottomRight = new Node(Node::BottomRight,Node::Scale, rect.bottomRight(),this, parent, zValue);
+    Node *center = new Node(Node::Center, Node::Scale, rect.center(), this,parent, zValue);
+
+    m_nodes.insert(Node::TopLeft, topLeft);
+    m_nodes.insert(Node::TopRight, topRight);
+    m_nodes.insert(Node::BottomLeft, bottomLeft);
+    m_nodes.insert(Node::BottomRight, bottomRight);
+    m_nodes.insert(Node::Center, center);
+
+    m_proportional = false;
+    
+    beginToEdit();
+}
+
+NodeManager::~NodeManager()
+{
+    clear();
+}
+
+void NodeManager::clear()
+{
+    foreach (Node *node, m_nodes) {
+             if (node) {
+                 if (QGraphicsScene *scene = node->scene())
+                     scene->removeItem(node);
+             }
+             delete node;
+             node = 0;
+    }
+    m_nodes.clear();
+}
+
+void NodeManager::syncNodes(const QRectF &rect)
+{
+    if (m_nodes.isEmpty())
+        return;
+    
+    QHash<Node::TypeNode, Node *>::iterator it = m_nodes.begin();
+    while (it != m_nodes.end()) {
+           if ((*it)) {
+               switch (it.key()) {
+                       case Node::TopLeft:
+                       {
+                            if ((*it)->scenePos() != rect.topLeft())
+                                (*it)->setPos(rect.topLeft());
+                            break;
+                       }
+                       case Node::TopRight:
+                       {
+                            if ((*it)->scenePos() != rect.topRight())
+                                (*it)->setPos(rect.topRight());
+                            break;
+                       }
+                       case Node::BottomRight:
+                       {
+                            if ((*it)->scenePos() != rect.bottomRight())
+                                (*it)->setPos(rect.bottomRight());
+                            break;
+                       }
+                       case Node::BottomLeft:
+                       {
+                            if ((*it)->scenePos() != rect.bottomLeft())
+                                (*it)->setPos(rect.bottomLeft() );
+                            break;
+                       }
+                       case Node::Center:
+                       {
+                            if ((*it)->scenePos() != rect.center())
+                                (*it)->setPos(rect.center());
+                            break;
+                       }
+               }
+           }
+           ++it;
+    }
+}
+
+void NodeManager::syncNodesFromParent()
+{
+    if (m_parent)
+        syncNodes(m_parent->sceneBoundingRect());
+}
+
+QGraphicsItem *NodeManager::parentItem() const
+{
+    return m_parent;
+}
+
+bool NodeManager::isModified() const
+{
+    return !((m_parent->matrix() == m_origMatrix) && (m_parent->pos() == m_origPos));
+}
+
+void NodeManager::beginToEdit()
+{
+    m_origMatrix = m_parent->matrix();
+    m_origPos = m_parent->pos();
+}
+
+void NodeManager::restoreItem()
+{
+    m_parent->setMatrix(m_origMatrix);
+    m_parent->setPos(m_origPos);
+}
+
+void NodeManager::setAnchor(const QPointF& point)
+{
+    m_anchor = point;
+}
+
+QPointF NodeManager::anchor() const
+{
+    return m_anchor;
+}
+
+void NodeManager::scale(float sx, float sy)
+{
+    QMatrix m;
+    m.translate(m_anchor.x(),m_anchor.y());
+    m.scale(sx,sy);
+    m.translate(-m_anchor.x(),-m_anchor.y());
+    m_parent->setMatrix(m, true);
+
+    syncNodesFromParent();
+}
+
+void NodeManager::rotate(double a)
+{
+    QMatrix m = m_parent->matrix();
+    m.translate(m_anchor.x(),m_anchor.y());
+    m.rotate(m_rotation-a);
+    m.translate(-m_anchor.x(),-m_anchor.y());
+    m_parent->setMatrix(m);
+    m_parent->setData(TupGraphicObject::Rotate, m_rotation - a);
+
+    syncNodesFromParent();
+    m_rotation = a;
+}
+
+void NodeManager::show()
+{
+    foreach (Node *node, m_nodes) {
+             if (!node->scene())
+                 m_scene->addItem(node);
+    }
+}
+
+void NodeManager::setPress(bool press)
+{
+    m_press = press;
+}
+
+bool NodeManager::isPress()
+{
+    return m_press;
+}
+
+void NodeManager::toggleAction()
+{
+    foreach (Node *node, m_nodes) {
+             if (node->actionNode() == Node::Scale) {
+                 node->setAction(Node::Rotate);
+             } else if (node->actionNode() == Node::Rotate) {
+                        node->setAction(Node::Scale);
+             }
+    }
+}
+
+void NodeManager::setActionNode(Node::ActionNode action)
+{
+    foreach (Node *node, m_nodes)
+             node->setAction(action);
+}
+
+void NodeManager::resizeNodes(qreal factor)
+{
+    foreach (Node *node, m_nodes)
+             node->resize(factor);
+}
+
+void NodeManager::setVisible(bool visible)
+{
+    foreach (Node *node, m_nodes)
+             node->setVisible(visible);
+}
+
+double NodeManager::rotation()
+{
+    return m_rotation;
+}
+
+void NodeManager::setProportion(bool flag)
+{
+    m_proportional = flag;
+}
+
+bool NodeManager::proportionalScale()
+{
+    return m_proportional;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/nodemanager.h tupi-0.2+git05/src/plugins/tools/selection/nodemanager.h
--- tupi-0.2+git04/src/plugins/tools/selection/nodemanager.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/nodemanager.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,104 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef NODEMANAGER_H
+#define NODEMANAGER_H
+
+#include "tglobal.h"
+#include "node.h"
+
+#include <QHash>
+#include <QGraphicsItem>
+#include <QGraphicsScene>
+
+/**
+ * @author Jorge Cuadrado
+*/
+
+class TUPI_PLUGIN NodeManager : public QObject
+{
+    Q_OBJECT
+
+    public:
+        NodeManager(QGraphicsItem *parent, QGraphicsScene *scene, int zValue);
+        ~NodeManager();
+        void syncNodes(const QRectF &rect);
+        void syncNodesFromParent();
+        QGraphicsItem *parentItem() const;
+        bool isModified() const;
+        
+        void beginToEdit();
+        void restoreItem();
+        
+        void show();
+        
+        void setAnchor(const QPointF& point);
+        QPointF anchor() const;
+        
+        void scale(float sx, float sy);
+        void rotate(double a);
+        
+        void setPress(bool press);
+        bool isPress();
+        
+        void toggleAction();
+        
+        void setActionNode(Node::ActionNode action);
+        
+        void setVisible(bool visible);
+        
+        double rotation();
+
+        void setProportion(bool flag);
+        bool proportionalScale();
+        void clear();
+
+        void resizeNodes(qreal factor);
+
+    private:
+        QHash<Node::TypeNode, Node *> m_nodes;
+        QGraphicsItem *m_parent;
+        QGraphicsScene *m_scene;
+        
+        QMatrix m_origMatrix;
+        QPointF m_origPos;
+        QPointF m_anchor;
+        
+        bool m_press;
+        bool m_proportional;
+        double m_rotation;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/selection.pro tupi-0.2+git05/src/plugins/tools/selection/selection.pro
--- tupi-0.2+git04/src/plugins/tools/selection/selection.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/selection.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,41 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += selectiontool.h \
+           node.h \
+           nodemanager.h \ 
+           settings.h
+
+SOURCES += selectiontool.cpp \
+           node.cpp \
+           nodemanager.cpp \ 
+           settings.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupiselectiontool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/selectiontool.cpp tupi-0.2+git05/src/plugins/tools/selection/selectiontool.cpp
--- tupi-0.2+git04/src/plugins/tools/selection/selectiontool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/selectiontool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,1225 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "selectiontool.h"
+#include "taction.h"
+#include "talgorithm.h"
+#include "tupgraphicalgorithm.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+#include "tupsvgitem.h"
+#include "tupsvg2qt.h"
+#include "tupitemgroup.h"
+#include "tupellipseitem.h"
+#include "tupgraphicobject.h"
+#include "tupinputdeviceinformation.h"
+#include "tupgraphicsscene.h"
+#include "nodemanager.h"
+#include "tupserializer.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectresponse.h"
+#include "tosd.h"
+
+struct SelectionTool::Private
+{
+    QMap<QString, TAction *> actions;
+    QList<QGraphicsItem *> selectedObjects;
+    QList<NodeManager*> nodeManagers;
+    TupGraphicsScene *scene;
+    bool selectionFlag;
+    qreal scaleFactor;
+    qreal realFactor;
+    int baseZValue;
+    TupEllipseItem *center;
+    QGraphicsLineItem *target1;
+    QGraphicsLineItem *target2;
+    bool targetIsIncluded;
+    QString key;
+};
+
+SelectionTool::SelectionTool(): k(new Private), panel(0)
+{
+    setupActions();
+}
+
+SelectionTool::~SelectionTool()
+{
+    delete k;
+}
+
+void SelectionTool::init(TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[SelectionTool::init()]";
+        #else
+            T_FUNCINFOX("tools");
+        #endif
+    #endif
+ 
+    qDeleteAll(k->nodeManagers);
+    k->nodeManagers.clear();
+
+    k->scene = scene;
+    k->scene->clearSelection();
+    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
+    k->targetIsIncluded = false;
+
+    reset(scene);
+}
+
+void SelectionTool::reset(TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[SelectionTool::reset()]";
+        #else
+            T_FUNCINFOX("tools");
+        #endif
+    #endif
+
+    int zBottomLimit = (scene->currentLayerIndex() + 2)*10000;
+    int zTopLimit = zBottomLimit + 10000;
+
+    foreach (QGraphicsView *view, scene->views()) {
+             view->setDragMode(QGraphicsView::RubberBandDrag);
+             foreach (QGraphicsItem *item, scene->items()) {
+                      // SQA: Temporary code for debugging issues
+                      /*
+                      QDomDocument dom;
+                      dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
+                      QDomElement root = dom.documentElement();
+                      tFatal() << "SelectionTool::init() - XML: ";
+                      tFatal() << dom.toString();
+                      */
+
+                      int zValue = item->zValue();
+                      if (!qgraphicsitem_cast<Node *>(item)) {
+                          if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                              if ((zValue >= zBottomLimit) && (zValue < zTopLimit) && (item->toolTip().length()==0)) {
+                                  item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                              } else {
+                                  item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                                  item->setFlag(QGraphicsItem::ItemIsMovable, false);
+                              }
+                          } else {
+                              if (scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                                  item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                              } else if (scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
+                                         if (zValue >= 10000) {
+                                             item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                                         } else {
+                                             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                                             item->setFlag(QGraphicsItem::ItemIsMovable, false);
+                                         }
+                              } else {
+                                  #ifdef K_DEBUG
+                                      QString msg = "SelectionTool::reset() - Fatal Error: Invalid spaceMode!";
+                                      #ifdef Q_OS_WIN32
+                                          qDebug() << msg;
+                                      #else
+                                          tError() << msg;
+                                      #endif
+                                  #endif
+                                  return;
+                              }
+                          }
+                      }
+             }
+    }
+
+    panel->enablePositionControls(false);
+    if (k->targetIsIncluded) {
+        k->scene->removeItem(k->center);
+        k->scene->removeItem(k->target1);
+        k->scene->removeItem(k->target2);
+        k->targetIsIncluded = false;
+    }
+}
+
+QStringList SelectionTool::keys() const
+{
+    return QStringList() << tr("Selection");
+}
+
+void SelectionTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(brushManager);
+
+    k->selectionFlag = false;
+
+    // If Control key is pressed / allow multiple selection picking items one by one 
+    if (input->keyModifiers() != Qt::ControlModifier) {
+        foreach (NodeManager *nodeManager, k->nodeManagers) {
+                 if (!nodeManager->isPress()) {
+                     nodeManager->parentItem()->setSelected(false);
+                     k->nodeManagers.removeAll(nodeManager);
+                     scene->drawCurrentPhotogram();
+                 } 
+        }
+        k->selectedObjects.clear();
+    }
+
+    if (scene->currentFrame()->indexOf(scene->mouseGrabberItem()) != -1) {
+        k->selectedObjects << scene->mouseGrabberItem();
+    } else {
+        if (scene->selectedItems().count() > 0)
+            k->selectedObjects = scene->selectedItems();
+    }
+
+    foreach (QGraphicsItem *item, k->selectedObjects) {
+             if (item && (dynamic_cast<TupAbstractSerializable* > (item))) {
+                 if (item->group() != 0)
+                     item = qgraphicsitem_cast<QGraphicsItem *>(item->group());
+                 bool found = false;
+                 foreach (NodeManager *nodeManager, k->nodeManagers) {
+                          if (item == nodeManager->parentItem()) {
+                              found = true;
+                              break;
+                          }
+                 }
+            
+                 if (!found) {
+                     NodeManager *manager = new NodeManager(item, scene, k->baseZValue);
+                     manager->show();
+                     manager->resizeNodes(k->realFactor);
+                     k->nodeManagers << manager;
+                 }
+             } 
+    }
+}
+
+void SelectionTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(brushManager);
+
+    if (input->buttons() == Qt::LeftButton && scene->selectedItems().count() > 0)
+        QTimer::singleShot(0, this, SLOT(syncNodes()));
+}
+
+void SelectionTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    k->selectedObjects = scene->selectedItems();
+
+    if (k->selectedObjects.count() > 0) {
+        k->selectionFlag = true;
+
+        foreach (NodeManager *node, k->nodeManagers) {
+                 QGraphicsItem *item = node->parentItem();
+                 int parentIndex = k->selectedObjects.indexOf(item); 
+                 if (parentIndex != -1) // Object is IN the list
+                     k->selectedObjects.removeAt(parentIndex); // Remove node's item from selected objects list 
+                 else // Object is NOT IN the selected objects list
+                     delete k->nodeManagers.takeAt(k->nodeManagers.indexOf(node)); // Removing node manager from nodes list 
+        }
+
+
+        foreach (QGraphicsItem *item, k->selectedObjects) {
+                 if (item && (dynamic_cast<TupAbstractSerializable* > (item))) {
+                     if (item->group() != 0)
+                         item = qgraphicsitem_cast<QGraphicsItem *>(item->group());
+                     bool found = false;
+                     foreach (NodeManager *nodeManager, k->nodeManagers) {
+                              if (item == nodeManager->parentItem()) {
+                                  found = true;
+                                  break;
+                              }
+                     }
+
+                     if (!found) {
+                         NodeManager *manager = new NodeManager(item, scene, k->baseZValue);
+                         manager->show();
+                         manager->resizeNodes(k->realFactor);
+                         k->nodeManagers << manager;
+                     }
+                 }
+        }
+
+        foreach (NodeManager *node, k->nodeManagers) {
+                 if (node->isModified()) {
+                     QGraphicsItem *item = node->parentItem();
+                     QDomDocument doc;
+                     doc.appendChild(TupSerializer::properties(item, doc));
+                     int position = -1;
+                     TupLibraryObject::Type type;
+                     TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
+
+                     if (svg) {
+                         type = TupLibraryObject::Svg;
+                         if (k->scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                             position = scene->currentFrame()->indexOf(svg);
+                         } else {
+                             TupBackground *bg = k->scene->scene()->background();
+                             if (bg) {
+                                 if (scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
+                                     position = bg->staticFrame()->indexOf(svg);
+                                 } else if (scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                                     position = bg->dynamicFrame()->indexOf(svg);
+                                 } else {
+                                     #ifdef K_DEBUG
+                                         QString msg = "SelectionTool::release() - Fatal Error: Invalid spaceMode!";
+                                         #ifdef Q_OS_WIN32
+                                             qDebug() << msg;
+                                         #else
+                                             tError() << msg;
+                                         #endif
+                                     #endif
+                                     return;
+                                 }
+                             } else {
+                                 #ifdef K_DEBUG
+                                     QString msg = "SelectionTool::release() - Fatal Error: Scene background object is NULL!";
+                                     #ifdef Q_OS_WIN32
+                                         qDebug() << msg;
+                                     #else
+                                         tError() << msg;
+                                     #endif
+                                 #endif
+                                 return;
+                             }
+                         }
+                     } else {
+                         type = TupLibraryObject::Item;
+
+                         if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                             position = scene->currentFrame()->indexOf(node->parentItem());
+                         } else {
+                             TupBackground *bg = scene->scene()->background();
+                             if (bg) {
+                                 if (scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
+                                     position = bg->staticFrame()->indexOf(node->parentItem());
+                                 } else if (scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                                            position = bg->dynamicFrame()->indexOf(node->parentItem());
+                                 } else {
+                                     #ifdef K_DEBUG
+                                         QString msg = "SelectionTool::release() - Fatal Error: Invalid spaceMode!";
+                                         #ifdef Q_OS_WIN32
+                                             qDebug() << msg;
+                                         #else
+                                             tError() << msg;
+                                         #endif
+                                     #endif
+                                     return;
+                                 }
+                             } else {
+                                 #ifdef K_DEBUG
+                                     QString msg = "SelectionTool::release() - Fatal Error: Scene background object is NULL!";
+                                     #ifdef Q_OS_WIN32
+                                         qDebug() << msg;
+                                     #else
+                                         tError() << msg;
+                                     #endif
+                                 #endif
+                                 return;
+                             }
+                         }
+                     }
+
+                     if (position >= 0) {
+                         // Restore matrix
+                         // node->restoreItem();
+
+                         TupProjectRequest event = TupRequestBuilder::createItemRequest( 
+                                    scene->currentSceneIndex(), 
+                                    scene->currentLayerIndex(), 
+                                    scene->currentFrameIndex(), position, QPointF(), 
+                                    scene->spaceMode(), type,
+                                    TupProjectRequest::Transform, doc.toString());
+
+                         emit requested(&event);
+                     } else {
+                         #ifdef K_DEBUG
+                             QString msg = "SelectionTool::release() - Fatal Error: Invalid item position !!! [ " + QString::number(position) + " ]";
+                             #ifdef Q_OS_WIN32
+                                 qDebug() << msg;
+                             #else
+                                 tError() << msg;
+                             #endif
+                         #endif
+                     }
+                 }
+        }
+        updateItemPosition();
+    } else {
+        panel->enablePositionControls(false);
+        if (k->targetIsIncluded)
+            k->targetIsIncluded = false;
+
+        foreach (NodeManager *nodeManager, k->nodeManagers) {
+                 nodeManager->parentItem()->setSelected(false);
+                 k->nodeManagers.removeAll(nodeManager);
+        }
+
+        scene->drawCurrentPhotogram();
+    }
+}
+
+void SelectionTool::setupActions()
+{
+    k->selectionFlag = false;
+    k->scaleFactor = 1;
+    k->realFactor = 1;
+
+    TAction *select = new TAction(QPixmap(kAppProp->themeDir() + "icons/selection.png"), tr("Object Selection"), this);
+    select->setShortcut(QKeySequence(tr("O")));
+    select->setToolTip(tr("Object Selection") + " - " + "O");
+
+    k->actions.insert(tr("Selection"), select);
+}
+
+QMap<QString, TAction *> SelectionTool::actions() const
+{
+    return k->actions;
+}
+
+int SelectionTool::toolType() const
+{
+    return TupToolInterface::Selection;
+}
+
+QWidget *SelectionTool::configurator() 
+{
+    if (!panel) {
+        panel = new Settings;
+        connect(panel, SIGNAL(callFlip(Settings::Flip)), this, SLOT(applyFlip(Settings::Flip)));
+        connect(panel, SIGNAL(callOrderAction(Settings::Order)), this, SLOT(applyOrderAction(Settings::Order)));
+        connect(panel, SIGNAL(callGroupAction(Settings::Group)), this, SLOT(applyGroupAction(Settings::Group)));
+        connect(panel, SIGNAL(updateItemPosition(int, int)), this, SLOT(updateItemPosition(int, int)));
+    }
+
+    return panel;
+}
+
+void SelectionTool::aboutToChangeScene(TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[SelectionTool::aboutToChangeScene()]";
+        #else
+            T_FUNCINFOX("tools");
+        #endif
+    #endif
+
+    init(scene);
+}
+
+void SelectionTool::aboutToChangeTool()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[SelectionTool::aboutToChangeTool()]";
+        #else
+            T_FUNCINFOX("tools");
+        #endif
+    #endif
+
+    // qDeleteAll(k->nodeManagers);
+    k->nodeManagers.clear();
+
+    foreach (QGraphicsView *view, k->scene->views()) {
+             view->setDragMode (QGraphicsView::NoDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+void SelectionTool::itemResponse(const TupItemResponse *event)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[SelectionTool::itemResponse()]";
+        #else
+            T_FUNCINFOX("tools");
+        #endif
+    #endif
+
+    QGraphicsItem *item = 0;
+    TupScene *scene = 0;
+    TupLayer *layer = 0;
+    TupFrame *frame = 0;
+
+    TupProject *project = k->scene->scene()->project();
+    
+    if (project) {
+        scene = project->scene(event->sceneIndex());
+        if (scene) {
+            if (project->spaceContext() == TupProject::FRAMES_EDITION) {
+                layer = scene->layer(event->layerIndex());
+
+                if (layer) {
+                    frame = layer->frame(event->frameIndex());
+                    if (frame) {
+                        if (event->itemType() == TupLibraryObject::Svg && frame->svgItemsCount()>0) {
+                            item = frame->svg(event->itemIndex());
+                        } else if (frame->graphicItemsCount()>0) {
+                                   item = frame->item(event->itemIndex());
+                        }
+                    } else {
+                        #ifdef K_DEBUG
+                            QString msg = "SelectionTool::itemResponse() - Fatal Error: frame is NULL";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
+                        #endif
+                        return;
+                    }
+                } else {
+                    #ifdef K_DEBUG
+                        QString msg = "SelectionTool::itemResponse() - Fatal Error: layer is NULL";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif
+                    return;
+                }
+            } else if (project->spaceContext() == TupProject::STATIC_BACKGROUND_EDITION) {
+                       TupBackground *bg = scene->background();
+                       if (bg) {
+                           TupFrame *frame = bg->staticFrame();
+                           if (frame) {
+                               if (event->itemType() == TupLibraryObject::Svg && frame->svgItemsCount()>0) {
+                                   item = frame->svg(event->itemIndex());
+                               } else if (frame->graphicItemsCount()>0) {
+                                          item = frame->item(event->itemIndex());
+                               }
+                           } else {
+                               #ifdef K_DEBUG
+                                   QString msg = "SelectionTool::itemResponse() - Fatal Error: Static bg frame is NULL";
+                                   #ifdef Q_OS_WIN32
+                                       qDebug() << msg;
+                                   #else
+                                       tError() << msg;
+                                   #endif
+                               #endif
+                               return;
+                           }
+                       } else {
+                           #ifdef K_DEBUG
+                               QString msg = "SelectionTool::itemResponse() - Fatal Error: Scene background is NULL";
+                               #ifdef Q_OS_WIN32
+                                   qDebug() << msg;
+                               #else
+                                   tError() << msg;
+                               #endif
+                           #endif
+                           return;
+                       }
+            } else if (project->spaceContext() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                       TupBackground *bg = scene->background();
+                       if (bg) {
+                           TupFrame *frame = bg->dynamicFrame();
+                           if (frame) {
+                               if (event->itemType() == TupLibraryObject::Svg && frame->svgItemsCount()>0) {
+                                   item = frame->svg(event->itemIndex());
+                               } else if (frame->graphicItemsCount()>0) {
+                                          item = frame->item(event->itemIndex());
+                               }
+                           } else {
+                               #ifdef K_DEBUG
+                                   QString msg = "SelectionTool::itemResponse() - Fatal Error: Dynamic bg frame is NULL";
+                                   #ifdef Q_OS_WIN32
+                                       qDebug() << msg;
+                                   #else
+                                       tError() << msg;
+                                   #endif
+                               #endif
+                               return;
+                           }
+                       } else {
+                           #ifdef K_DEBUG
+                               QString msg = "SelectionTool::itemResponse() - Fatal Error: Scene background is NULL";
+                               #ifdef Q_OS_WIN32
+                                   qDebug() << msg;
+                               #else
+                                   tError() << msg;
+                               #endif
+                           #endif
+                           return;
+                       }
+            } else {
+                #ifdef K_DEBUG
+                    QString msg = "SelectionTool::itemResponse() - Fatal Error: Invalid spaceMode!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
+                #endif
+                return;
+            }
+        } else {
+            #ifdef K_DEBUG
+                QString msg = "SelectionTool::itemResponse() - Fatal Error: Current scene is NULL!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+            return;
+        }
+    } else {
+        #ifdef K_DEBUG
+            QString msg = "SelectionTool::itemResponse() - Project does not exist";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif
+        return;
+    }
+
+    updateItemPosition();
+
+    switch (event->action()) {
+            case TupProjectRequest::Transform:
+            {
+                 if (item) {
+                     foreach (NodeManager* node, k->nodeManagers) {
+                              node->show();
+                              node->syncNodesFromParent();
+                              node->beginToEdit();
+                     }
+                 } else {
+                     #ifdef K_DEBUG
+                         QString msg = "SelectionTool::itemResponse - No item found";
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError() << msg;
+                         #endif
+                     #endif
+                 }
+            }
+            break;
+            case TupProjectRequest::Move:
+            {
+                 syncNodes();
+            }
+            break;
+            case TupProjectRequest::Group:
+            {
+                 k->nodeManagers.clear();
+                 k->selectedObjects.clear();
+
+                 k->selectedObjects << item;
+                 item->setSelected(true);
+                 NodeManager *node = new NodeManager(item, k->scene, k->baseZValue);
+                 node->resizeNodes(k->realFactor);
+                 k->nodeManagers << node;
+
+                 syncNodes();
+            }
+            break;
+            case TupProjectRequest::Ungroup:
+            {
+                 foreach (QGraphicsItem *graphic, k->scene->selectedItems())
+                          graphic->setSelected(false);
+
+                 k->nodeManagers.clear();
+                 k->selectedObjects.clear();
+
+                 QString list = event->arg().toString();
+                 QString::const_iterator itr = list.constBegin();
+                 QList<int> positions = TupSvg2Qt::parseIntList(++itr);
+                 qSort(positions.begin(), positions.end());
+                 int total = positions.size();
+                 for (int i=0; i<total; i++) {
+                      QGraphicsItem *graphic = frame->item(positions.at(i));     
+                      if (graphic) {
+                          k->selectedObjects << graphic;
+                          graphic->setSelected(true);
+                          NodeManager *node = new NodeManager(graphic, k->scene, k->baseZValue);
+                          node->resizeNodes(k->realFactor);
+                          k->nodeManagers << node;
+                      }
+                 }
+
+                 syncNodes();
+            }
+            break;
+            case TupProjectRequest::Remove:
+            {
+                 // Do nothing
+            }
+            break;
+            default:
+            {
+                 syncNodes();
+            }
+            break;
+    }
+}
+
+void SelectionTool::syncNodes()
+{
+    foreach (NodeManager* node, k->nodeManagers) {
+             if (node) {
+                 node->show();
+                 if (node->parentItem()) {
+                     // node->parentItem()->setSelected(true);
+                     node->syncNodesFromParent();
+                 }
+             }
+    }
+}
+
+void SelectionTool::saveConfig()
+{
+}
+
+void SelectionTool::keyPressEvent(QKeyEvent *event)
+{
+    k->key = "NONE";
+
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
+        emit closeHugeCanvas();
+    } else if (event->modifiers() == Qt::AltModifier) {
+               if (event->key() == Qt::Key_R) {
+                   if (selectionIsActive()) {
+                       foreach (NodeManager *nodeManager, k->nodeManagers) {
+                                nodeManager->toggleAction();
+                                break;
+                       }
+                   }
+               }
+    } else if ((event->key() == Qt::Key_Left) || (event->key() == Qt::Key_Up) 
+               || (event->key() == Qt::Key_Right) || (event->key() == Qt::Key_Down)) {
+
+               if (!selectionIsActive()) {
+                   QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+                   if (flags.first != -1 && flags.second != -1)
+                       emit callForPlugin(flags.first, flags.second);
+               } else {
+                   int delta = 5;
+
+                   if (event->modifiers()==Qt::ShiftModifier)
+                       delta = 1;
+
+                   if (event->modifiers()==Qt::ControlModifier)
+                       delta = 10;
+
+                   k->selectedObjects = k->scene->selectedItems();
+
+                   foreach (QGraphicsItem *item, k->selectedObjects) {
+                            if (event->key() == Qt::Key_Left)
+                                item->moveBy(-delta, 0);
+
+                            if (event->key() == Qt::Key_Up)
+                                item->moveBy(0, -delta);
+
+                            if (event->key() == Qt::Key_Right)
+                                item->moveBy(delta, 0);
+
+                            if (event->key() == Qt::Key_Down)
+                                item->moveBy(0, delta);
+
+                            QTimer::singleShot(0, this, SLOT(syncNodes()));
+                   }
+
+                   updateItemPosition();
+               }
+    } else if (event->modifiers() == Qt::ShiftModifier) {
+               k->key = "SHIFT";
+               if (selectionIsActive()) {
+                   foreach (NodeManager *nodeManager, k->nodeManagers)
+                            nodeManager->setProportion(true);
+               }
+    } else {
+        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+        if (flags.first != -1 && flags.second != -1)
+            emit callForPlugin(flags.first, flags.second);
+    }
+}
+
+void SelectionTool::keyReleaseEvent(QKeyEvent *event)
+{
+    Q_UNUSED(event);
+
+    if (k->key.compare("SHIFT") == 0) {
+        if (selectionIsActive()) {
+            foreach (NodeManager *nodeManager, k->nodeManagers)
+                     nodeManager->setProportion(false);
+        }
+    }
+}
+
+bool SelectionTool::selectionIsActive()
+{
+    return k->selectionFlag;
+
+    /*
+    if (k->scene) {
+        if (!k->selectionFlag)
+            return;
+    } else {
+        return;
+    }
+    */
+}
+
+// SQA: Check if reset() and updateItems can be defined as the same method 
+void SelectionTool::updateItems(TupGraphicsScene *scene)
+{
+    foreach (QGraphicsView *view, scene->views()) {
+             view->setDragMode(QGraphicsView::RubberBandDrag);
+             foreach (QGraphicsItem *item, scene->items()) {
+                      if (!qgraphicsitem_cast<Node *>(item)) {
+                          if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                              if (item->zValue() >= 20000) {
+                                  item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                              } else {
+                                  item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                                  item->setFlag(QGraphicsItem::ItemIsMovable, false);
+                              }
+                          } else {
+                              if (scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                                  item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                              } else if (scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
+                                         if (item->zValue() >= 10000) {
+                                             item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                                         } else {
+                                             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                                             item->setFlag(QGraphicsItem::ItemIsMovable, false);
+                                         }
+                              } else {
+                                  #ifdef K_DEBUG
+                                      QString msg = "SelectionTool::updateItems() - Fatal Error: Invalid spaceMode!";
+                                      #ifdef Q_OS_WIN32
+                                          qDebug() << msg;
+                                      #else
+                                          tError() << msg;
+                                      #endif
+                                  #endif
+                              }
+                          }
+                      }
+             }
+    }
+}
+
+void SelectionTool::applyFlip(Settings::Flip flip)
+{
+    k->selectedObjects = k->scene->selectedItems();
+
+    foreach (QGraphicsItem *item, k->selectedObjects) {
+             QRectF rect = item->sceneBoundingRect();
+             QPointF point = rect.topLeft();
+             QMatrix m;
+             m.translate(point.x(), point.y());
+
+             if (flip == Settings::Horizontal)
+                 m.scale(-1.0, 1.0);
+             else if (flip == Settings::Vertical)
+                      m.scale(1.0, -1.0);
+             else if (flip == Settings::Crossed)
+                      m.scale(-1.0, -1.0);
+
+             m.translate(-point.x(), -point.y());
+             item->setMatrix(m, true);
+             rect = item->sceneBoundingRect();
+             QPointF point2 = rect.topLeft();
+
+             QPointF result = point - point2;
+             item->moveBy(result.x(), result.y());
+
+             foreach (NodeManager *node, k->nodeManagers) {
+                      if (node->isModified()) {
+                          QDomDocument doc;
+                          doc.appendChild(TupSerializer::properties(item, doc));
+
+                          TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(node->parentItem());
+                          int position = -1;
+                          TupLibraryObject::Type type = TupLibraryObject::Item;
+                          if (svg)
+                              type = TupLibraryObject::Svg;
+
+                          if (k->scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                              if (svg) 
+                                  position = k->scene->currentFrame()->indexOf(svg);
+                              else 
+                                  position = k->scene->currentFrame()->indexOf(node->parentItem());
+                          } else {
+                              TupBackground *bg = k->scene->scene()->background();
+                              if (bg) {
+                                  if (k->scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
+                                      if (svg)
+                                          position = bg->staticFrame()->indexOf(svg);
+                                      else
+                                          position = bg->staticFrame()->indexOf(node->parentItem());
+                                  } else if (k->scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                                             if (svg)
+                                                 position = bg->dynamicFrame()->indexOf(svg);
+                                             else
+                                                 position = bg->dynamicFrame()->indexOf(node->parentItem());
+                                  } else {
+                                      #ifdef K_DEBUG
+                                          QString msg = "SelectionTool::applyFlip() - Fatal Error: invalid spaceMode!";
+                                          #ifdef Q_OS_WIN32
+                                              qDebug() << msg;
+                                          #else
+                                              tError() << msg;
+                                          #endif
+                                      #endif
+                                      return;
+                                  }
+                              } else {
+                                  #ifdef K_DEBUG
+                                      QString msg = "SelectionTool::applyFlip() - Fatal Error: Scene background object is NULL!";
+                                      #ifdef Q_OS_WIN32
+                                          qDebug() << msg;
+                                      #else
+                                          tError() << msg;
+                                      #endif
+                                  #endif
+                                  return;
+                              }
+                          }
+
+                          TupProjectRequest event = TupRequestBuilder::createItemRequest(
+                                                   k->scene->currentSceneIndex(),
+                                                   k->scene->currentLayerIndex(),
+                                                   k->scene->currentFrameIndex(), position, QPointF(), 
+                                                   k->scene->spaceMode(), type,
+                                                   TupProjectRequest::Transform, doc.toString());
+                          emit requested(&event);
+                      }
+             }
+    }
+}
+
+void SelectionTool::applyOrderAction(Settings::Order action)
+{
+    k->selectedObjects = k->scene->selectedItems();
+
+    foreach (QGraphicsItem *item, k->selectedObjects) {
+             TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
+             int position = -1;
+             TupLibraryObject::Type type = TupLibraryObject::Item;
+             if (svg)
+                 type = TupLibraryObject::Svg;
+
+             if (k->scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                 if (svg)
+                     position = k->scene->currentFrame()->indexOf(svg);
+                 else
+                     position = k->scene->currentFrame()->indexOf(item);
+             } else {
+                 TupBackground *bg = k->scene->scene()->background();
+                 if (bg) {
+                     if (k->scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
+                         if (svg)
+                             position = bg->staticFrame()->indexOf(svg);
+                         else
+                             position = bg->staticFrame()->indexOf(item);
+                     } else if (k->scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                                if (svg)
+                                    position = bg->dynamicFrame()->indexOf(svg);
+                                else
+                                    position = bg->dynamicFrame()->indexOf(item);
+                     } else {
+                         #ifdef K_DEBUG
+                             QString msg = "SelectionTool::applyOrderAction() - Fatal Error: invalid spaceMode!";
+                             #ifdef Q_OS_WIN32
+                                 qDebug() << msg;
+                             #else
+                                 tError() << msg;
+                             #endif
+                         #endif
+                         return;
+                     }
+                 } else {
+                     #ifdef K_DEBUG
+                         QString msg = "SelectionTool::applyOrderAction() - Fatal Error: Scene background object is NULL!";
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError() << msg;
+                         #endif
+                     #endif
+                     return;
+                 }
+             }
+
+             TupProjectRequest event = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(),
+                                       k->scene->currentLayerIndex(), k->scene->currentFrameIndex(), position, QPointF(),
+                                       k->scene->spaceMode(), type, TupProjectRequest::Move, action);
+             emit requested(&event);
+    }
+}
+
+void SelectionTool::applyGroupAction(Settings::Group action)
+{
+    foreach (QGraphicsItem *item, k->selectedObjects) {
+             TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
+             if (svg) {
+                 TOsd::self()->display(tr("Error"), tr("SVG objects can't be grouped/ungrouped yet"), TOsd::Error);
+                 return;
+             }
+    }
+
+    if (action == Settings::GroupItems) {
+        k->selectedObjects = k->scene->selectedItems();
+        int total = k->selectedObjects.count(); 
+        if (total > 1) {
+            QString items = "(";
+            int i = 1;
+            int position = -1; 
+
+            foreach (QGraphicsItem *item, k->selectedObjects) {
+                     int index = -1;
+                     if (k->scene->spaceMode() == TupProject::FRAMES_EDITION) {
+                         index = k->scene->currentFrame()->indexOf(item);
+                     } else {
+                         TupBackground *bg = k->scene->scene()->background();
+                         if (bg) {
+                             if (k->scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
+                                 index = bg->staticFrame()->indexOf(item);
+                             } else if (k->scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
+                                        index = bg->dynamicFrame()->indexOf(item);
+                             } else {
+                                 #ifdef K_DEBUG
+                                     QString msg = "SelectionTool::applyGroupAction() - Fatal Error: invalid spaceMode!";
+                                     #ifdef Q_OS_WIN32
+                                         qDebug() << msg;
+                                     #else
+                                         tError() << msg;
+                                     #endif
+                                 #endif
+                                 return;
+                             }
+                         } else {
+                             #ifdef K_DEBUG
+                                 QString msg = "SelectionTool::applyGroupAction() - Fatal Error: Scene background object is NULL!";
+                                 #ifdef Q_OS_WIN32
+                                     qDebug() << msg;
+                                 #else
+                                     tError() << msg;
+                                 #endif
+                             #endif
+                             return;
+                         }
+                     }
+
+                     if (index > -1) {
+                         if (i == 1) {
+                             position = index;
+                         } else {
+                             if (index < position) 
+                                 position = index;
+                         }
+                         items += QString::number(index); 
+                         if (i < total)
+                             items += ", ";
+                     } else {
+                         #ifdef K_DEBUG
+                             QString msg = "SelectionTool::applyGroupAction() - Fatal Error: Index of item is invalid! -> -1";
+                             #ifdef Q_OS_WIN32
+                                 qDebug() << msg;
+                             #else
+                                 tError() << msg;
+                             #endif
+                         #endif
+                     }
+                     i++;
+            }
+            items += ")";
+
+            foreach (QGraphicsItem *item, k->selectedObjects)
+                     item->setSelected(false);
+
+            TupProjectRequest event = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(),
+                                      k->scene->currentLayerIndex(),
+                                      k->scene->currentFrameIndex(), position, QPointF(), k->scene->spaceMode(),
+                                      TupLibraryObject::Item, TupProjectRequest::Group, items);
+            emit requested(&event);
+        } else if (total == 1) {
+                   k->nodeManagers.clear();
+                   k->scene->drawCurrentPhotogram();
+        }
+    } else if (action == Settings::UngroupItems) {
+               k->selectedObjects = k->scene->selectedItems();
+               int total = k->selectedObjects.count();
+
+               if (total > 0) {
+                   bool noAction = true;
+                   foreach (QGraphicsItem *item, k->selectedObjects) {
+                            item->setSelected(false);
+                            if (qgraphicsitem_cast<TupItemGroup *> (item)) {
+                                noAction = false;
+                                int position = k->scene->currentFrame()->indexOf(item);
+                                TupProjectRequest event = TupRequestBuilder::createItemRequest(
+                                                          k->scene->currentSceneIndex(),
+                                                          k->scene->currentLayerIndex(),
+                                                          k->scene->currentFrameIndex(),
+                                                          position, QPointF(),
+                                                          k->scene->spaceMode(), TupLibraryObject::Item,
+                                                          TupProjectRequest::Ungroup);
+                                emit requested(&event);
+                            }
+                   }
+
+                   if (noAction) {
+                       k->nodeManagers.clear();
+                       k->scene->drawCurrentPhotogram();
+                   }
+               }
+    }
+}
+
+QCursor SelectionTool::cursor() const
+{
+    return QCursor(Qt::ArrowCursor);
+}
+
+void SelectionTool::resizeNodes(qreal scaleFactor)
+{
+    k->realFactor = scaleFactor;
+    foreach (NodeManager *manager, k->nodeManagers)
+             manager->resizeNodes(scaleFactor);
+}
+
+void SelectionTool::updateZoomFactor(qreal scaleFactor)
+{
+    k->realFactor = scaleFactor;
+}
+
+void SelectionTool::sceneResponse(const TupSceneResponse *event)
+{
+    if (event->action() == TupProjectRequest::Select)
+        reset(k->scene);
+}
+
+void SelectionTool::updateItemPosition() 
+{
+    if (k->nodeManagers.count() == 1) {
+        NodeManager *manager = k->nodeManagers.first();
+        QGraphicsItem *item = manager->parentItem();
+        QPoint point = item->mapToScene(item->boundingRect().center()).toPoint();
+        panel->setPos(point.x(), point.y());
+    } else { 
+        if (k->nodeManagers.count() > 1) {
+            NodeManager *manager = k->nodeManagers.first();
+            QGraphicsItem *item = manager->parentItem();
+            QPoint left = item->mapToScene(item->boundingRect().topLeft()).toPoint();  
+            QPoint right = item->mapToScene(item->boundingRect().bottomRight()).toPoint();
+            int minX = left.x();
+            int maxX = right.x(); 
+            int minY = left.y();
+            int maxY = right.y();
+
+            foreach (NodeManager *node, k->nodeManagers) {
+                     QGraphicsItem *item = node->parentItem();
+                     QPoint left = item->mapToScene(item->boundingRect().topLeft()).toPoint(); 
+                     int leftX = left.x();
+                     int leftY = left.y();
+                     if (leftX < minX)
+                         minX = leftX;
+                     if (leftY < minY)
+                         minY = leftY;
+                     QPoint right = item->mapToScene(item->boundingRect().bottomRight()).toPoint();  
+                     int rightX = right.x();
+                     int rightY = right.y();
+                     if (rightX > maxX)
+                         maxX = rightX;
+                     if (rightY > maxY)
+                         maxY = rightY;
+            }
+            int x = minX + ((maxX - minX)/2); 
+            int y = minY + ((maxY - minY)/2);
+            panel->setPos(x, y);
+
+            if (!k->targetIsIncluded) {
+                k->center = new TupEllipseItem(QRectF(QPointF(x - 1, y - 1), QSize(2, 2)));
+                k->target1 = new QGraphicsLineItem(x, y - 6, x, y + 6);
+                k->target2 = new QGraphicsLineItem(x - 6, y, x + 6, y);
+              
+                QPen pen(QColor(255, 0, 0), 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+                k->center->setPen(pen);
+                k->center->setBrush(QColor(255, 0, 0));
+                k->center->setZValue(k->baseZValue + 1);
+                k->scene->includeObject(k->center);
+
+                k->target1->setPen(pen); 
+                k->target1->setZValue(1000);
+                k->target2->setPen(pen);
+                k->target2->setZValue(1000);
+
+                k->scene->includeObject(k->target1);
+                k->scene->includeObject(k->target2);
+
+                k->targetIsIncluded = true;
+            } else {
+                QPoint current = k->center->mapToScene(k->center->boundingRect().topLeft()).toPoint(); 
+                int deltaX = x - current.x() - 1;
+                int deltaY = y - current.y() - 1;
+                k->center->moveBy(deltaX, deltaY);
+                k->target1->moveBy(deltaX, deltaY);
+                k->target2->moveBy(deltaX, deltaY);
+            }
+        }
+    }
+}
+
+void SelectionTool::updateItemPosition(int x, int y) 
+{
+    if (k->nodeManagers.count() == 1) {
+        NodeManager *manager = k->nodeManagers.first();
+        QGraphicsItem *item = manager->parentItem();
+        item->moveBy(x, y);
+        manager->syncNodesFromParent();
+    } else {
+        if (k->nodeManagers.count() > 1) {
+            foreach (NodeManager *node, k->nodeManagers) {
+                     QGraphicsItem *item = node->parentItem();
+                     item->moveBy(x, y);
+                     node->syncNodesFromParent();
+            }
+            k->center->moveBy(x, y);
+            k->target1->moveBy(x, y);
+            k->target2->moveBy(x, y);
+        }
+    }
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/selectiontool.h tupi-0.2+git05/src/plugins/tools/selection/selectiontool.h
--- tupi-0.2+git04/src/plugins/tools/selection/selectiontool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/selectiontool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,121 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SELECTIONTOOL_H
+#define SELECTIONTOOL_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "tuppathitem.h"
+#include "tupproject.h"
+#include "tupgraphicsscene.h"
+#include "settings.h"
+#include "tupprojectresponse.h"
+
+#include <QObject>
+#include <QPointF>
+#include <QKeySequence>
+#include <QList>
+#include <QGraphicsView>
+#include <QTimer>
+#include <cmath>
+
+class TupItemResponse;
+class NodeManager;
+
+/**
+ * @author Jorge Cuadrado
+*/
+
+class TUPI_PLUGIN SelectionTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "selectiontool.json")
+    
+    public:
+        SelectionTool();
+        virtual ~SelectionTool();
+        
+        virtual void init(TupGraphicsScene *scene);
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void keyPressEvent(QKeyEvent *event);
+        virtual void keyReleaseEvent(QKeyEvent *event);
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+
+        virtual QMap<QString, TAction *>actions() const;
+        
+        int toolType() const;
+        
+        virtual QWidget *configurator();
+        
+        virtual void aboutToChangeTool();
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        
+        virtual void itemResponse(const TupItemResponse *event);
+        virtual void saveConfig();
+        QCursor cursor() const;
+
+        void resizeNodes(qreal scaleFactor);
+        void updateZoomFactor(qreal scaleFactor);
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+
+    private slots:
+        void syncNodes();
+        void updateItems(TupGraphicsScene *scene);
+        void applyFlip(Settings::Flip flip);
+        void applyOrderAction(Settings::Order order);
+        void applyGroupAction(Settings::Group action);
+        void updateItemPosition(int x, int y);
+
+    private:
+        void setupActions();
+        bool selectionIsActive();
+        void reset(TupGraphicsScene *scene);
+        void updateItemPosition();
+
+        struct Private;
+        Private *const k;
+        Settings *panel;
+
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/selectiontool.json tupi-0.2+git05/src/plugins/tools/selection/selectiontool.json
--- tupi-0.2+git04/src/plugins/tools/selection/selectiontool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/selectiontool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "SelectionTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/settings.cpp tupi-0.2+git05/src/plugins/tools/selection/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/selection/settings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/settings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,315 @@
+/***************************************************************************
+
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "settings.h"
+#include "timagebutton.h"
+#include "tseparator.h"
+
+struct Settings::Private
+{
+    QWidget *tools;
+    QWidget *help;
+    QSpinBox *xPosField;
+    QSpinBox *yPosField;
+    QPushButton *tips;
+    int currentX;
+    int currentY;
+};
+
+Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+
+    k->tools = new QWidget(this);
+    QBoxLayout *toolsLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->tools);
+
+    QLabel *flips = new QLabel(tr("Flips"));
+    flips->setFont(QFont("Arial", 8, QFont::Normal, false));
+    flips->setAlignment(Qt::AlignHCenter);
+    toolsLayout->addWidget(flips);
+
+    QBoxLayout *buttonsLayout = new QBoxLayout(QBoxLayout::LeftToRight);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(0);
+
+    TImageButton *horizontalFlip = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() 
+                                                    + "horizontal_flip.png"), 22);
+    horizontalFlip->setToolTip(tr("Horizontal Flip"));
+    TImageButton *verticalFlip = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() 
+                                                  + "vertical_flip.png"), 22);
+    verticalFlip->setToolTip(tr("Vertical Flip"));
+    TImageButton *crossedFlip = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() 
+                                                 + "crossed_flip.png"), 22);
+    crossedFlip->setToolTip(tr("Crossed Flip"));
+    connect(horizontalFlip, SIGNAL(clicked()), this, SLOT(hFlip()));
+    connect(verticalFlip, SIGNAL(clicked()), this, SLOT(vFlip()));
+    connect(crossedFlip, SIGNAL(clicked()), this, SLOT(cFlip()));
+
+    buttonsLayout->addWidget(horizontalFlip);
+    buttonsLayout->addWidget(verticalFlip);
+    buttonsLayout->addWidget(crossedFlip);
+
+    toolsLayout->addLayout(buttonsLayout);
+
+    toolsLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    QLabel *order = new QLabel(tr("Order"));
+    order->setFont(QFont("Arial", 8, QFont::Normal, false));
+    order->setAlignment(Qt::AlignHCenter);
+    toolsLayout->addWidget(order);
+
+    QBoxLayout *orderButtonsLayout = new QBoxLayout(QBoxLayout::LeftToRight);
+    orderButtonsLayout->setMargin(0);
+    orderButtonsLayout->setSpacing(0);
+
+    TImageButton *toBack = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "to_back.png"), 22);
+    toBack->setToolTip(tr("Send object to back"));
+
+    TImageButton *toBackOneLevel = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "to_back_one.png"), 22);
+    toBackOneLevel->setToolTip(tr("Send object to back one level"));
+
+    TImageButton *toFront = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "to_front.png"), 22);
+    toFront->setToolTip(tr("Send object to front"));
+
+    TImageButton *toFrontOneLevel = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "to_front_one.png"), 22);
+    toFrontOneLevel->setToolTip(tr("Send object to front one level"));
+
+    connect(toBack, SIGNAL(clicked()), this, SLOT(sendToBack()));
+    connect(toBackOneLevel, SIGNAL(clicked()), this, SLOT(sendToBackOneLevel()));
+    connect(toFront, SIGNAL(clicked()), this, SLOT(sendToFront()));
+    connect(toFrontOneLevel, SIGNAL(clicked()), this, SLOT(sendToFrontOneLevel()));
+
+    orderButtonsLayout->addWidget(toBack);
+    orderButtonsLayout->addWidget(toBackOneLevel);
+    orderButtonsLayout->addWidget(toFront);
+    orderButtonsLayout->addWidget(toFrontOneLevel);
+
+    toolsLayout->addLayout(orderButtonsLayout);
+
+    toolsLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    // Group/Ungroup actions
+
+    QLabel *groupLayer = new QLabel(tr("Group"));
+    groupLayer->setFont(QFont("Arial", 8, QFont::Normal, false));
+    groupLayer->setAlignment(Qt::AlignHCenter);
+    toolsLayout->addWidget(groupLayer);
+
+    QBoxLayout *groupButtonsLayout = new QBoxLayout(QBoxLayout::LeftToRight);
+    groupButtonsLayout->setMargin(0);
+    groupButtonsLayout->setSpacing(0);
+
+    TImageButton *groupButton = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator()
+                                                 + "group.png"), 22);
+    groupButton->setToolTip(tr("Group Objects"));
+
+    TImageButton *ungroupButton = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator()
+                                                   + "ungroup.png"), 22);
+    ungroupButton->setToolTip(tr("Ungroup Objects"));
+
+    connect(groupButton, SIGNAL(clicked()), this, SLOT(groupItems()));
+    connect(ungroupButton, SIGNAL(clicked()), this, SLOT(ungroupItems()));
+
+    groupButtonsLayout->addWidget(groupButton);
+    groupButtonsLayout->addWidget(ungroupButton);
+
+    toolsLayout->addLayout(groupButtonsLayout);
+
+    toolsLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    QLabel *position = new QLabel(tr("Position"));
+    position->setFont(QFont("Arial", 8, QFont::Normal, false));
+    position->setAlignment(Qt::AlignHCenter);
+    toolsLayout->addWidget(position);
+
+    k->xPosField = new QSpinBox;
+    k->xPosField->setMinimum(-5000);
+    k->xPosField->setMaximum(5000);
+    connect(k->xPosField, SIGNAL(valueChanged(int)), this, SLOT(notifyXMovement(int))); 
+
+    k->yPosField = new QSpinBox;
+    k->yPosField->setMinimum(-5000);
+    k->yPosField->setMaximum(5000);
+    connect(k->yPosField, SIGNAL(valueChanged(int)), this, SLOT(notifyYMovement(int)));
+
+    k->xPosField->setEnabled(false);
+    k->yPosField->setEnabled(false);
+
+    toolsLayout->addWidget(k->xPosField);
+    toolsLayout->addWidget(k->yPosField);
+
+    toolsLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    mainLayout->addWidget(k->tools);
+
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
+    k->tips = new QPushButton(tr("Show Tips"));
+    k->tips->setToolTip(tr("A little help for the Selection tool")); 
+    k->tips->setFont(QFont("Arial", 8, QFont::Normal, false));
+    layout->addWidget(k->tips);
+    connect(k->tips, SIGNAL(clicked()), this, SLOT(openTipPanel())); 
+
+    mainLayout->addLayout(layout);
+
+    k->help = new QWidget(this);
+    k->help->hide();
+    QBoxLayout *helpLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->help);
+
+    QTextEdit *textArea = new QTextEdit; 
+
+    // SQA: Check this code with several screen resolutions. It must looks good with everyone! 
+    textArea->setFont(QFont("Arial", 8, QFont::Normal, false));
+    textArea->setHtml("<p><b>" + tr("Rotation mode") + ":</b> " + tr("Double click on any node or shortcut Alt + R") + "</p>"); 
+    textArea->append("<p><b>" + tr("Arrows") + ":</b> " +  tr("Movement on selection") + "</p>");
+    textArea->append("<p><b>" + tr("Shift + Arrows") + ":</b> " +  tr("Slow movement on selection") + "</p>");
+    textArea->append("<p><b>" + tr("Ctrl + Arrows") + ":</b> " +  tr("Fast movement on selection") + "</p>");
+    textArea->append("<p><b>" + tr("Shift + Left Mouse Button") + ":</b> " +  tr("Proportional scaling on selection") + "</p>");
+
+    QString text = textArea->document()->toPlainText();
+    int height = (text.length()*270)/200;
+    textArea->setFixedHeight(height);
+
+    helpLayout->addWidget(textArea); 
+
+    mainLayout->addWidget(k->help);
+    mainLayout->addStretch(2);
+}
+
+Settings::~Settings()
+{
+}
+
+void Settings::hFlip()
+{
+    emit callFlip(Settings::Horizontal);
+}
+
+void Settings::vFlip()
+{
+    emit callFlip(Settings::Vertical);
+}
+
+void Settings::cFlip()
+{
+    emit callFlip(Settings::Crossed);
+}
+
+void Settings::sendToBack()
+{
+    emit callOrderAction(Settings::ToBack);
+}
+
+void Settings::sendToBackOneLevel()
+{
+    emit callOrderAction(Settings::ToBackOneLevel);
+}
+
+void Settings::sendToFront()
+{
+    emit callOrderAction(Settings::ToFront);
+}
+
+void Settings::sendToFrontOneLevel()
+{
+    emit callOrderAction(Settings::ToFrontOneLevel);
+}
+
+void Settings::groupItems()
+{
+    emit callGroupAction(Settings::GroupItems);
+}
+
+void Settings::ungroupItems()
+{
+    emit callGroupAction(Settings::UngroupItems);
+}
+
+void Settings::openTipPanel() {
+    if (k->tools->isVisible()) {
+        k->tools->hide();
+        k->tips->setText(tr("Show Tools"));
+        k->tips->setToolTip(tr("Options panel for the Selection tool"));
+        k->help->show();
+    } else {
+        k->tools->show();
+        k->tips->setText(tr("Show Tips"));
+        k->tips->setToolTip(tr("A little help for the Selection tool"));
+        k->help->hide();
+    }
+}
+
+void Settings::setPos(int x, int y) {
+    if (!k->xPosField->isEnabled())
+        enablePositionControls(true);
+
+    k->xPosField->blockSignals(true);
+    k->yPosField->blockSignals(true);
+
+    k->xPosField->setValue(x);
+    k->yPosField->setValue(y);
+    k->currentX = x;
+    k->currentY = y;
+
+    k->xPosField->blockSignals(false);
+    k->yPosField->blockSignals(false);
+}
+
+void Settings::enablePositionControls(bool flag)
+{
+    if (!flag) {
+        k->xPosField->blockSignals(true);
+        k->yPosField->blockSignals(true);
+
+        k->xPosField->setValue(0);
+        k->yPosField->setValue(0);
+
+        k->xPosField->blockSignals(false);
+        k->yPosField->blockSignals(false);
+    }
+
+    k->xPosField->setEnabled(flag);
+    k->yPosField->setEnabled(flag);
+}
+
+void Settings::notifyXMovement(int x) {
+    emit updateItemPosition(x - k->currentX, 0);
+    k->currentX = k->xPosField->value();
+}
+
+void Settings::notifyYMovement(int y) {
+    emit updateItemPosition(0, y - k->currentY);
+    k->currentY = k->yPosField->value();
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/selection/settings.h tupi-0.2+git05/src/plugins/tools/selection/settings.h
--- tupi-0.2+git04/src/plugins/tools/selection/settings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selection/settings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,91 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include "tglobal.h"
+#include "tapplicationproperties.h"
+
+#include <QLabel>
+#include <QBoxLayout>
+#include <QTextEdit>
+#include <QSpinBox>
+#include <QDir>
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Settings : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        enum Flip { Vertical = 1, Horizontal, Crossed };
+        enum Order { ToBack = 0, ToFront, ToBackOneLevel, ToFrontOneLevel };
+        enum Group { GroupItems = 0, UngroupItems };
+
+        Settings(QWidget *parent = 0);
+        ~Settings();
+        void setPos(int x, int y);
+        void enablePositionControls(bool flag);
+
+     signals:
+        void callFlip(Settings::Flip flip);
+        void callOrderAction(Settings::Order action);
+        void callGroupAction(Settings::Group action);
+        void updateItemPosition(int x, int y);
+
+     private slots:
+        void vFlip();
+        void hFlip();
+        void cFlip();
+        void sendToBack();
+        void sendToBackOneLevel();
+        void sendToFront();
+        void sendToFrontOneLevel();
+        void openTipPanel();
+        void notifyXMovement(int x);
+        void notifyYMovement(int y);
+        void groupItems();
+        void ungroupItems();
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/node.cpp tupi-0.2+git05/src/plugins/tools/selecttool/node.cpp
--- tupi-0.2+git04/src/plugins/tools/selecttool/node.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/node.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,315 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "node.h"
-#include "tdebug.h"
-#include "nodemanager.h"
-#include "tupgraphicalgorithm.h"
-#include "tupgraphicobject.h"
-
-#include <cmath> //atan
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#include <QStyleOption>
-#include <QStyleOptionButton>
-#include <QApplication>
-#include <QCursor>
-
-/**
- * This class defines the data structure for a node, and all the methods required to manipulate it.
- * 
- * @author David Cuadrado
-*/
-
-struct Node::Private
-{
-    TypeNode typeNode;
-    ActionNode action;
-    bool notChange;
-    ActionNode generalState; 
-    QGraphicsItem *parent;
-    NodeManager *manager;
-    QSizeF size;
-};
-
-Node::Node(TypeNode node, ActionNode action, const QPointF &pos, NodeManager *manager, QGraphicsItem *parent, QGraphicsScene *scene, int zValue) : 
-           QGraphicsItem(0, scene), k(new Private)
-{
-    QGraphicsItem::setCursor(QCursor(Qt::PointingHandCursor));
-    setFlag(ItemIsSelectable, false);
-    setFlag(ItemIsMovable, true);
-    setFlag(ItemIsFocusable, true);
-    setPos(pos);
-
-    k->typeNode = node;
-    k->action = action;
-    k->manager = manager;
-    k->parent = parent;
-    k->size = QSizeF(10, 10);
-    k->generalState = Scale;
-
-    setZValue(zValue);
-}
-
-Node::~Node()
-{
-    delete k;
-}
-
-void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *w)
-{
-    Q_UNUSED(w);
-    Q_UNUSED(option);
-    
-    QColor color;
-   
-    if (k->typeNode != Center) {
-        if (k->action == Rotate) {
-            color = QColor(255, 102, 0);
-            color.setAlpha(180);
-        } else {
-            color = QColor("green");
-            color.setAlpha(200);
-        }
-    } else {
-        if (k->generalState == Scale) {
-            color = QColor(150, 150, 150);
-        } else {
-           color = QColor(255, 0, 0);
-        }
-        color.setAlpha(150);
-    }
-
-    QRectF square = boundingRect();
-    painter->setBrush(color);
-    painter->drawRoundRect(square);
-
-    /* SQA: Code for debugging purposes
-    #ifdef K_DEBUG
-        painter->setFont(QFont(painter->font().family(), 5));
-        painter->drawText(square, QString::number(k->typeNode));
-    #endif
-    */
-
-    if (k->typeNode == Center) {
-        painter->save();
-        color = QColor("white");
-        color.setAlpha(220);
-        painter->setPen(color);
-
-        QPointF point1 = QPointF(square.topLeft().x() + 2, square.topLeft().y() + 2);
-        QPointF point2 = QPointF(square.bottomRight().x() - 2, square.bottomRight().y() - 2);
-        QPointF point3 = QPointF(square.bottomLeft().x() + 2, square.bottomLeft().y() - 2);
-        QPointF point4 = QPointF(square.topRight().x() - 2, square.topRight().y() + 2);
-
-        painter->drawLine(point1, point2);
-        painter->drawLine(point3, point4);
-        painter->restore();
-    }
-}
-
-QRectF Node::boundingRect() const
-{
-    QRectF rect(QPointF(-k->size.width()/2, -k->size.height()/2), k->size);
-    return rect;
-}
-
-QVariant Node::itemChange(GraphicsItemChange change, const QVariant &value)
-{
-    /*
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-    */
-
-    if (change == ItemSelectedChange) {
-        setVisible(true);
-        if (value.toBool())
-            k->parent->setSelected(true);
-        k->manager->show();
-    }
-
-    return QGraphicsItem::itemChange(change, value);
-}
-
-void Node::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    k->manager->setPress(true);
-    QGraphicsItem::mousePressEvent(event);
-}
-
-void Node::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    QGraphicsItem::mouseReleaseEvent(event);
-    k->parent->setSelected(true);
-    k->manager->setPress(false);
-}
-
-void Node::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    QPointF newPos(event->scenePos());
-
-    if (k->notChange) {
-        k->notChange = false;
-    } else {
-        if (k->action == Scale) {
-            QRectF rect = k->parent->sceneBoundingRect();
-            QRectF parentRect  = k->parent->sceneBoundingRect();
-            QRectF parentSquare  = k->parent->boundingRect();
-            
-            // SQA: Lines for debugging purposes
-            /*
-            scene()->addRect(rect, QPen(Qt::red));
-            scene()->addRect(parentRect, QPen(Qt::green));
-            */
-            
-            switch (k->typeNode) {
-                    case TopLeft:
-                    {
-                         k->manager->setAnchor(parentSquare.bottomRight());
-                         rect.setTopLeft(newPos);
-                         break;
-                    }
-                    case TopRight:
-                    {
-                         k->manager->setAnchor(parentSquare.bottomLeft());
-                         rect.setTopRight(newPos);
-                         break;
-                    }
-                    case BottomRight:
-                    {
-                         k->manager->setAnchor(parentSquare.topLeft());
-                         rect.setBottomRight(newPos);
-                         break;
-                    }
-                    case BottomLeft:
-                    {
-                         k->manager->setAnchor(parentSquare.topRight());
-                         rect.setBottomLeft(newPos);
-                         break;
-                    }
-                    case Center:
-                    {
-                         break;
-                    }
-            };
-            
-            float sx = 1, sy = 1;
-            sx = static_cast<float>(rect.width()) / static_cast<float>(parentRect.width());
-            sy = static_cast<float>(rect.height()) / static_cast<float>(parentRect.height());
-
-            if (k->manager->proportionalScale()) {
-                k->manager->scale(sx, sx);
-            } else {
-                if (sx > 0 && sy > 0) {
-                    k->manager->scale(sx, sy);
-                } else {
-                    if (sx > 0)
-                        k->manager->scale(sx, 1);
-
-                    if (sy > 0)
-                        k->manager->scale(1, sy);
-                }
-            }
-        } else if (k->action == Rotate) {
-                   QPointF p1 = newPos;
-                   QPointF p2 = k->parent->sceneBoundingRect().center();
-                   k->manager->setAnchor(k->parent->boundingRect().center());
-                
-                   double a = (180 * TupGraphicalAlgorithm::angleForPos(p1, p2)) / M_PI;
-                   k->manager->rotate(a-45);
-        }
-    }
-
-    if (k->typeNode == Center) {
-        k->parent->moveBy(event->scenePos().x() - scenePos().x() , event->scenePos().y() - scenePos().y());
-        event->accept();
-    }
-}
-
-void Node::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    k->manager->toggleAction();
-    QGraphicsItem::mouseDoubleClickEvent(event);
-}
-
-int Node::typeNode() const
-{
-    return k->typeNode;
-}
-
-void Node::setAction(ActionNode action)
-{
-    if (k->typeNode != Center)
-        k->action = action;
-    else
-        k->action = Scale;
-
-    if (k->generalState == Scale)
-        k->generalState = Rotate;
-    else
-        k->generalState = Scale;
-
-    update();
-}
-
-int Node::actionNode()
-{
-    return k->action;
-}
-
-void Node::keyReleaseEvent(QKeyEvent *event)
-{
-    Q_UNUSED(event);
-    k->manager->setProportion(false);
-}
-
-void Node::resize(qreal factor)
-{
-    setScale(factor);
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/node.h tupi-0.2+git05/src/plugins/tools/selecttool/node.h
--- tupi-0.2+git04/src/plugins/tools/selecttool/node.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/node.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef NODE_H
-#define NODE_H
-
-#include <QGraphicsItem>
-#include <QObject>
-#include <QPointF>
-#include <QKeyEvent>
-
-class NodeManager;
-
-/**
- * @author Jorge Cuadrado 
-*/
-
-class Node : public QObject, public QGraphicsItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsItem)
-    
-    public:
-        enum TypeNode { TopLeft  = 0, TopRight, BottomLeft, BottomRight, Center };
-        enum ActionNode { NoAction = 0, Scale, Rotate };
-        
-        Node(TypeNode node, ActionNode action, const QPointF &pos=QPoint(0,0), NodeManager *manager=0, QGraphicsItem *parent=0, QGraphicsScene *scene=0, int zValue=0);
-        ~Node();
-        
-        void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *);
-        QRectF boundingRect() const;
-        void resize(qreal factor);
-        
-        void setAction(ActionNode action);
-        int actionNode();
-        
-        enum { Type = UserType + 1 };
-        int type() const { return Type; }
-        
-        int typeNode() const;
-
-    protected:
-        QVariant itemChange(GraphicsItemChange change, const QVariant &value);
-        void mousePressEvent(QGraphicsSceneMouseEvent *event);
-        void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-        void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
-        void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * event);
-        void keyReleaseEvent(QKeyEvent *event);
-        
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/nodemanager.cpp tupi-0.2+git05/src/plugins/tools/selecttool/nodemanager.cpp
--- tupi-0.2+git04/src/plugins/tools/selecttool/nodemanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/nodemanager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,252 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "nodemanager.h"
-#include "tupgraphicobject.h"
-#include "tdebug.h"
-
-/**
- * This class handles the methods required to manipulate a set of nodes.
- * 
- * @author Jorge Cuadrado
-*/
-
-NodeManager::NodeManager(QGraphicsItem * parent, QGraphicsScene  *scene, int zValue): 
-                         m_parent(parent), m_scene(scene), m_anchor(0,0), m_press(false), m_rotation(0)
-{
-    QRectF rect = parent->sceneBoundingRect();
-    Node *topLeft = new Node(Node::TopLeft, Node::Scale, rect.topLeft(), this, parent, scene, zValue);
-    Node *topRight = new Node(Node::TopRight, Node::Scale, rect.topRight(), this, parent, scene, zValue);
-    Node *bottomLeft = new Node(Node::BottomLeft,Node::Scale, rect.bottomLeft(),this, parent, scene, zValue);
-    Node *bottomRight = new Node(Node::BottomRight,Node::Scale, rect.bottomRight(),this, parent, scene, zValue);
-    Node *center = new Node(Node::Center, Node::Scale, rect.center(), this,parent, scene, zValue);
-
-    m_nodes.insert(Node::TopLeft, topLeft);
-    m_nodes.insert(Node::TopRight, topRight);
-    m_nodes.insert(Node::BottomLeft, bottomLeft);
-    m_nodes.insert(Node::BottomRight, bottomRight);
-    m_nodes.insert(Node::Center, center);
-
-    m_proportional = false;
-    
-    beginToEdit();
-}
-
-NodeManager::~NodeManager()
-{
-    clear();
-}
-
-void NodeManager::clear()
-{
-    foreach (Node *node, m_nodes) {
-             if (node) {
-                 if (QGraphicsScene *scene = node->scene())
-                     scene->removeItem(node);
-             }
-             delete node;
-             node = 0;
-    }
-    m_nodes.clear();
-}
-
-void NodeManager::syncNodes(const QRectF &rect)
-{
-    if (m_nodes.isEmpty())
-        return;
-    
-    QHash<Node::TypeNode, Node *>::iterator it = m_nodes.begin();
-    while (it != m_nodes.end()) {
-           if ((*it)) {
-               switch (it.key()) {
-                       case Node::TopLeft:
-                       {
-                            if ((*it)->scenePos() != rect.topLeft())
-                                (*it)->setPos(rect.topLeft());
-                            break;
-                       }
-                       case Node::TopRight:
-                       {
-                            if ((*it)->scenePos() != rect.topRight())
-                                (*it)->setPos(rect.topRight());
-                            break;
-                       }
-                       case Node::BottomRight:
-                       {
-                            if ((*it)->scenePos() != rect.bottomRight())
-                                (*it)->setPos(rect.bottomRight());
-                            break;
-                       }
-                       case Node::BottomLeft:
-                       {
-                            if ((*it)->scenePos() != rect.bottomLeft())
-                                (*it)->setPos(rect.bottomLeft() );
-                            break;
-                       }
-                       case Node::Center:
-                       {
-                            if ((*it)->scenePos() != rect.center())
-                                (*it)->setPos(rect.center());
-                            break;
-                       }
-               }
-           }
-           ++it;
-    }
-}
-
-void NodeManager::syncNodesFromParent()
-{
-    if (m_parent)
-        syncNodes(m_parent->sceneBoundingRect());
-}
-
-QGraphicsItem *NodeManager::parentItem() const
-{
-    return m_parent;
-}
-
-bool NodeManager::isModified() const
-{
-    return !((m_parent->matrix() == m_origMatrix) && (m_parent->pos() == m_origPos));
-}
-
-void NodeManager::beginToEdit()
-{
-    m_origMatrix = m_parent->matrix();
-    m_origPos = m_parent->pos();
-}
-
-void NodeManager::restoreItem()
-{
-    m_parent->setMatrix(m_origMatrix);
-    m_parent->setPos(m_origPos);
-}
-
-void NodeManager::setAnchor(const QPointF& point)
-{
-    m_anchor = point;
-}
-
-QPointF NodeManager::anchor() const
-{
-    return m_anchor;
-}
-
-void NodeManager::scale(float sx, float sy)
-{
-    QMatrix m;
-    m.translate(m_anchor.x(),m_anchor.y());
-    m.scale(sx,sy);
-    m.translate(-m_anchor.x(),-m_anchor.y());
-    m_parent->setMatrix(m, true);
-
-    syncNodesFromParent();
-}
-
-void NodeManager::rotate(double a)
-{
-    QMatrix m = m_parent->matrix();
-    m.translate(m_anchor.x(),m_anchor.y());
-    m.rotate(m_rotation-a);
-    m.translate(-m_anchor.x(),-m_anchor.y());
-    m_parent->setMatrix(m);
-    m_parent->setData(TupGraphicObject::Rotate, m_rotation - a);
-
-    syncNodesFromParent();
-    m_rotation = a;
-}
-
-void NodeManager::show()
-{
-    foreach (Node *node, m_nodes) {
-             if (!node->scene())
-                 m_scene->addItem(node);
-    }
-}
-
-void NodeManager::setPress(bool press)
-{
-    m_press = press;
-}
-
-bool NodeManager::isPress()
-{
-    return m_press;
-}
-
-void NodeManager::toggleAction()
-{
-    foreach (Node *node, m_nodes) {
-             if (node->actionNode() == Node::Scale) {
-                 node->setAction(Node::Rotate);
-             } else if (node->actionNode() == Node::Rotate) {
-                        node->setAction(Node::Scale);
-             }
-    }
-}
-
-void NodeManager::setActionNode(Node::ActionNode action)
-{
-    foreach (Node *node, m_nodes)
-             node->setAction(action);
-}
-
-void NodeManager::resizeNodes(qreal factor)
-{
-    foreach (Node *node, m_nodes)
-             node->resize(factor);
-}
-
-void NodeManager::setVisible(bool visible)
-{
-    foreach (Node *node, m_nodes)
-             node->setVisible(visible);
-}
-
-double NodeManager::rotation()
-{
-    return m_rotation;
-}
-
-void NodeManager::setProportion(bool flag)
-{
-    m_proportional = flag;
-}
-
-bool NodeManager::proportionalScale()
-{
-    return m_proportional;
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/nodemanager.h tupi-0.2+git05/src/plugins/tools/selecttool/nodemanager.h
--- tupi-0.2+git04/src/plugins/tools/selecttool/nodemanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/nodemanager.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef NODEMANAGER_H
-#define NODEMANAGER_H
-
-#include "node.h"
-
-#include <QHash>
-#include <QGraphicsItem>
-#include <QGraphicsScene>
-
-/**
- * @author Jorge Cuadrado
-*/
-
-class NodeManager : public QObject
-
-{
-    Q_OBJECT
-
-    public:
-        NodeManager(QGraphicsItem *parent, QGraphicsScene *scene, int zValue);
-        ~NodeManager();
-        void syncNodes(const QRectF &rect);
-        void syncNodesFromParent();
-        QGraphicsItem *parentItem() const;
-        bool isModified() const;
-        
-        void beginToEdit();
-        void restoreItem();
-        
-        void show();
-        
-        void setAnchor(const QPointF& point);
-        QPointF anchor() const;
-        
-        void scale(float sx, float sy);
-        void rotate(double a);
-        
-        void setPress(bool press);
-        bool isPress();
-        
-        void toggleAction();
-        
-        void setActionNode(Node::ActionNode action);
-        
-        void setVisible(bool visible);
-        
-        double rotation();
-
-        void setProportion(bool flag);
-        bool proportionalScale();
-        void clear();
-
-        void resizeNodes(qreal factor);
-
-    private:
-        QHash<Node::TypeNode, Node *> m_nodes;
-        QGraphicsItem *m_parent;
-        QGraphicsScene *m_scene;
-        
-        QMatrix m_origMatrix;
-        QPointF m_origPos;
-        QPointF m_anchor;
-        
-        bool m_press;
-        bool m_proportional;
-        double m_rotation;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/selecttool.cpp tupi-0.2+git05/src/plugins/tools/selecttool/selecttool.cpp
--- tupi-0.2+git04/src/plugins/tools/selecttool/selecttool.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/selecttool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,908 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "selecttool.h"
-#include "taction.h"
-#include "tdebug.h"
-#include "tglobal.h"
-#include "talgorithm.h"
-#include "tupgraphicalgorithm.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-#include "tupsvgitem.h"
-#include "tupellipseitem.h"
-#include "tupgraphicobject.h"
-#include "tupinputdeviceinformation.h"
-#include "tupgraphicsscene.h"
-#include "nodemanager.h"
-#include "tupserializer.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectresponse.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QList>
-#include <QGraphicsView>
-#include <QTimer>
-#include <cmath>
-
-struct SelectTool::Private
-{
-    QMap<QString, TAction *> actions;
-    QList<QGraphicsItem *> selectedObjects;
-    QList<NodeManager*> nodeManagers;
-    TupGraphicsScene *scene;
-    bool selectionFlag;
-    qreal scaleFactor;
-    qreal realFactor;
-    int baseZValue;
-    TupEllipseItem *center;
-    bool targetIsIncluded;
-};
-
-SelectTool::SelectTool(): k(new Private), panel(0)
-{
-    setupActions();
-}
-
-SelectTool::~SelectTool()
-{
-    delete k;
-}
-
-void SelectTool::init(TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFOX("tools");
-    #endif
- 
-    qDeleteAll(k->nodeManagers);
-    k->nodeManagers.clear();
-    k->scene = scene;
-    k->scene->clearSelection();
-    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
-    k->targetIsIncluded = false;
-
-    reset(scene);
-}
-
-void SelectTool::reset(TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFOX("tools");
-    #endif
-
-    foreach (QGraphicsView *view, scene->views()) {
-             view->setDragMode(QGraphicsView::RubberBandDrag);
-             foreach (QGraphicsItem *item, scene->items()) {
-                      // SQA: Temporary code for debugging issues
-                      /*
-                      QDomDocument dom;
-                      dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
-                      QDomElement root = dom.documentElement();
-                      tFatal() << "SelectTool::init() - XML: ";
-                      tFatal() << dom.toString();
-                      */
-
-                      if (!qgraphicsitem_cast<Node *>(item)) {
-                          if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                              if (item->zValue() >= 20000 && item->toolTip().length()==0) {
-                                  item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                              } else {
-                                  item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                                  item->setFlag(QGraphicsItem::ItemIsMovable, false);
-                              }
-                          } else {
-                              if (scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                                  item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                              } else if (scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
-                                         if (item->zValue() >= 10000) {
-                                             item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                                         } else {
-                                             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                                             item->setFlag(QGraphicsItem::ItemIsMovable, false);
-                                         }
-                              } else {
-                                  #ifdef K_DEBUG
-                                         tError() << "SelectTool::reset() - Fatal Error: Invalid spaceMode!";
-                                  #endif
-                                  return;
-                              }
-                          }
-                      }
-             }
-    }
-
-    panel->enablePositionControls(false);
-    if (k->targetIsIncluded) {
-        k->scene->removeItem(k->center);
-        k->targetIsIncluded = false;
-    }
-}
-
-QStringList SelectTool::keys() const
-{
-    return QStringList() << tr("Select");
-}
-
-void SelectTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(brushManager);
-
-    k->selectionFlag = false;
-
-    // If Control key is pressed / allow multiple selection 
-    if (input->keyModifiers() != Qt::ControlModifier) {
-        foreach (NodeManager *nodeManager, k->nodeManagers) {
-                 if (!nodeManager->isPress()) {
-                     nodeManager->parentItem()->setSelected(false);
-                     k->nodeManagers.removeAll(nodeManager);
-                     scene->drawCurrentPhotogram();
-                 } 
-        }
-    } 
-    
-    k->selectedObjects = scene->selectedItems();
-    
-    if (scene->currentFrame()->indexOf(scene->mouseGrabberItem()) != -1)
-        k->selectedObjects << scene->mouseGrabberItem();
-
-    foreach (QGraphicsItem *item, k->selectedObjects) {
-             if (item && dynamic_cast<TupAbstractSerializable* > (item)) {
-                 bool found = false;
-                 foreach (NodeManager *nodeManager, k->nodeManagers) {
-                          if (item == nodeManager->parentItem()) {
-                              found = true;
-                              break;
-                          }
-                 }
-            
-                 if (!found) {
-                     NodeManager *node = new NodeManager(item, scene, k->baseZValue);
-                     node->resizeNodes(k->realFactor);
-                     k->nodeManagers << node;
-                 }
-             }
-    }
-    
-    k->scene = scene;
-}
-
-void SelectTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(brushManager);
-
-    if (input->buttons() == Qt::LeftButton && scene->selectedItems().count() > 0)
-        QTimer::singleShot(0, this, SLOT(syncNodes()));
-}
-
-void SelectTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (k->scene->selectedItems().count() > 0) {
-        k->selectionFlag = true;
-        k->selectedObjects = k->scene->selectedItems();
-        QList<NodeManager *>::iterator it = k->nodeManagers.begin();
-        QList<NodeManager *>::iterator itEnd = k->nodeManagers.end();
-
-        while (it != itEnd) {
-               int parentIndex = k->scene->selectedItems().indexOf((*it)->parentItem());
-               if (parentIndex != -1)
-                   k->selectedObjects.removeAt(parentIndex);
-               else
-                   delete k->nodeManagers.takeAt(k->nodeManagers.indexOf((*it)));
-
-               ++it;
-        }
-
-        foreach (QGraphicsItem *item, k->selectedObjects) {
-                 if (item && dynamic_cast<TupAbstractSerializable* > (item)) {
-                     NodeManager *node = new NodeManager(item, scene, k->baseZValue);
-                     node->resizeNodes(k->realFactor);
-                     k->nodeManagers << node;
-                 }
-        }
-
-        foreach (NodeManager *node, k->nodeManagers) {
-                 if (node->isModified()) {
-                     QGraphicsItem *item = node->parentItem();
-                     QDomDocument doc;
-                     doc.appendChild(TupSerializer::properties(item, doc));
-                     int position = -1;
-                     TupLibraryObject::Type type;
-                     TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
-
-                     if (svg) {
-                         type = TupLibraryObject::Svg;
-                         if (k->scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                             position = k->scene->currentFrame()->indexOf(svg);
-                         } else {
-                             TupBackground *bg = k->scene->scene()->background();
-                             if (bg) {
-                                 if (k->scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
-                                     position = bg->staticFrame()->indexOf(svg);
-                                 } else if (k->scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                                     position = bg->dynamicFrame()->indexOf(svg);
-                                 } else {
-                                     #ifdef K_DEBUG
-                                            tError() << "SelectTool::release() - Fatal Error: Invalid spaceMode!";
-                                     #endif
-                                     return;
-                                 }
-                             } else {
-                                 #ifdef K_DEBUG
-                                        tError() << "SelectTool::release() - Fatal Error: Scene background object is NULL!";
-                                 #endif
-                                 return;
-                             }
-                         }
-                     } else {
-                         type = TupLibraryObject::Item;
-
-                         if (k->scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                             position = k->scene->currentFrame()->indexOf(node->parentItem());
-                         } else {
-                             TupBackground *bg = k->scene->scene()->background();
-                             if (bg) {
-                                 if (k->scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
-                                     position = bg->staticFrame()->indexOf(node->parentItem());
-                                 } else if (k->scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                                            position = bg->dynamicFrame()->indexOf(node->parentItem());
-                                 } else {
-                                     #ifdef K_DEBUG
-                                            tError() << "SelectTool::release() - Fatal Error: Invalid spaceMode!";
-                                     #endif
-                                     return;
-                                 }
-                             } else {
-                                 #ifdef K_DEBUG
-                                        tError() << "SelectTool::release() - Fatal Error: Scene background object is NULL!";
-                                 #endif
-                                 return;
-                             }
-                         }
-                     }
-
-                     if (position >= 0) {
-                         // Restore matrix
-                         // node->restoreItem();
-
-                         TupProjectRequest event = TupRequestBuilder::createItemRequest( 
-                                    k->scene->currentSceneIndex(), 
-                                    k->scene->currentLayerIndex(), 
-                                    k->scene->currentFrameIndex(), position, QPointF(), 
-                                    k->scene->spaceMode(), type,
-                                    TupProjectRequest::Transform, doc.toString());
-
-                         emit requested(&event);
-                     } else {
-                         #ifdef K_DEBUG
-                                tError() << "SelectTool::release() - Fatal Error: Invalid item position !!! [ " << position << " ]"; 
-                         #endif
-                     }
-                 }
-        }
-
-        updateItemPosition();
-    } else {
-        panel->enablePositionControls(false);
-        if (k->targetIsIncluded) {
-            k->scene->removeItem(k->center);
-            k->targetIsIncluded = false;
-        } 
-    }
-}
-
-void SelectTool::setupActions()
-{
-    k->selectionFlag = false;
-    k->scaleFactor = 1;
-    k->realFactor = 1;
-
-    TAction *select = new TAction(QPixmap(kAppProp->themeDir() + "icons/selection.png"), tr("Object Selection"), this);
-    select->setShortcut(QKeySequence(tr("O")));
-
-    k->actions.insert(tr("Select"), select);
-}
-
-QMap<QString, TAction *> SelectTool::actions() const
-{
-    return k->actions;
-}
-
-int SelectTool::toolType() const
-{
-    return TupToolInterface::Selection;
-}
-
-QWidget *SelectTool::configurator() 
-{
-    if (!panel) {
-        panel = new Settings;
-        connect(panel, SIGNAL(callFlip(Settings::Flip)), this, SLOT(applyFlip(Settings::Flip)));
-        connect(panel, SIGNAL(callOrderAction(Settings::Order)), this, SLOT(applyOrderAction(Settings::Order)));
-        connect(panel, SIGNAL(updateItemPosition(int, int)), this, SLOT(updateItemPosition(int, int)));
-    }
-
-    return panel;
-}
-
-void SelectTool::aboutToChangeScene(TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFOX("tools");
-    #endif
-
-    init(scene);
-}
-
-void SelectTool::aboutToChangeTool()
-{
-    #ifdef K_DEBUG
-           T_FUNCINFOX("tools");
-    #endif
-
-    qDeleteAll(k->nodeManagers);
-    k->nodeManagers.clear();
-
-    foreach (QGraphicsView *view, k->scene->views()) {
-             view->setDragMode (QGraphicsView::NoDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-void SelectTool::itemResponse(const TupItemResponse *event)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFOX("tools");
-    #endif
-
-    QGraphicsItem *item = 0;
-    TupScene *scene = 0;
-    TupLayer *layer = 0;
-    TupFrame *frame = 0;
-
-    TupProject *project = k->scene->scene()->project();
-    
-    if (project) {
-        scene = project->scene(event->sceneIndex());
-        if (scene) {
-            if (project->spaceContext() == TupProject::FRAMES_EDITION) {
-                layer = scene->layer(event->layerIndex());
-
-                if (layer) {
-                    frame = layer->frame(event->frameIndex());
-                    if (frame) {
-                        if (event->itemType() == TupLibraryObject::Svg && frame->svgItemsCount()>0) {
-                            item = frame->svg(event->itemIndex());
-                        } else if (frame->graphicItemsCount()>0) {
-                                   item = frame->item(event->itemIndex());
-                        }
-                    } else {
-                        #ifdef K_DEBUG
-                               tError() << "SelectTool::itemResponse - Fatal Error: frame is NULL"; 
-                        #endif
-                        return;
-                    }
-                } else {
-                    #ifdef K_DEBUG
-                           tError() << "SelectTool::itemResponse - Fatal Error: layer is NULL";
-                    #endif
-                    return;
-                }
-            } else if (project->spaceContext() == TupProject::STATIC_BACKGROUND_EDITION) {
-                       TupBackground *bg = scene->background();
-                       if (bg) {
-                           TupFrame *frame = bg->staticFrame();
-                           if (frame) {
-                               if (event->itemType() == TupLibraryObject::Svg && frame->svgItemsCount()>0) {
-                                   item = frame->svg(event->itemIndex());
-                               } else if (frame->graphicItemsCount()>0) {
-                                          item = frame->item(event->itemIndex());
-                               }
-                           } else {
-                               #ifdef K_DEBUG
-                                      tError() << "SelectTool::itemResponse - Fatal Error: Static bg frame is NULL";
-                               #endif
-                               return;
-                           }
-                       } else {
-                           #ifdef K_DEBUG
-                                  tError() << "SelectTool::itemResponse - Fatal Error: Scene background is NULL";
-                           #endif
-                           return;
-                       }
-            } else if (project->spaceContext() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                       TupBackground *bg = scene->background();
-                       if (bg) {
-                           TupFrame *frame = bg->dynamicFrame();
-                           if (frame) {
-                               if (event->itemType() == TupLibraryObject::Svg && frame->svgItemsCount()>0) {
-                                   item = frame->svg(event->itemIndex());
-                               } else if (frame->graphicItemsCount()>0) {
-                                          item = frame->item(event->itemIndex());
-                               }
-                           } else {
-                               #ifdef K_DEBUG
-                                      tError() << "SelectTool::itemResponse - Fatal Error: Dynamic bg frame is NULL";
-                               #endif
-                               return;
-                           }
-                       } else {
-                           #ifdef K_DEBUG
-                                  tError() << "SelectTool::itemResponse - Fatal Error: Scene background is NULL";
-                           #endif
-                           return;
-                       }
-            } else {
-                #ifdef K_DEBUG
-                       tError() << "SelectTool::itemResponse - Fatal Error: Invalid spaceMode!";
-                #endif
-                return;
-            }
-        } else {
-            #ifdef K_DEBUG
-                   tError() << "SelectTool::itemResponse - Fatal Error: Current scene is NULL!";
-            #endif
-            return;
-        }
-    } else {
-        #ifdef K_DEBUG
-               tError() << "SelectTool::itemResponse - Project does not exist";
-        #endif
-        return;
-    }
-
-    updateItemPosition();
-
-    switch (event->action()) {
-            case TupProjectRequest::Transform:
-            {
-                 if (item) {
-                     foreach (NodeManager* node, k->nodeManagers) {
-                              node->show();
-                              node->syncNodesFromParent();
-                              node->beginToEdit();
-                     }
-                 } else {
-                     #ifdef K_DEBUG
-                            tError() << "SelectTool::itemResponse - No item found";
-                     #endif
-                 }
-            }
-            break;
-            case TupProjectRequest::Move:
-            {
-                 k->nodeManagers.clear();
-
-                 foreach (QGraphicsItem *item, k->selectedObjects) {
-                          if (item && dynamic_cast<TupAbstractSerializable* > (item)) {
-                              NodeManager *node = new NodeManager(item, k->scene, k->baseZValue);
-                              node->resizeNodes(k->realFactor);
-                              k->nodeManagers << node;
-                          }
-                 }
-
-                 syncNodes();
-            }
-            break;
-            case TupProjectRequest::Remove:
-            {
-                 // Do nothing
-            }
-            break;
-            default:
-            {
-                 syncNodes();
-            }
-            break;
-    }
-}
-
-void SelectTool::syncNodes()
-{
-    foreach (NodeManager* node, k->nodeManagers) {
-             if (node) {
-                 node->show();
-                 if (node->parentItem()) {
-                     // node->parentItem()->setSelected(true);
-                     node->syncNodesFromParent();
-                 }
-             }
-    }
-}
-
-void SelectTool::saveConfig()
-{
-}
-
-void SelectTool::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
-        emit closeHugeCanvas();
-    } else if (event->modifiers() == Qt::AltModifier) {
-               if (event->key() == Qt::Key_R) {
-                   verifyActiveSelection();
-                   foreach (NodeManager *nodeManager, k->nodeManagers) {
-                            nodeManager->toggleAction();
-                            break;
-                   }
-               }
-    } else if ((event->key() == Qt::Key_Left) || (event->key() == Qt::Key_Up) 
-               || (event->key() == Qt::Key_Right) || (event->key() == Qt::Key_Down)) {
-
-               if (!k->selectionFlag) {
-                   QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-                   if (flags.first != -1 && flags.second != -1)
-                       emit callForPlugin(flags.first, flags.second);
-               } else {
-                   int delta = 5;
-
-                   if (event->modifiers()==Qt::ShiftModifier)
-                       delta = 1;
-
-                   if (event->modifiers()==Qt::ControlModifier)
-                       delta = 10;
-
-                   k->selectedObjects = k->scene->selectedItems();
-
-                   foreach (QGraphicsItem *item, k->selectedObjects) {
-                            if (event->key() == Qt::Key_Left)
-                                item->moveBy(-delta, 0);
-
-                            if (event->key() == Qt::Key_Up)
-                                item->moveBy(0, -delta);
-
-                            if (event->key() == Qt::Key_Right)
-                                item->moveBy(delta, 0);
-
-                            if (event->key() == Qt::Key_Down)
-                                item->moveBy(0, delta);
-
-                            QTimer::singleShot(0, this, SLOT(syncNodes()));
-                   }
-
-                   updateItemPosition();
-               }
-    } else if (event->modifiers() == Qt::ShiftModifier) {
-               verifyActiveSelection();
-               foreach (NodeManager *nodeManager, k->nodeManagers)
-                        nodeManager->setProportion(true);
-    } else {
-        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-        if (flags.first != -1 && flags.second != -1)
-            emit callForPlugin(flags.first, flags.second);
-    }
-}
-
-void SelectTool::verifyActiveSelection()
-{
-    if (k->scene) {
-        if (!k->selectionFlag)
-            return;
-    } else {
-        return;
-    }
-}
-
-// SQA: Check if reset() and updateItems can be defined as the same method 
-void SelectTool::updateItems(TupGraphicsScene *scene)
-{
-    foreach (QGraphicsView *view, scene->views()) {
-             view->setDragMode(QGraphicsView::RubberBandDrag);
-             foreach (QGraphicsItem *item, scene->items()) {
-                      if (!qgraphicsitem_cast<Node *>(item)) {
-                          if (scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                              if (item->zValue() >= 20000) {
-                                  item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                              } else {
-                                  item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                                  item->setFlag(QGraphicsItem::ItemIsMovable, false);
-                              }
-                          } else {
-                              if (scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                                  item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                              } else if (scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
-                                         if (item->zValue() >= 10000) {
-                                             item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                                         } else {
-                                             item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                                             item->setFlag(QGraphicsItem::ItemIsMovable, false);
-                                         }
-                              } else {
-                                  #ifdef K_DEBUG
-                                         tError() << "SelectTool::updateItems() - Fatal Error: Invalid spaceMode!";
-                                  #endif
-                              }
-                          }
-                      }
-             }
-    }
-}
-
-void SelectTool::applyFlip(Settings::Flip flip)
-{
-    k->selectedObjects = k->scene->selectedItems();
-
-    foreach (QGraphicsItem *item, k->selectedObjects) {
-             QRectF rect = item->sceneBoundingRect();
-             QPointF point = rect.topLeft();
-             QMatrix m;
-             m.translate(point.x(), point.y());
-
-             if (flip == Settings::Horizontal)
-                 m.scale(-1.0, 1.0);
-             else if (flip == Settings::Vertical)
-                      m.scale(1.0, -1.0);
-             else if (flip == Settings::Crossed)
-                      m.scale(-1.0, -1.0);
-
-             m.translate(-point.x(), -point.y());
-             item->setMatrix(m, true);
-             rect = item->sceneBoundingRect();
-             QPointF point2 = rect.topLeft();
-
-             QPointF result = point - point2;
-             item->moveBy(result.x(), result.y());
-
-             foreach (NodeManager *node, k->nodeManagers) {
-                      if (node->isModified()) {
-                          QDomDocument doc;
-                          doc.appendChild(TupSerializer::properties(item, doc));
-
-                          TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(node->parentItem());
-                          int position = -1;
-                          TupLibraryObject::Type type = TupLibraryObject::Item;;
-                          if (svg)
-                              type = TupLibraryObject::Svg;
-
-                          if (k->scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                              if (svg) 
-                                  position = k->scene->currentFrame()->indexOf(svg);
-                              else 
-                                  position = k->scene->currentFrame()->indexOf(node->parentItem());
-                          } else {
-                              TupBackground *bg = k->scene->scene()->background();
-                              if (bg) {
-                                  if (k->scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
-                                      if (svg)
-                                          position = bg->staticFrame()->indexOf(svg);
-                                      else
-                                          position = bg->staticFrame()->indexOf(node->parentItem());
-                                  } else if (k->scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                                             if (svg)
-                                                 position = bg->dynamicFrame()->indexOf(svg);
-                                             else
-                                                 position = bg->dynamicFrame()->indexOf(node->parentItem());
-                                  } else {
-                                      #ifdef K_DEBUG
-                                             tError() << "SelectTool::applyFlip() - Fatal Error: invalid spaceMode!";
-                                      #endif
-                                      return;
-                                  }
-                              } else {
-                                  #ifdef K_DEBUG
-                                         tError() << "SelectTool::applyFlip() - Fatal Error: Scene background object is NULL!";
-                                  #endif
-                                  return;
-                              }
-                          }
-
-                          TupProjectRequest event = TupRequestBuilder::createItemRequest(
-                                                   k->scene->currentSceneIndex(),
-                                                   k->scene->currentLayerIndex(),
-                                                   k->scene->currentFrameIndex(), position, QPointF(), 
-                                                   k->scene->spaceMode(), type,
-                                                   TupProjectRequest::Transform, doc.toString());
-                          emit requested(&event);
-                      }
-             }
-    }
-}
-
-void SelectTool::applyOrderAction(Settings::Order action)
-{
-    k->selectedObjects = k->scene->selectedItems();
-
-    foreach (QGraphicsItem *item, k->selectedObjects) {
-
-             TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
-             int position = -1;
-             TupLibraryObject::Type type = TupLibraryObject::Item;
-             if (svg)
-                 type = TupLibraryObject::Svg;
-
-             if (k->scene->spaceMode() == TupProject::FRAMES_EDITION) {
-                 if (svg)
-                      position = k->scene->currentFrame()->indexOf(svg);
-                 else
-                     position = k->scene->currentFrame()->indexOf(item);
-             } else {
-                 TupBackground *bg = k->scene->scene()->background();
-                 if (bg) {
-                     if (k->scene->spaceMode() == TupProject::STATIC_BACKGROUND_EDITION) {
-                         if (svg)
-                             position = bg->staticFrame()->indexOf(svg);
-                         else
-                             position = bg->staticFrame()->indexOf(item);
-                     } else if (k->scene->spaceMode() == TupProject::DYNAMIC_BACKGROUND_EDITION) {
-                                if (svg)
-                                    position = bg->dynamicFrame()->indexOf(svg);
-                                else
-                                    position = bg->dynamicFrame()->indexOf(item);
-                     } else {
-                         #ifdef K_DEBUG
-                                tError() << "SelectTool::applyOrderAction() - Fatal Error: invalid spaceMode!";
-                         #endif
-                         return;
-                     }
-                 } else {
-                     #ifdef K_DEBUG
-                            tError() << "SelectTool::applyOrderAction() - Fatal Error: Scene background object is NULL!";
-                     #endif
-                     return;
-                 }
-             }
-
-             TupProjectRequest event = TupRequestBuilder::createItemRequest(k->scene->currentSceneIndex(),
-                                       k->scene->currentLayerIndex(), k->scene->currentFrameIndex(), position, QPointF(),
-                                       k->scene->spaceMode(), type, TupProjectRequest::Move, action);
-             emit requested(&event);
-    }
-}
-
-QCursor SelectTool::cursor() const
-{
-    return QCursor(Qt::ArrowCursor);
-}
-
-void SelectTool::resizeNodes(qreal scaleFactor)
-{
-    k->scaleFactor *= scaleFactor;
-    updateRealZoomFactor();
-
-    foreach (NodeManager *node, k->nodeManagers)
-             node->resizeNodes(k->realFactor);
-}
-
-void SelectTool::updateZoomFactor(qreal globalFactor)
-{
-    k->scaleFactor = globalFactor;
-    updateRealZoomFactor();
-}
-
-void SelectTool::updateRealZoomFactor()
-{
-    if (k->scaleFactor <= 1)
-        k->realFactor = 1;
-    else if (k->scaleFactor > 1 && k->scaleFactor < 1.5)
-             k->realFactor = 0.8;
-    else if (k->scaleFactor >= 1.5 && k->scaleFactor < 2)
-             k->realFactor = 0.6;
-    else if (k->scaleFactor >= 2 && k->scaleFactor <= 3)
-             k->realFactor = 0.4;
-    else if (k->scaleFactor > 3)
-             k->realFactor = 0.3;
-    else if (k->scaleFactor > 4)
-             k->realFactor = 0.2;
-}
-
-void SelectTool::sceneResponse(const TupSceneResponse *event)
-{
-    if (event->action() == TupProjectRequest::Select)
-        reset(k->scene);
-}
-
-void SelectTool::updateItemPosition() {
-    if (k->nodeManagers.count() == 1) {
-        NodeManager *manager = k->nodeManagers.first();
-        QGraphicsItem *item = manager->parentItem();
-        QPoint point = item->mapToScene(item->boundingRect().center()).toPoint();
-        panel->setPos(point.x(), point.y());
-    } else { 
-      if (k->nodeManagers.count() > 1) {
-          NodeManager *manager = k->nodeManagers.first();
-          QGraphicsItem *item = manager->parentItem();
-          QPoint left = item->mapToScene(item->boundingRect().topLeft()).toPoint();  
-          QPoint right = item->mapToScene(item->boundingRect().bottomRight()).toPoint();
-          int minX = left.x();
-          int maxX = right.x(); 
-          int minY = left.y();
-          int maxY = right.y();
-
-          foreach (NodeManager *node, k->nodeManagers) {
-                   QGraphicsItem *item = node->parentItem();
-                   QPoint left = item->mapToScene(item->boundingRect().topLeft()).toPoint(); 
-                   int leftX = left.x();
-                   int leftY = left.y();
-                   if (leftX < minX)
-                       minX = leftX;
-                   if (leftY < minY)
-                       minY = leftY;
-                   QPoint right = item->mapToScene(item->boundingRect().bottomRight()).toPoint();  
-                   int rightX = right.x();
-                   int rightY = right.y();
-                   if (rightX > maxX)
-                       maxX = rightX;
-                   if (rightY > maxY)
-                       maxY = rightY;
-          }
-          int x = minX + ((maxX - minX)/2); 
-          int y = minY + ((maxY - minY)/2);
-          panel->setPos(x, y);
-
-          if (!k->targetIsIncluded) {
-              k->center = new TupEllipseItem(QRectF(QPointF(x, y), QSize(8, 8)));
-              QPen pen(QColor(255, 0, 0), 0.5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-              k->center->setPen(pen);
-              k->center->setBrush(QColor(255, 0, 0));
-              k->center->setZValue(k->baseZValue + 1);
-              k->scene->includeObject(k->center);
-
-              k->targetIsIncluded = true;
-          } else {
-              QPoint current = k->center->mapToScene(k->center->boundingRect().topLeft()).toPoint(); 
-              int deltaX = x - current.x();
-              int deltaY = y - current.y();
-              k->center->moveBy(deltaX, deltaY);
-          }
-      }
-    }
-}
-
-void SelectTool::updateItemPosition(int x, int y) {
-    if (k->nodeManagers.count() == 1) {
-        NodeManager *manager = k->nodeManagers.first();
-        QGraphicsItem *item = manager->parentItem();
-        item->moveBy(x, y);
-        manager->syncNodesFromParent();
-    } else {
-        if (k->nodeManagers.count() > 1) {
-            foreach (NodeManager *node, k->nodeManagers) {
-                     QGraphicsItem *item = node->parentItem();
-                     item->moveBy(x, y);
-                     node->syncNodesFromParent();
-            }
-            k->center->moveBy(x, y);
-        }
-    }
-}
-
-Q_EXPORT_PLUGIN2(tup_select, SelectTool);
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/selecttool.h tupi-0.2+git05/src/plugins/tools/selecttool/selecttool.h
--- tupi-0.2+git04/src/plugins/tools/selecttool/selecttool.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/selecttool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SELECTTOOL_H
-#define SELECTTOOL_H
-
-#include "tuptoolplugin.h"
-#include "tuppathitem.h"
-#include "tupproject.h"
-#include "tupgraphicsscene.h"
-#include "settings.h"
-#include "tupprojectresponse.h"
-
-#include <QObject>
-
-class TupItemResponse;
-class NodeManager;
-
-/**
- * @author Jorge Cuadrado
-*/
-
-class SelectTool : public TupToolPlugin
-{
-    Q_OBJECT
-    
-    public:
-        SelectTool();
-        virtual ~SelectTool();
-        
-        virtual void init(TupGraphicsScene *scene);
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void keyPressEvent(QKeyEvent *event);
-        virtual void sceneResponse(const TupSceneResponse *event);
-
-        virtual QMap<QString, TAction *>actions() const;
-        
-        int toolType() const;
-        
-        virtual QWidget *configurator();
-        
-        virtual void aboutToChangeTool();
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        
-        virtual void itemResponse(const TupItemResponse *event);
-        virtual void saveConfig();
-        QCursor cursor() const;
-
-        void resizeNodes(qreal scaleFactor);
-        void updateZoomFactor(qreal globalFactor);
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
-
-    private slots:
-        void syncNodes();
-        void updateItems(TupGraphicsScene *scene);
-        void applyFlip(Settings::Flip flip);
-        void applyOrderAction(Settings::Order order);
-        void updateItemPosition(int x, int y);
-
-    private:
-        void setupActions();
-        void verifyActiveSelection();
-        void updateRealZoomFactor();
-        void reset(TupGraphicsScene *scene);
-        void updateItemPosition();
-
-        struct Private;
-        Private *const k;
-        Settings *panel;
-
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/selecttool.json tupi-0.2+git05/src/plugins/tools/selecttool/selecttool.json
--- tupi-0.2+git04/src/plugins/tools/selecttool/selecttool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/selecttool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "SelectTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/selecttool.pro tupi-0.2+git05/src/plugins/tools/selecttool/selecttool.pro
--- tupi-0.2+git04/src/plugins/tools/selecttool/selecttool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/selecttool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/selecttool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += selecttool.h \
-           node.h \
-           nodemanager.h \ 
-           settings.h
-SOURCES += selecttool.cpp \
-           node.cpp \
-           nodemanager.cpp \ 
-           settings.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupiselecttool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/settings.cpp tupi-0.2+git05/src/plugins/tools/selecttool/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/selecttool/settings.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/settings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,283 +0,0 @@
-/***************************************************************************
-
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "settings.h"
-#include "timagebutton.h"
-#include "tseparator.h"
-#include "tglobal.h"
-#include "tdebug.h"
-
-#include <QBoxLayout>
-#include <QTextEdit>
-#include <QSpinBox>
-#include <QDir>
-
-struct Settings::Private
-{
-    QWidget *tools;
-    QWidget *help;
-    QSpinBox *xPosField;
-    QSpinBox *yPosField;
-    QPushButton *tips;
-    int currentX;
-    int currentY;
-};
-
-Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-
-    k->tools = new QWidget(this);
-    QBoxLayout *toolsLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->tools);
-
-    QLabel *flips = new QLabel(tr("Flips"));
-    flips->setFont(QFont("Arial", 8, QFont::Normal, false));
-    flips->setAlignment(Qt::AlignHCenter);
-    toolsLayout->addWidget(flips);
-
-    QBoxLayout *buttonsLayout = new QBoxLayout(QBoxLayout::LeftToRight);
-    buttonsLayout->setMargin(0);
-    buttonsLayout->setSpacing(0);
-
-    TImageButton *horizontalFlip = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() 
-                                                    + "horizontal_flip.png"), 22);
-    horizontalFlip->setToolTip(tr("Horizontal Flip"));
-    TImageButton *verticalFlip = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() 
-                                                  + "vertical_flip.png"), 22);
-    verticalFlip->setToolTip(tr("Vertical Flip"));
-    TImageButton *crossedFlip = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() 
-                                                 + "crossed_flip.png"), 22);
-    crossedFlip->setToolTip(tr("Crossed Flip"));
-    connect(horizontalFlip, SIGNAL(clicked()), this, SLOT(hFlip()));
-    connect(verticalFlip, SIGNAL(clicked()), this, SLOT(vFlip()));
-    connect(crossedFlip, SIGNAL(clicked()), this, SLOT(cFlip()));
-
-    buttonsLayout->addWidget(horizontalFlip);
-    buttonsLayout->addWidget(verticalFlip);
-    buttonsLayout->addWidget(crossedFlip);
-
-    toolsLayout->addLayout(buttonsLayout);
-
-    toolsLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    QLabel *order = new QLabel(tr("Order"));
-    order->setFont(QFont("Arial", 8, QFont::Normal, false));
-    order->setAlignment(Qt::AlignHCenter);
-    toolsLayout->addWidget(order);
-
-    QBoxLayout *orderButtonsLayout = new QBoxLayout(QBoxLayout::LeftToRight);
-    orderButtonsLayout->setMargin(0);
-    orderButtonsLayout->setSpacing(0);
-
-    TImageButton *toBack = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "to_back.png"), 22);
-    toBack->setToolTip(tr("Send object to back"));
-
-    TImageButton *toBackOneLevel = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "to_back_one.png"), 22);
-    toBackOneLevel->setToolTip(tr("Send object to back one level"));
-
-    TImageButton *toFront = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "to_front.png"), 22);
-    toFront->setToolTip(tr("Send object to front"));
-
-    TImageButton *toFrontOneLevel = new TImageButton(QPixmap(kAppProp->themeDir() + QDir::separator() + "icons" + QDir::separator() + "to_front_one.png"), 22);
-    toFrontOneLevel->setToolTip(tr("Send object to front one level"));
-
-    connect(toBack, SIGNAL(clicked()), this, SLOT(sendToBack()));
-    connect(toBackOneLevel, SIGNAL(clicked()), this, SLOT(sendToBackOneLevel()));
-    connect(toFront, SIGNAL(clicked()), this, SLOT(sendToFront()));
-    connect(toFrontOneLevel, SIGNAL(clicked()), this, SLOT(sendToFrontOneLevel()));
-
-    orderButtonsLayout->addWidget(toBack);
-    orderButtonsLayout->addWidget(toBackOneLevel);
-    orderButtonsLayout->addWidget(toFront);
-    orderButtonsLayout->addWidget(toFrontOneLevel);
-
-    toolsLayout->addLayout(orderButtonsLayout);
-
-    toolsLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    QLabel *position = new QLabel(tr("Position"));
-    position->setFont(QFont("Arial", 8, QFont::Normal, false));
-    position->setAlignment(Qt::AlignHCenter);
-    toolsLayout->addWidget(position);
-
-    k->xPosField = new QSpinBox;
-    k->xPosField->setMinimum(-5000);
-    k->xPosField->setMaximum(5000);
-    connect(k->xPosField, SIGNAL(valueChanged(int)), this, SLOT(notifyXMovement(int))); 
-
-    k->yPosField = new QSpinBox;
-    k->yPosField->setMinimum(-5000);
-    k->yPosField->setMaximum(5000);
-    connect(k->yPosField, SIGNAL(valueChanged(int)), this, SLOT(notifyYMovement(int)));
-
-    k->xPosField->setEnabled(false);
-    k->yPosField->setEnabled(false);
-
-    toolsLayout->addWidget(k->xPosField);
-    toolsLayout->addWidget(k->yPosField);
-
-    toolsLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    mainLayout->addWidget(k->tools);
-
-    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
-    k->tips = new QPushButton(tr("Show Tips"));
-    k->tips->setToolTip(tr("A little help for the Selection tool")); 
-    k->tips->setFont(QFont("Arial", 8, QFont::Normal, false));
-    layout->addWidget(k->tips);
-    connect(k->tips, SIGNAL(clicked()), this, SLOT(openTipPanel())); 
-
-    mainLayout->addLayout(layout);
-
-    k->help = new QWidget(this);
-    k->help->hide();
-    QBoxLayout *helpLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->help);
-
-    QTextEdit *textArea = new QTextEdit; 
-
-    // SQA: Check this code with several screen resolutions. It must looks good with everyone! 
-    textArea->setFont(QFont("Arial", 8, QFont::Normal, false));
-    textArea->setHtml("<p><b>" + tr("Rotation mode") + ":</b> " + tr("Double click on any node or shortcut Alt + R") + "</p>"); 
-    textArea->append("<p><b>" + tr("Arrows") + ":</b> " +  tr("Movement on selection") + "</p>");
-    textArea->append("<p><b>" + tr("Shift + Arrows") + ":</b> " +  tr("Slow movement on selection") + "</p>");
-    textArea->append("<p><b>" + tr("Ctrl + Arrows") + ":</b> " +  tr("Fast movement on selection") + "</p>");
-    textArea->append("<p><b>" + tr("Shift + Left Mouse Button") + ":</b> " +  tr("Proportional scaling on selection") + "</p>");
-
-    QString text = textArea->document()->toPlainText();
-    int height = (text.length()*270)/200;
-    textArea->setFixedHeight(height);
-
-    helpLayout->addWidget(textArea); 
-
-    mainLayout->addWidget(k->help);
-    mainLayout->addStretch(2);
-}
-
-Settings::~Settings()
-{
-}
-
-void Settings::hFlip()
-{
-    emit callFlip(Settings::Horizontal);
-}
-
-void Settings::vFlip()
-{
-    emit callFlip(Settings::Vertical);
-}
-
-void Settings::cFlip()
-{
-    emit callFlip(Settings::Crossed);
-}
-
-void Settings::sendToBack()
-{
-    emit callOrderAction(Settings::ToBack);
-}
-
-void Settings::sendToBackOneLevel()
-{
-    emit callOrderAction(Settings::ToBackOneLevel);
-}
-
-void Settings::sendToFront()
-{
-    emit callOrderAction(Settings::ToFront);
-}
-
-void Settings::sendToFrontOneLevel()
-{
-    emit callOrderAction(Settings::ToFrontOneLevel);
-}
-
-void Settings::openTipPanel() {
-    if (k->tools->isVisible()) {
-        k->tools->hide();
-        k->tips->setText(tr("Show Tools"));
-        k->tips->setToolTip(tr("Options panel for the Selection tool"));
-        k->help->show();
-    } else {
-        k->tools->show();
-        k->tips->setText(tr("Show Tips"));
-        k->tips->setToolTip(tr("A little help for the Selection tool"));
-        k->help->hide();
-    }
-}
-
-void Settings::setPos(int x, int y) {
-    if (!k->xPosField->isEnabled())
-        enablePositionControls(true);
-
-    k->xPosField->blockSignals(true);
-    k->yPosField->blockSignals(true);
-
-    k->xPosField->setValue(x);
-    k->yPosField->setValue(y);
-    k->currentX = x;
-    k->currentY = y;
-
-    k->xPosField->blockSignals(false);
-    k->yPosField->blockSignals(false);
-}
-
-void Settings::enablePositionControls(bool flag)
-{
-    if (!flag) {
-        k->xPosField->blockSignals(true);
-        k->yPosField->blockSignals(true);
-
-        k->xPosField->setValue(0);
-        k->yPosField->setValue(0);
-
-        k->xPosField->blockSignals(false);
-        k->yPosField->blockSignals(false);
-    }
-
-    k->xPosField->setEnabled(flag);
-    k->yPosField->setEnabled(flag);
-}
-
-void Settings::notifyXMovement(int x) {
-    emit updateItemPosition(x - k->currentX, 0);
-    k->currentX = k->xPosField->value();
-}
-
-void Settings::notifyYMovement(int y) {
-    emit updateItemPosition(0, y - k->currentY);
-    k->currentY = k->yPosField->value();
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/selecttool/settings.h tupi-0.2+git05/src/plugins/tools/selecttool/settings.h
--- tupi-0.2+git04/src/plugins/tools/selecttool/settings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/selecttool/settings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
-#include "tapplicationproperties.h"
-
-#include <QLabel>
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Settings : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        enum Flip { Vertical = 1, Horizontal, Crossed };
-        enum Order { ToBack = 0, ToFront, ToBackOneLevel, ToFrontOneLevel };
-
-        Settings(QWidget *parent = 0);
-        ~Settings();
-        void setPos(int x, int y);
-        void enablePositionControls(bool flag);
-
-     signals:
-        void callFlip(Settings::Flip flip);
-        void callOrderAction(Settings::Order action);
-        void updateItemPosition(int x, int y);
-
-     private slots:
-        void vFlip();
-        void hFlip();
-        void cFlip();
-        void sendToBack();
-        void sendToBackOneLevel();
-        void sendToFront();
-        void sendToFrontOneLevel();
-        void openTipPanel();
-        void notifyXMovement(int x);
-        void notifyYMovement(int y);
-
-    private:
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/shear/configurator.cpp tupi-0.2+git05/src/plugins/tools/shear/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/shear/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shear/configurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,315 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "configurator.h"
+#include "tweenmanager.h"
+#include "buttonspanel.h"
+#include "tupitemtweener.h"
+#include "tosd.h"
+
+struct Configurator::Private
+{
+    QBoxLayout *layout;
+    QBoxLayout *settingsLayout;
+    Settings *settingsPanel;
+    TweenManager *tweenManager;
+    ButtonsPanel *controlPanel;
+
+    TupItemTweener *currentTween;
+
+    int framesTotal; 
+    int currentFrame;
+
+    TupToolPlugin::Mode mode;
+    Configurator::GuiState state;
+};
+
+Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
+{
+    k->framesTotal = 1;
+    k->currentFrame = 0;
+
+    k->mode = TupToolPlugin::View;
+    k->state = Configurator::Manager;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+
+    QLabel *title = new QLabel(tr("Shear Tween"));
+    title->setAlignment(Qt::AlignHCenter);
+    title->setFont(QFont("Arial", 8, QFont::Bold));
+
+    k->layout->addWidget(title);
+
+    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
+    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    k->settingsLayout->setMargin(0);
+    k->settingsLayout->setSpacing(0);
+
+    setTweenManagerPanel();
+    setButtonsPanel();
+    setPropertiesPanel();
+
+    k->layout->addLayout(k->settingsLayout);
+    k->layout->addStretch(2);
+}
+
+Configurator::~Configurator()
+{
+    delete k;
+}
+
+void Configurator::loadTweenList(QList<QString> tweenList)
+{
+    k->tweenManager->loadTweenList(tweenList);
+    if (tweenList.count() > 0)
+        activeButtonsPanel(true);
+}
+
+void Configurator::setPropertiesPanel()
+{
+    k->settingsPanel = new Settings(this);
+
+    connect(k->settingsPanel, SIGNAL(initFrameChanged(int)), this, SIGNAL(initFrameChanged(int)));
+    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
+    connect(k->settingsPanel, SIGNAL(clickedDefineProperties()), this, SIGNAL(clickedDefineProperties()));
+    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
+    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
+
+    k->settingsLayout->addWidget(k->settingsPanel);
+
+    activePropertiesPanel(false);
+}
+
+void Configurator::activePropertiesPanel(bool enable)
+{
+    if (enable)
+        k->settingsPanel->show();
+    else
+        k->settingsPanel->hide();
+}
+
+void Configurator::setCurrentTween(TupItemTweener *currentTween)
+{
+    k->currentTween = currentTween;
+}
+
+void Configurator::setTweenManagerPanel()
+{
+    k->tweenManager = new TweenManager(this);
+    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
+    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
+
+    k->settingsLayout->addWidget(k->tweenManager);
+    k->state = Configurator::Manager;
+}
+
+void Configurator::activeTweenManagerPanel(bool enable)
+{
+    if (enable)
+        k->tweenManager->show();
+    else
+        k->tweenManager->hide();
+
+    if (k->tweenManager->listSize() > 0)
+        activeButtonsPanel(enable);
+}
+
+void Configurator::setButtonsPanel()
+{
+    k->controlPanel = new ButtonsPanel(this);
+    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
+    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
+
+    k->settingsLayout->addWidget(k->controlPanel);
+
+    activeButtonsPanel(false);
+}
+
+void Configurator::activeButtonsPanel(bool enable)
+{
+    if (enable)
+        k->controlPanel->show();
+    else
+        k->controlPanel->hide();
+}
+
+void Configurator::initStartCombo(int framesTotal, int currentFrame)
+{
+    k->framesTotal = framesTotal;
+    k->currentFrame = currentFrame;
+    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
+}
+
+void Configurator::setStartFrame(int currentIndex)
+{
+    k->currentFrame = currentIndex;
+    k->settingsPanel->setStartFrame(currentIndex);
+}
+
+int Configurator::startFrame()
+{
+    return k->settingsPanel->startFrame();
+}
+
+int Configurator::startComboSize()
+{
+    return k->settingsPanel->startComboSize();
+}
+
+QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
+{
+    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame, point);
+}
+
+int Configurator::totalSteps()
+{
+    return k->settingsPanel->totalSteps();
+}
+
+void Configurator::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->settingsPanel->activateMode(mode);
+}
+
+void Configurator::addTween(const QString &name)
+{
+    k->mode = TupToolPlugin::Add;
+    emit setMode(k->mode);
+
+    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
+    
+    activeTweenManagerPanel(false);
+    activePropertiesPanel(true);
+
+    k->state = Properties;
+
+    // emit setMode(k->mode);
+}
+
+void Configurator::editTween()
+{
+    k->mode = TupToolPlugin::Edit;
+    emit setMode(k->mode);
+
+    activeTweenManagerPanel(false);
+
+    // k->mode = TupToolPlugin::Edit;
+    k->state = Properties;
+
+    k->settingsPanel->notifySelection(true);
+    k->settingsPanel->setParameters(k->currentTween);
+    activePropertiesPanel(true);
+
+    // emit setMode(k->mode);
+}
+
+void Configurator::removeTween()
+{
+    QString name = k->tweenManager->currentTweenName();
+    k->tweenManager->removeItemFromList();
+
+    removeTween(name);
+}
+
+void Configurator::removeTween(const QString &name)
+{
+    if (k->tweenManager->listSize() == 0)
+        activeButtonsPanel(false);
+
+    emit clickedRemoveTween(name);
+}
+
+QString Configurator::currentTweenName() const
+{
+    QString oldName = k->tweenManager->currentTweenName();
+    QString newName = k->settingsPanel->currentTweenName();
+
+    if (oldName.compare(newName) != 0)
+        k->tweenManager->updateTweenName(newName);
+
+    return newName;
+}
+
+void Configurator::notifySelection(bool flag)
+{
+    k->settingsPanel->notifySelection(flag);
+}
+
+void Configurator::closeTweenProperties()
+{
+    if (k->mode == TupToolPlugin::Add)
+        k->tweenManager->removeItemFromList();
+
+    emit clickedResetInterface();
+    closeSettingsPanel();
+}
+
+void Configurator::closeSettingsPanel()
+{
+    if (k->state == Configurator::Properties) {
+        activeTweenManagerPanel(true);
+        activePropertiesPanel(false);
+        k->mode = TupToolPlugin::View;
+        k->state = Configurator::Manager;
+    } // else {
+        // k->settingsPanel->activateMode(TupToolPlugin::Properties);
+    // }
+}
+
+TupToolPlugin::Mode Configurator::mode()
+{
+    return k->mode;
+}
+
+void Configurator::applyItem()
+{
+    k->mode = TupToolPlugin::Edit;
+    emit clickedApplyTween();
+}
+
+void Configurator::resetUI()
+{
+    k->tweenManager->resetUI();
+    closeSettingsPanel();
+    k->settingsPanel->notifySelection(false);
+}
+
+void Configurator::updateTweenData(const QString &name)
+{
+    emit getTweenData(name);
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/shear/configurator.h tupi-0.2+git05/src/plugins/tools/shear/configurator.h
--- tupi-0.2+git04/src/plugins/tools/shear/configurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shear/configurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,114 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef CONFIGURATOR_H
+#define CONFIGURATOR_H
+
+#include "tglobal.h"
+#include "settings.h"
+
+#include <QFrame>
+#include <QLabel>
+#include <QBoxLayout>
+#include <QGraphicsPathItem>
+#include <QListWidgetItem>
+
+// class QGraphicsPathItem;
+// class QListWidgetItem;
+class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Configurator : public QFrame
+{
+    Q_OBJECT
+
+    public:
+        enum GuiState { Manager = 1, Properties };
+
+        Configurator(QWidget *parent = 0);
+        ~Configurator();
+
+        void loadTweenList(QList<QString> tweenList);
+
+        void initStartCombo(int framesTotal, int currentFrame);
+        void setStartFrame(int currentIndex);
+
+        int totalSteps();
+        void activateMode(TupToolPlugin::EditMode mode);
+        void setCurrentTween(TupItemTweener *currentTween);
+        QString currentTweenName() const;
+        void notifySelection(bool flag);
+        int startFrame();
+        int startComboSize();
+        void closeSettingsPanel();
+        TupToolPlugin::Mode mode();
+        void resetUI();
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
+        
+    private slots:
+        void applyItem();
+        void addTween(const QString &name);
+        void editTween();
+        void removeTween();
+        void removeTween(const QString &name);
+        void closeTweenProperties();
+        void updateTweenData(const QString &name);
+        
+    signals:
+        void initFrameChanged(int index);
+        void clickedSelect();
+        void clickedDefineProperties();
+        void clickedRemoveTween(const QString &name);
+        void setMode(TupToolPlugin::Mode mode);
+        void clickedApplyTween();
+        void clickedResetInterface();
+        void getTweenData(const QString &name);
+        
+    private:
+        void setPropertiesPanel();
+        void activePropertiesPanel(bool enable);
+        void setTweenManagerPanel();
+        void activeTweenManagerPanel(bool enable);
+        void setButtonsPanel();
+        void activeButtonsPanel(bool enable);
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/shear/settings.cpp tupi-0.2+git05/src/plugins/tools/shear/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/shear/settings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shear/settings.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,567 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "settings.h"
+#include "tradiobuttongroup.h"
+#include "tupitemtweener.h"
+#include "tuptweenerstep.h"
+#include "timagebutton.h"
+#include "tseparator.h"
+#include "tosd.h"
+
+struct Settings::Private
+{
+    QWidget *innerPanel;
+    QWidget *rangePanel;
+    QWidget *clockPanel;
+
+    QBoxLayout *layout;
+    TupToolPlugin::Mode mode;
+    QLineEdit *input;
+    TRadioButtonGroup *options;
+
+    QSpinBox *comboInit;
+    QSpinBox *comboEnd;
+
+    QLabel *totalLabel;
+    int totalSteps;
+
+    TupItemTweener::TransformAxes shearAxes;
+    QComboBox *comboAxes;
+
+    QDoubleSpinBox *comboFactor;
+    QSpinBox *comboIterations;
+
+    QCheckBox *loopBox;
+    QCheckBox *reverseLoopBox;
+
+    bool selectionDone;
+    bool propertiesDone;
+
+    TImageButton *apply;
+    TImageButton *remove;
+};
+
+Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
+{
+    k->shearAxes = TupItemTweener::XY;
+    k->selectionDone = false;
+    k->totalSteps = 0;
+
+    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    setFont(QFont("Arial", 8, QFont::Normal, false));
+
+    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
+    k->input = new QLineEdit;
+
+    QHBoxLayout *nameLayout = new QHBoxLayout;
+    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    nameLayout->setMargin(0);
+    nameLayout->setSpacing(0);
+    nameLayout->addWidget(nameLabel);
+    nameLayout->addWidget(k->input);
+
+    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
+    k->options->addItem(tr("Select object"), 0);
+    k->options->addItem(tr("Set Properties"), 1);
+    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
+
+    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
+    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
+
+    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
+    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    buttonsLayout->setMargin(0);
+    buttonsLayout->setSpacing(10);
+    buttonsLayout->addWidget(k->apply);
+    buttonsLayout->addWidget(k->remove);
+
+    k->layout->addLayout(nameLayout);
+    k->layout->addWidget(k->options);
+
+    setInnerForm();
+
+    k->layout->addSpacing(10);
+    k->layout->addLayout(buttonsLayout);
+    k->layout->setSpacing(5);
+
+    activateMode(TupToolPlugin::Selection);
+}
+
+Settings::~Settings()
+{
+    delete k;
+}
+
+void Settings::setInnerForm()
+{
+    k->innerPanel = new QWidget;
+
+    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
+    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+
+    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
+    startingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboInit = new QSpinBox;
+    k->comboInit->setEnabled(false);
+    k->comboInit->setMaximum(999);
+    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(updateLastFrame()));
+
+    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
+    endingLabel->setAlignment(Qt::AlignVCenter);
+
+    k->comboEnd = new QSpinBox;
+    k->comboEnd->setEnabled(true);
+    k->comboEnd->setValue(1);
+    k->comboEnd->setMaximum(999);
+    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
+
+    QHBoxLayout *startLayout = new QHBoxLayout;
+    startLayout->setAlignment(Qt::AlignHCenter);
+    startLayout->setMargin(0);
+    startLayout->setSpacing(0);
+    startLayout->addWidget(startingLabel);
+    startLayout->addWidget(k->comboInit);
+
+    QHBoxLayout *endLayout = new QHBoxLayout;
+    endLayout->setAlignment(Qt::AlignHCenter);
+    endLayout->setMargin(0);
+    endLayout->setSpacing(0);
+    endLayout->addWidget(endingLabel);
+    endLayout->addWidget(k->comboEnd);
+
+    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
+    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    QHBoxLayout *totalLayout = new QHBoxLayout;
+    totalLayout->setAlignment(Qt::AlignHCenter);
+    totalLayout->setMargin(0);
+    totalLayout->setSpacing(0);
+    totalLayout->addWidget(k->totalLabel);
+
+    k->comboAxes = new QComboBox();
+    k->comboAxes->addItem(tr("Width & Height"));
+    k->comboAxes->addItem(tr("Only Width"));
+    k->comboAxes->addItem(tr("Only Height"));
+    QLabel *axesLabel = new QLabel(tr("Shear in") + ": ");
+    axesLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *axesLayout = new QHBoxLayout;
+    axesLayout->setAlignment(Qt::AlignHCenter);
+    axesLayout->setMargin(0);
+    axesLayout->setSpacing(0);
+    axesLayout->addWidget(axesLabel);
+    axesLayout->addWidget(k->comboAxes);
+
+    k->comboFactor = new QDoubleSpinBox;
+    k->comboFactor->setMinimum(-9.0);
+    k->comboFactor->setMaximum(9.0);
+    k->comboFactor->setDecimals(2);
+    k->comboFactor->setSingleStep(0.05);
+    k->comboFactor->setValue(0.10);
+
+    QLabel *speedLabel = new QLabel(tr("Scaling Factor") + ": ");
+    speedLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *speedLayout = new QHBoxLayout;
+    speedLayout->setAlignment(Qt::AlignHCenter);
+    speedLayout->setMargin(0);
+    speedLayout->setSpacing(0);
+    speedLayout->addWidget(speedLabel);
+    speedLayout->addWidget(k->comboFactor);
+
+    k->comboIterations = new QSpinBox;
+    k->comboIterations->setEnabled(true);
+    k->comboIterations->setMinimum(1);
+
+    QLabel *iterationsLabel = new QLabel(tr("Iterations") + ": ");
+    iterationsLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    QHBoxLayout *iterationsLayout = new QHBoxLayout;
+    iterationsLayout->setAlignment(Qt::AlignHCenter);
+    iterationsLayout->setMargin(0);
+    iterationsLayout->setSpacing(0);
+    iterationsLayout->addWidget(iterationsLabel);
+    iterationsLayout->addWidget(k->comboIterations);
+
+    k->loopBox = new QCheckBox(tr("Loop"), k->innerPanel);
+    connect(k->loopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
+
+    QVBoxLayout *loopLayout = new QVBoxLayout;
+    loopLayout->setAlignment(Qt::AlignHCenter);
+    loopLayout->setMargin(0);
+    loopLayout->setSpacing(0);
+    loopLayout->addWidget(k->loopBox);
+
+    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->innerPanel);
+    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateLoopCheckbox(int)));
+
+    QVBoxLayout *reverseLayout = new QVBoxLayout;
+    reverseLayout->setAlignment(Qt::AlignHCenter);
+    reverseLayout->setMargin(0);
+    reverseLayout->setSpacing(0);
+    reverseLayout->addWidget(k->reverseLoopBox);
+
+    innerLayout->addLayout(startLayout);
+    innerLayout->addLayout(endLayout);
+    innerLayout->addLayout(totalLayout);
+
+    innerLayout->addSpacing(15);
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    innerLayout->addLayout(axesLayout);
+    innerLayout->addLayout(speedLayout);
+    innerLayout->addLayout(iterationsLayout);
+    innerLayout->addLayout(loopLayout);
+    innerLayout->addLayout(reverseLayout);
+
+    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
+
+    k->layout->addWidget(k->innerPanel);
+
+    activeInnerForm(false);
+}
+
+void Settings::activeInnerForm(bool enable)
+{
+    if (enable && !k->innerPanel->isVisible()) {
+        k->propertiesDone = true;
+        k->innerPanel->show();
+    } else {
+        k->propertiesDone = false;
+        k->innerPanel->hide();
+    }
+}
+
+// Adding new Tween
+
+void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
+{
+    k->mode = TupToolPlugin::Add;
+    k->input->setText(name);
+
+    k->comboInit->setEnabled(false);
+    activateMode(TupToolPlugin::Selection);
+    k->apply->setToolTip(tr("Save Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
+    k->remove->setToolTip(tr("Cancel Tween"));
+
+    initStartCombo(framesTotal, initFrame);
+}
+
+// Editing new Tween
+
+void Settings::setParameters(TupItemTweener *currentTween)
+{
+    setEditMode();
+    activateMode(TupToolPlugin::Properties);
+
+    k->input->setText(currentTween->name());
+
+    k->comboInit->setEnabled(true);
+    k->comboInit->setValue(currentTween->initFrame() + 1);
+    k->comboEnd->setValue(currentTween->initFrame() + currentTween->frames());
+
+    checkFramesRange();
+
+    k->comboAxes->setCurrentIndex(currentTween->tweenShearAxes());
+    k->comboFactor->setValue(currentTween->tweenShearFactor());
+    k->comboIterations->setValue(currentTween->tweenShearIterations());
+    k->loopBox->setChecked(currentTween->tweenShearLoop());
+    k->reverseLoopBox->setChecked(currentTween->tweenShearReverseLoop());
+}
+
+void Settings::initStartCombo(int framesTotal, int currentIndex)
+{
+    k->comboInit->clear();
+    k->comboEnd->clear();
+
+    k->comboInit->setMinimum(1);
+    k->comboInit->setMaximum(framesTotal);
+    k->comboInit->setValue(currentIndex + 1);
+
+    k->comboEnd->setMinimum(1);
+    k->comboEnd->setValue(framesTotal);
+}
+
+void Settings::setStartFrame(int currentIndex)
+{
+    k->comboInit->setValue(currentIndex + 1);
+    int end = k->comboEnd->value();
+    if (end < currentIndex+1)
+        k->comboEnd->setValue(currentIndex + 1);
+}
+
+int Settings::startFrame()
+{
+    return k->comboInit->value() - 1;
+}
+
+int Settings::startComboSize()
+{
+    return k->comboInit->maximum();
+}
+
+int Settings::totalSteps()
+{
+    return k->comboEnd->value() - (k->comboInit->value() - 1);
+}
+
+void Settings::setEditMode()
+{
+    k->mode = TupToolPlugin::Edit;
+    k->apply->setToolTip(tr("Update Tween"));
+    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
+    k->remove->setToolTip(tr("Close Tween properties"));
+}
+
+void Settings::applyTween()
+{
+    if (!k->selectionDone) {
+        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
+        return;
+    }
+
+    if (!k->propertiesDone) {
+        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
+        return;
+    }
+
+    // SQA: Verify whether tween is really well applied before call setEditMode!
+    setEditMode();
+
+    if (!k->comboInit->isEnabled())
+        k->comboInit->setEnabled(true);
+
+    emit clickedApplyTween();
+}
+
+void Settings::notifySelection(bool flag)
+{
+    k->selectionDone = flag;
+}
+
+QString Settings::currentTweenName() const
+{
+    QString tweenName = k->input->text();
+    if (tweenName.length() > 0)
+        k->input->setFocus();
+
+    return tweenName;
+}
+
+void Settings::emitOptionChanged(int option)
+{
+    switch (option) {
+            case 0:
+             {
+                 activeInnerForm(false);
+                 emit clickedSelect();
+             }
+            break;
+            case 1:
+             {
+                 if (k->selectionDone) {
+                     activeInnerForm(true);
+                     emit clickedDefineProperties();
+                 } else {
+                     k->options->setCurrentIndex(0);
+                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
+                 }
+             }
+    }
+}
+
+QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
+{
+    QDomDocument doc;
+
+    QDomElement root = doc.createElement("tweening");
+    root.setAttribute("name", currentTweenName());
+    root.setAttribute("type", TupItemTweener::Shear);
+    root.setAttribute("initFrame", currentFrame);
+    root.setAttribute("initLayer", currentLayer);
+    root.setAttribute("initScene", currentScene);
+   
+    checkFramesRange();
+    root.setAttribute("frames", k->totalSteps);
+    root.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
+    k->shearAxes = TupItemTweener::TransformAxes(k->comboAxes->currentIndex());
+    root.setAttribute("shearAxes", k->shearAxes);
+
+    double factor = k->comboFactor->value();
+    root.setAttribute("shearFactor", factor);
+
+    int iterations = k->comboIterations->value();
+    if (iterations == 0) {
+        iterations = 1;
+        k->comboIterations->setValue(1);
+    }
+    root.setAttribute("shearIterations", iterations);
+
+    bool loop = k->loopBox->isChecked();
+    if (loop)
+        root.setAttribute("shearLoop", "1");
+    else
+        root.setAttribute("shearLoop", "0");
+
+    bool reverse = k->reverseLoopBox->isChecked();
+    if (reverse)
+        root.setAttribute("shearReverseLoop", "1");
+    else
+        root.setAttribute("shearReverseLoop", "0");
+
+    double factorX = 1.0;
+    double factorY = 1.0;
+    double shearX = 1.0;
+    double shearY = 1.0;
+
+    if (k->shearAxes == TupItemTweener::XY) {
+        factorX = factor;
+        factorY = factor;
+    } else if (k->shearAxes == TupItemTweener::X) {
+               factorX = factor;
+    } else {
+        factorY = factor;
+    }
+
+    int cycle = 1;
+    int reverseTop = (iterations*2)-2;
+
+    for (int i=0; i < k->totalSteps; i++) {
+         if (cycle <= iterations) {
+             if (cycle == 1) {
+                 shearX = 0;
+                 shearY = 0;
+             } else {
+                 shearX += factorX;
+                 shearY += factorY;
+             }
+             cycle++;
+         } else {
+             // if repeat option is enabled
+             if (loop) {
+                 cycle = 2;
+                 shearX = 0;
+                 shearY = 0;
+             } else if (reverse) { // if reverse option is enabled
+                        shearX -= factorX;
+                        shearY -= factorY;
+
+                        if (cycle < reverseTop)
+                            cycle++;
+                        else
+                            cycle = 1;
+
+             } else { // If cycle is done and no loop and no reverse
+                 shearX = 0;
+                 shearY = 0;
+             }
+         }
+
+         TupTweenerStep *step = new TupTweenerStep(i);
+         step->setShear(shearX, shearY);
+         root.appendChild(step->toXml(doc));
+    }
+
+    doc.appendChild(root);
+
+    return doc.toString();
+}
+
+void Settings::activateMode(TupToolPlugin::EditMode mode)
+{
+    k->options->setCurrentIndex(mode);
+}
+
+/*
+void Settings::checkBottomLimit(int index)
+{
+    if (index >= 0) {
+        emit initFrameChanged(index);
+        checkFramesRange();
+    }
+}
+*/
+
+void Settings::checkTopLimit(int index)
+{
+    Q_UNUSED(index);
+    checkFramesRange();
+}
+
+void Settings::updateLastFrame()
+{
+    int end = k->comboInit->value() + k->totalSteps - 1;
+    k->comboEnd->setValue(end);
+}
+
+void Settings::checkFramesRange()
+{
+    int begin = k->comboInit->value();
+    int end = k->comboEnd->value();
+
+    if (begin > end) {
+        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
+        end = k->comboEnd->value();
+    }
+
+    k->totalSteps = end - begin + 1;
+    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
+}
+
+void Settings::updateLoopCheckbox(int state)
+{
+    Q_UNUSED(state);
+
+    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
+        k->loopBox->setChecked(false);
+}
+
+void Settings::updateReverseCheckbox(int state)
+{
+    Q_UNUSED(state);
+
+    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
+        k->reverseLoopBox->setChecked(false);
+}
+
+void Settings::updateTotalSteps(const QString &text)
+{
+    Q_UNUSED(text);
+    checkFramesRange();
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/shear/settings.h tupi-0.2+git05/src/plugins/tools/shear/settings.h
--- tupi-0.2+git04/src/plugins/tools/shear/settings.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shear/settings.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,107 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustav Gonzalez / xtingray                                           *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+
+#include <QWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QBoxLayout>
+#include <QComboBox>
+#include <QSpinBox>
+#include <QDoubleSpinBox>
+#include <QCheckBox>
+#include <QDir>
+
+class TupItemTweener;
+
+/**
+ * @author Gustav Gonzalez 
+*/
+
+class TUPI_PLUGIN Settings : public QWidget 
+{
+    Q_OBJECT
+
+    public:
+        Settings(QWidget *parent = 0);
+        ~Settings();
+
+        void setParameters(const QString &name, int framesTotal, int startFrame);
+        void setParameters(TupItemTweener *currentTween);
+        void initStartCombo(int totalFrames, int currentIndex);
+        void setStartFrame(int currentIndex);
+
+        int totalSteps();
+
+        void notifySelection(bool flag);
+        int startFrame();
+        int startComboSize();
+        QString currentTweenName() const;
+        void activateMode(TupToolPlugin::EditMode mode);
+        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
+
+    private slots:
+        void applyTween();
+        void emitOptionChanged(int option);
+        // void checkBottomLimit(int index);
+        void checkTopLimit(int index);
+        void updateTotalSteps(const QString &text);
+        void updateLoopCheckbox(int state);
+        void updateReverseCheckbox(int state);
+        void updateLastFrame();
+     
+    signals:
+        void clickedSelect();
+        void clickedDefineProperties();
+        void clickedApplyTween();
+        void clickedResetTween();
+        void initFrameChanged(int index);
+        
+    private:
+        void setInnerForm();
+        void activeInnerForm(bool enable);
+        void setEditMode();
+        void checkFramesRange();
+
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/shear/shear.pro tupi-0.2+git05/src/plugins/tools/shear/shear.pro
--- tupi-0.2+git04/src/plugins/tools/shear/shear.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shear/shear.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,39 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/
+
+HEADERS += tweener.h \
+           configurator.h \
+           settings.h
+
+SOURCES += tweener.cpp \
+           configurator.cpp \
+           settings.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupisheartool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/shear/sheartool.json tupi-0.2+git05/src/plugins/tools/shear/sheartool.json
--- tupi-0.2+git04/src/plugins/tools/shear/sheartool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shear/sheartool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "ShearTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/shear/tweener.cpp tupi-0.2+git05/src/plugins/tools/shear/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/shear/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shear/tweener.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,648 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tweener.h"
+#include "configurator.h"
+#include "target.h"
+#include "taction.h"
+#include "tosd.h"
+#include "tupinputdeviceinformation.h"
+#include "tupbrushmanager.h"
+#include "tupgraphicsscene.h"
+#include "tupgraphicobject.h"
+#include "tupsvgitem.h"
+#include "tuppathitem.h"
+#include "tuppixmapitem.h"
+#include "tupitemtweener.h"
+#include "tuprequestbuilder.h"
+#include "tupprojectrequest.h"
+#include "tuplibraryobject.h"
+#include "tupscene.h"
+#include "tuplayer.h"
+
+struct Tweener::Private
+{
+    QMap<QString, TAction *> actions;
+    Configurator *configurator;
+
+    TupGraphicsScene *scene;
+    QList<QGraphicsItem *> objects;
+
+    TupItemTweener *currentTween;
+    int initFrame;
+    int initLayer;
+    int initScene;
+    int framesTotal;
+
+    QPointF origin;
+    Target *target;
+
+    TupToolPlugin::Mode mode;
+    TupToolPlugin::EditMode editMode;
+
+    int baseZValue;
+};
+
+Tweener::Tweener() : TupToolPlugin(), k(new Private)
+{
+    setupActions();
+
+    k->configurator = 0;
+    k->framesTotal = 1;
+    k->target = 0;
+}
+
+Tweener::~Tweener()
+{
+    delete k;
+}
+
+/* This method initializes the plugin */
+
+void Tweener::init(TupGraphicsScene *scene)
+{
+    k->scene = scene;
+    k->objects.clear();
+
+    if (k->target) {
+        k->scene->removeItem(k->target);
+        k->target = 0;
+    }
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+
+    k->configurator->resetUI();
+
+    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Shear);
+    if (tweenList.size() > 0) {
+        k->configurator->loadTweenList(tweenList);
+        setCurrentTween(tweenList.at(0));
+    }
+
+    k->framesTotal = framesTotal();
+    k->configurator->initStartCombo(k->framesTotal, k->initFrame);
+}
+
+void Tweener::updateInitFrame(int index)
+{
+     if ((k->initFrame != index) && (index >= 0))
+         k->initFrame = index;
+}
+
+/* This method returns the plugin name */
+
+QStringList Tweener::keys() const
+{
+    return QStringList() << tr("Shear Tween");
+}
+
+/* This method makes an action when the mouse is pressed on the workspace 
+ * depending on the active mode: Selecting an object or Creating a path  
+*/
+
+void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::press()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method is executed while the mouse is pressed and on movement */
+
+void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+}
+
+/* This method finishes the action started on the press method depending
+ * on the active mode: Selecting an object or Creating a path
+*/
+
+void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[Tweener::release()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (scene->currentFrameIndex() == k->initFrame) {
+        if (k->editMode == TupToolPlugin::Selection) {
+            if (scene->selectedItems().size() > 0) {
+                k->objects = scene->selectedItems();
+                k->configurator->notifySelection(true);
+                QGraphicsItem *item = k->objects.at(0);
+                QRectF rect = item->sceneBoundingRect();
+                k->origin = rect.center();
+            }
+        }
+    }
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+QMap<QString, TAction *> Tweener::actions() const
+{
+    return k->actions;
+}
+
+/* This method returns the list of actions defined in this plugin */
+
+int Tweener::toolType() const
+{
+    return TupToolInterface::Tweener;
+}
+
+/* This method returns the tool panel associated to this plugin */
+
+QWidget *Tweener::configurator()
+{
+    if (!k->configurator) {
+        k->mode = TupToolPlugin::View;
+
+        k->configurator = new Configurator;
+        connect(k->configurator, SIGNAL(initFrameChanged(int)), this, SLOT(updateInitFrame(int)));
+        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
+        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
+        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
+        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode)));
+        connect(k->configurator, SIGNAL(clickedDefineProperties()), this, SLOT(setPropertiesMode()));
+        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
+        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
+    } 
+
+    return k->configurator;
+}
+
+/* This method is called when there's a change on/of scene */
+void Tweener::aboutToChangeScene(TupGraphicsScene *)
+{
+}
+
+/* This method is called when this plugin is off */
+
+void Tweener::aboutToChangeTool()
+{
+    if (k->editMode == TupToolPlugin::Selection) {
+        clearSelection();
+        disableSelection();
+
+        return;
+    }
+
+    if (k->editMode == TupToolPlugin::Properties) {
+        k->scene->removeItem(k->target);
+        k->target = 0;
+    }
+}
+
+/* This method defines the actions contained in this plugin */
+
+void Tweener::setupActions()
+{
+    TAction *translater = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "shear_tween.png"), 
+                                      tr("Shear Tween"), this);
+    translater->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
+    translater->setShortcut(QKeySequence(tr("Shift+H")));
+
+    k->actions.insert(tr("Shear Tween"), translater);
+}
+
+/* This method saves the settings of this plugin */
+
+void Tweener::saveConfig()
+{
+}
+
+/* This method updates the workspace when the plugin changes the scene */
+
+void Tweener::updateScene(TupGraphicsScene *scene)
+{ 
+    k->mode = k->configurator->mode();
+
+    if (k->mode == TupToolPlugin::Edit) {
+       int framesNumber = framesTotal();
+
+       if (k->configurator->startComboSize() < framesNumber)
+           k->configurator->initStartCombo(framesNumber, k->initFrame);
+
+       int tweenLimit = k->initFrame + (k->configurator->totalSteps() - 1); 
+       if (scene->currentFrameIndex() >= k->initFrame && scene->currentFrameIndex() <= tweenLimit)
+           k->scene->addItem(k->target);
+
+    } else if (k->mode == TupToolPlugin::Add) {
+               int total = framesTotal();
+
+               if (k->editMode == TupToolPlugin::Properties) {
+                   if (total > k->configurator->startComboSize()) {
+                       k->configurator->activateMode(TupToolPlugin::Selection);
+                       clearSelection();
+                       setSelection();
+                   } 
+               } else if (k->editMode == TupToolPlugin::Selection) {
+                          if (scene->currentFrameIndex() != k->initFrame)
+                              clearSelection();
+                          k->initFrame = scene->currentFrameIndex();
+                          setSelection();
+               }
+
+               if (k->configurator->startComboSize() < total) {
+                   k->configurator->initStartCombo(total, k->initFrame);
+               } else {
+                   if (scene->currentFrameIndex() != k->initFrame)
+                       k->configurator->setStartFrame(scene->currentFrameIndex());
+               }
+
+    } else {
+        if (scene->currentFrameIndex() != k->initFrame)
+            k->configurator->setStartFrame(scene->currentFrameIndex());
+    }
+}
+
+void Tweener::setCurrentTween(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    k->currentTween = scene->tween(name, TupItemTweener::Shear);
+
+    if (k->currentTween)
+        k->configurator->setCurrentTween(k->currentTween);
+}
+
+int Tweener::framesTotal()
+{
+    int total = 1;
+    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
+    if (layer)
+        total = layer->framesTotal();
+
+    return total;
+}
+
+/* This method clears selection */
+
+void Tweener::clearSelection()
+{
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 if (item->isSelected())
+                     item->setSelected(false);
+        }
+        k->objects.clear();
+        k->configurator->notifySelection(false);
+    }
+}
+
+/* This method disables object selection */
+
+void Tweener::disableSelection()
+{
+    foreach (QGraphicsView *view, k->scene->views()) {
+             view->setDragMode (QGraphicsView::NoDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+/* This method initializes the "Select object" mode */
+
+void Tweener::setSelection()
+{
+    // if (k->editMode == TupToolPlugin::Properties)
+    if (k->target)
+        k->scene->removeItem(k->target);
+
+    k->editMode = TupToolPlugin::Selection;
+
+    int bottomBoundary = 20000 + (k->scene->currentLayerIndex()*10000);
+    int topBoundary = bottomBoundary + 10000;
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             view->setDragMode(QGraphicsView::RubberBandDrag);
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
+                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+             }
+    }
+
+    // When Object selection is enabled, previous selection is set
+    if (k->objects.size() > 0) {
+        foreach (QGraphicsItem *item, k->objects) {
+                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
+                 item->setSelected(true);
+        }
+        k->configurator->notifySelection(true);
+    }
+
+}
+
+void Tweener::setPropertiesMode()
+{
+    k->editMode = TupToolPlugin::Properties;
+    disableSelection();
+
+    addTarget();
+}
+
+/* This method resets this plugin */
+
+void Tweener::applyReset()
+{
+    if ((k->mode == TupToolPlugin::Edit || k->mode == TupToolPlugin::Add) && k->editMode == TupToolPlugin::Properties) {
+        k->scene->removeItem(k->target);
+        k->target = 0;
+    }
+
+    disableSelection();
+    clearSelection();
+
+    k->mode = TupToolPlugin::View;
+    k->editMode = TupToolPlugin::None;
+
+    k->initFrame = k->scene->currentFrameIndex();
+    k->initLayer = k->scene->currentLayerIndex();
+    k->initScene = k->scene->currentSceneIndex();
+}
+
+/* This method applies to the project, the Tween created from this plugin */
+
+void Tweener::applyTween()
+{
+    QString name = k->configurator->currentTweenName();
+
+    if (name.length() == 0) {
+        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
+        return;
+    }
+
+    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Shear)) {
+        k->initFrame = k->scene->currentFrameIndex();
+        k->initLayer = k->scene->currentLayerIndex();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 int objectIndex = k->scene->currentFrame()->indexOf(item);
+                 QPointF origin = item->mapFromParent(k->origin);
+
+                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = k->scene->currentFrame()->indexOf(svg);
+                 } else {
+                     if (qgraphicsitem_cast<TupPathItem *>(item))
+                         origin = k->origin;
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                               k->initScene,
+                                               k->initLayer,
+                                               k->initFrame,
+                                               objectIndex,
+                                               QPointF(), k->scene->spaceMode(), type,
+                                               TupProjectRequest::SetTween,
+                                               k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
+                 emit requested(&request);
+        }
+    } else {
+        removeTweenFromProject(name);
+        QList<QGraphicsItem *> newList;
+
+        k->initFrame = k->configurator->startFrame();
+        k->initLayer = k->currentTween->initLayer();
+        k->initScene = k->scene->currentSceneIndex();
+
+        foreach (QGraphicsItem *item, k->objects) {
+                 TupLibraryObject::Type type = TupLibraryObject::Item;
+                 TupScene *scene = k->scene->scene();
+                 TupLayer *layer = scene->layer(k->currentTween->initLayer());
+                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
+                 int objectIndex = frame->indexOf(item);
+                 QPointF origin = item->mapFromParent(k->origin);
+                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
+
+                 if (svg) {
+                     type = TupLibraryObject::Svg;
+                     objectIndex = k->scene->currentFrame()->indexOf(svg);
+                 } else {
+                     if (qgraphicsitem_cast<TupPathItem *>(item))
+                         origin = k->origin;
+                 }
+
+                 if (k->initFrame != k->currentTween->initFrame()) {
+                     QDomDocument dom;
+                     if (type == TupLibraryObject::Svg)
+                         dom.appendChild(svg->toXml(dom));
+                     else
+                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
+
+                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame, 
+                                                                                      0, QPointF(), k->scene->spaceMode(), 
+                                                                                      type, TupProjectRequest::Add, dom.toString());
+                     emit requested(&request);
+
+                     request = TupRequestBuilder::createItemRequest(k->initScene,
+                                                                   k->initLayer,
+                                                                   k->currentTween->initFrame(),
+                                                                   objectIndex, QPointF(), 
+                                                                   k->scene->spaceMode(), type,
+                                                                   TupProjectRequest::Remove);
+                     emit requested(&request);
+
+                     frame = layer->frame(k->initFrame);
+                     if (type == TupLibraryObject::Item) {
+                         objectIndex = frame->graphicItemsCount() - 1;
+                         newList.append(frame->graphic(objectIndex)->item());
+                     } else {
+                         objectIndex = frame->svgItemsCount() - 1;
+                         newList.append(frame->svg(objectIndex));
+                     }
+
+                     newList.append(frame->graphic(objectIndex)->item());
+                 }
+
+                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
+                                            k->initScene,
+                                            k->initLayer,
+                                            k->initFrame,
+                                            objectIndex,
+                                            QPointF(), k->scene->spaceMode(), 
+                                            type, TupProjectRequest::SetTween,
+                                            k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
+                 emit requested(&request);
+        }
+
+        if (newList.size() > 0)
+            k->objects = newList;
+    }
+
+    int framesNumber = framesTotal();
+    int total = k->initFrame + k->configurator->totalSteps() - 1;
+    int layersTotal = k->scene->scene()->layersTotal();
+    TupProjectRequest request;
+
+    if (total > framesNumber) {
+        for (int i = framesNumber; i <= total; i++) {
+             for (int j = 0; j < layersTotal; j++) {
+                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i, TupProjectRequest::Add,
+                                                                  tr("Frame %1").arg(i + 1));
+                  emit requested(&request);
+             }
+        }
+    }
+
+    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
+                                                    TupProjectRequest::Select, "1");
+    emit requested(&request);
+
+    setCurrentTween(name);
+    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
+}
+
+void Tweener::removeTweenFromProject(const QString &name)
+{
+    TupScene *scene = k->scene->scene();
+    scene->removeTween(name, TupItemTweener::Shear);
+
+    foreach (QGraphicsView * view, k->scene->views()) {
+             foreach (QGraphicsItem *item, view->scene()->items()) {
+                      QString tip = item->toolTip();
+                      if (tip.startsWith(tr("Shear Tween") + ": " + name))
+                          item->setToolTip("");
+             }
+    }
+}
+
+void Tweener::removeTween(const QString &name)
+{
+    removeTweenFromProject(name);
+    applyReset();
+}
+
+void Tweener::updateOriginPoint(const QPointF &point)
+{
+    k->origin = point;
+}
+
+void Tweener::addTarget()
+{
+    if (k->mode == TupToolPlugin::Add) {
+        k->target = new Target(k->origin, k->baseZValue);
+        connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
+        k->scene->addItem(k->target);
+    } else {
+        // if (k->objects.size() > 0) {
+        if (k->mode == TupToolPlugin::Edit) {
+            QGraphicsItem *item = k->objects.at(0);
+            k->origin = item->mapToParent(k->currentTween->transformOriginPoint());
+            k->target = new Target(k->origin, k->baseZValue);
+            connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
+            k->scene->addItem(k->target);
+        }
+    }
+}
+
+void Tweener::updateMode(TupToolPlugin::Mode mode)
+{
+    k->mode = mode;
+
+    if (k->mode == TupToolPlugin::Edit) {
+        k->editMode = TupToolPlugin::Properties;
+
+        k->initScene = k->currentTween->initScene();
+        k->initLayer = k->currentTween->initLayer();
+        k->initFrame = k->currentTween->initFrame();
+
+        if (k->initFrame != k->scene->currentFrameIndex()) {
+            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene,
+                                                                              k->initLayer,
+                                                                              k->initFrame, TupProjectRequest::Select, "1");
+            emit requested(&request);
+        }
+
+        if (k->objects.isEmpty()) {
+            k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Shear);
+            k->origin = k->currentTween->transformOriginPoint();
+        }
+
+        // addTarget();
+    }
+}
+
+void Tweener::sceneResponse(const TupSceneResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove) {
+        k->objects.clear();
+        k->configurator->notifySelection(false);
+        k->configurator->resetUI();
+    }
+}
+
+void Tweener::layerResponse(const TupLayerResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove)
+        init(k->scene);
+}
+
+void Tweener::frameResponse(const TupFrameResponse *event)
+{
+    if (event->action() == TupProjectRequest::Remove && k->initLayer == event->layerIndex())
+        init(k->scene);
+
+    if (event->action() == TupProjectRequest::Select) {
+        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
+            init(k->scene);
+    }
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/shear/tweener.h tupi-0.2+git05/src/plugins/tools/shear/tweener.h
--- tupi-0.2+git04/src/plugins/tools/shear/tweener.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shear/tweener.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,109 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SHEARTWEENER_H
+#define SHEARTWEENER_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "settings.h"
+#include "tupprojectresponse.h"
+
+#include <QPointF>
+#include <QKeySequence>
+#include <QMatrix>
+#include <QGraphicsView>
+#include <QDomDocument>
+#include <QDir>
+
+/**
+ * @author Gustav Gonzalez 
+ * 
+*/
+
+class TUPI_PLUGIN Tweener : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "sheartool.json")
+
+    public:
+        Tweener();
+        virtual ~Tweener();
+        virtual void init(TupGraphicsScene *scene);
+
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+
+        virtual void updateScene(TupGraphicsScene *scene);
+        virtual void saveConfig();
+
+        virtual void sceneResponse(const TupSceneResponse *event);
+        virtual void layerResponse(const TupLayerResponse *event);
+        virtual void frameResponse(const TupFrameResponse *event);
+
+    private:
+        void setupActions();
+        int framesTotal();
+        void clearSelection();
+        void disableSelection();
+        void addTarget();
+        void removeTweenFromProject(const QString &name);
+
+    private:
+        struct Private;
+        Private *const k;
+
+    private slots:
+        void setSelection();
+        void setPropertiesMode();
+        void updateMode(TupToolPlugin::Mode mode);
+        void applyReset();
+        void applyTween();
+        void removeTween(const QString &name);
+        void updateInitFrame(int index);
+        void setCurrentTween(const QString &name);
+        void updateOriginPoint(const QPointF &point);
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/sheartool/configurator.cpp tupi-0.2+git05/src/plugins/tools/sheartool/configurator.cpp
--- tupi-0.2+git04/src/plugins/tools/sheartool/configurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/sheartool/configurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,315 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "configurator.h"
-#include "tweenmanager.h"
-#include "buttonspanel.h"
-
-#include "tupitemtweener.h"
-#include "tosd.h"
-#include "tdebug.h"
-
-#include <QLabel>
-#include <QBoxLayout>
-
-struct Configurator::Private
-{
-    QBoxLayout *layout;
-    QBoxLayout *settingsLayout;
-    Settings *settingsPanel;
-    TweenManager *tweenManager;
-    ButtonsPanel *controlPanel;
-
-    TupItemTweener *currentTween;
-
-    int framesTotal; 
-    int currentFrame;
-
-    TupToolPlugin::Mode mode;
-    Configurator::GuiState state;
-};
-
-Configurator::Configurator(QWidget *parent) : QFrame(parent), k(new Private)
-{
-    k->framesTotal = 1;
-    k->currentFrame = 0;
-
-    k->mode = TupToolPlugin::View;
-    k->state = Configurator::Manager;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-
-    QLabel *title = new QLabel(tr("Shear Tween"));
-    title->setAlignment(Qt::AlignHCenter);
-    title->setFont(QFont("Arial", 8, QFont::Bold));
-
-    k->layout->addWidget(title);
-
-    k->settingsLayout = new QBoxLayout(QBoxLayout::TopToBottom);
-    k->settingsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    k->settingsLayout->setMargin(0);
-    k->settingsLayout->setSpacing(0);
-
-    setTweenManagerPanel();
-    setButtonsPanel();
-    setPropertiesPanel();
-
-    k->layout->addLayout(k->settingsLayout);
-    k->layout->addStretch(2);
-}
-
-Configurator::~Configurator()
-{
-    delete k;
-}
-
-void Configurator::loadTweenList(QList<QString> tweenList)
-{
-    k->tweenManager->loadTweenList(tweenList);
-    if (tweenList.count() > 0)
-        activeButtonsPanel(true);
-}
-
-void Configurator::setPropertiesPanel()
-{
-    k->settingsPanel = new Settings(this);
-
-    connect(k->settingsPanel, SIGNAL(initFrameChanged(int)), this, SIGNAL(initFrameChanged(int)));
-    connect(k->settingsPanel, SIGNAL(clickedSelect()), this, SIGNAL(clickedSelect()));
-    connect(k->settingsPanel, SIGNAL(clickedDefineProperties()), this, SIGNAL(clickedDefineProperties()));
-    connect(k->settingsPanel, SIGNAL(clickedApplyTween()), this, SLOT(applyItem()));
-    connect(k->settingsPanel, SIGNAL(clickedResetTween()), this, SLOT(closeTweenProperties()));
-
-    k->settingsLayout->addWidget(k->settingsPanel);
-
-    activePropertiesPanel(false);
-}
-
-void Configurator::activePropertiesPanel(bool enable)
-{
-    if (enable)
-        k->settingsPanel->show();
-    else
-        k->settingsPanel->hide();
-}
-
-void Configurator::setCurrentTween(TupItemTweener *currentTween)
-{
-    k->currentTween = currentTween;
-}
-
-void Configurator::setTweenManagerPanel()
-{
-    k->tweenManager = new TweenManager(this);
-    connect(k->tweenManager, SIGNAL(addNewTween(const QString &)), this, SLOT(addTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(editCurrentTween(const QString &)), this, SLOT(editTween()));
-    connect(k->tweenManager, SIGNAL(removeCurrentTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    connect(k->tweenManager, SIGNAL(getTweenData(const QString &)), this, SLOT(updateTweenData(const QString &)));
-
-    k->settingsLayout->addWidget(k->tweenManager);
-    k->state = Configurator::Manager;
-}
-
-void Configurator::activeTweenManagerPanel(bool enable)
-{
-    if (enable)
-        k->tweenManager->show();
-    else
-        k->tweenManager->hide();
-
-    if (k->tweenManager->listSize() > 0)
-        activeButtonsPanel(enable);
-}
-
-void Configurator::setButtonsPanel()
-{
-    k->controlPanel = new ButtonsPanel(this);
-    connect(k->controlPanel, SIGNAL(clickedEditTween()), this, SLOT(editTween()));
-    connect(k->controlPanel, SIGNAL(clickedRemoveTween()), this, SLOT(removeTween()));
-
-    k->settingsLayout->addWidget(k->controlPanel);
-
-    activeButtonsPanel(false);
-}
-
-void Configurator::activeButtonsPanel(bool enable)
-{
-    if (enable)
-        k->controlPanel->show();
-    else
-        k->controlPanel->hide();
-}
-
-void Configurator::initStartCombo(int framesTotal, int currentFrame)
-{
-    k->framesTotal = framesTotal;
-    k->currentFrame = currentFrame;
-    k->settingsPanel->initStartCombo(framesTotal, currentFrame);
-}
-
-void Configurator::setStartFrame(int currentIndex)
-{
-    k->currentFrame = currentIndex;
-    k->settingsPanel->setStartFrame(currentIndex);
-}
-
-int Configurator::startFrame()
-{
-    return k->settingsPanel->startFrame();
-}
-
-int Configurator::startComboSize()
-{
-    return k->settingsPanel->startComboSize();
-}
-
-QString Configurator::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
-{
-    return k->settingsPanel->tweenToXml(currentScene, currentLayer, currentFrame, point);
-}
-
-int Configurator::totalSteps()
-{
-    return k->settingsPanel->totalSteps();
-}
-
-void Configurator::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->settingsPanel->activateMode(mode);
-}
-
-void Configurator::addTween(const QString &name)
-{
-    k->mode = TupToolPlugin::Add;
-
-    k->settingsPanel->setParameters(name, k->framesTotal, k->currentFrame);
-    
-    activeTweenManagerPanel(false);
-    activePropertiesPanel(true);
-
-    k->state = Properties;
-
-    emit setMode(k->mode);
-}
-
-void Configurator::editTween()
-{
-    activeTweenManagerPanel(false);
-
-    k->mode = TupToolPlugin::Edit;
-    k->state = Properties;
-
-    k->settingsPanel->notifySelection(true);
-    k->settingsPanel->setParameters(k->currentTween);
-    activePropertiesPanel(true);
-    emit setMode(k->mode);
-}
-
-void Configurator::removeTween()
-{
-    QString name = k->tweenManager->currentTweenName();
-    k->tweenManager->removeItemFromList();
-
-    removeTween(name);
-}
-
-void Configurator::removeTween(const QString &name)
-{
-    if (k->tweenManager->listSize() == 0)
-        activeButtonsPanel(false);
-
-    emit clickedRemoveTween(name);
-}
-
-QString Configurator::currentTweenName() const
-{
-    QString oldName = k->tweenManager->currentTweenName();
-    QString newName = k->settingsPanel->currentTweenName();
-
-    if (oldName.compare(newName) != 0)
-        k->tweenManager->updateTweenName(newName);
-
-    return newName;
-}
-
-void Configurator::notifySelection(bool flag)
-{
-    k->settingsPanel->notifySelection(flag);
-}
-
-void Configurator::closeTweenProperties()
-{
-    if (k->mode == TupToolPlugin::Add)
-        k->tweenManager->removeItemFromList();
-
-    emit clickedResetInterface();
-    closeSettingsPanel();
-}
-
-void Configurator::closeSettingsPanel()
-{
-    if (k->state == Configurator::Properties) {
-        activeTweenManagerPanel(true);
-        activePropertiesPanel(false);
-        k->mode = TupToolPlugin::View;
-        k->state = Configurator::Manager;
-    } else {
-        k->settingsPanel->activateMode(TupToolPlugin::Properties);
-    }
-}
-
-TupToolPlugin::Mode Configurator::mode()
-{
-    return k->mode;
-}
-
-void Configurator::applyItem()
-{
-    k->mode = TupToolPlugin::Edit;
-    emit clickedApplyTween();
-}
-
-void Configurator::resetUI()
-{
-    k->tweenManager->resetUI();
-    closeSettingsPanel();
-    k->settingsPanel->notifySelection(false);
-}
-
-void Configurator::updateTweenData(const QString &name)
-{
-    emit getTweenData(name);
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/sheartool/configurator.h tupi-0.2+git05/src/plugins/tools/sheartool/configurator.h
--- tupi-0.2+git04/src/plugins/tools/sheartool/configurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/sheartool/configurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef CONFIGURATOR_H
-#define CONFIGURATOR_H
-
-#include "settings.h"
-#include <QFrame>
-
-class QGraphicsPathItem;
-class QListWidgetItem;
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Configurator : public QFrame
-{
-    Q_OBJECT
-
-    public:
-        enum GuiState { Manager = 1, Properties };
-
-        Configurator(QWidget *parent = 0);
-        ~Configurator();
-
-        void loadTweenList(QList<QString> tweenList);
-
-        void initStartCombo(int framesTotal, int currentFrame);
-        void setStartFrame(int currentIndex);
-
-        int totalSteps();
-        void activateMode(TupToolPlugin::EditMode mode);
-        void setCurrentTween(TupItemTweener *currentTween);
-        QString currentTweenName() const;
-        void notifySelection(bool flag);
-        int startFrame();
-        int startComboSize();
-        void closeSettingsPanel();
-        TupToolPlugin::Mode mode();
-        void resetUI();
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
-        
-    private slots:
-        void applyItem();
-        void addTween(const QString &name);
-        void editTween();
-        void removeTween();
-        void removeTween(const QString &name);
-        void closeTweenProperties();
-        void updateTweenData(const QString &name);
-        
-    signals:
-        void initFrameChanged(int index);
-        void clickedSelect();
-        void clickedDefineProperties();
-        void clickedRemoveTween(const QString &name);
-        void setMode(TupToolPlugin::Mode mode);
-        void clickedApplyTween();
-        void clickedResetInterface();
-        void getTweenData(const QString &name);
-        
-    private:
-        void setPropertiesPanel();
-        void activePropertiesPanel(bool enable);
-        void setTweenManagerPanel();
-        void activeTweenManagerPanel(bool enable);
-        void setButtonsPanel();
-        void activeButtonsPanel(bool enable);
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/sheartool/settings.cpp tupi-0.2+git05/src/plugins/tools/sheartool/settings.cpp
--- tupi-0.2+git04/src/plugins/tools/sheartool/settings.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/sheartool/settings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,575 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "settings.h"
-#include "tdebug.h"
-#include "tradiobuttongroup.h"
-#include "tupitemtweener.h"
-#include "tuptweenerstep.h"
-#include "timagebutton.h"
-#include "tseparator.h"
-#include "tosd.h"
-
-#include <QLabel>
-#include <QLineEdit>
-#include <QBoxLayout>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
-#include <QCheckBox>
-#include <QDir>
-
-struct Settings::Private
-{
-    QWidget *innerPanel;
-    QWidget *rangePanel;
-    QWidget *clockPanel;
-
-    QBoxLayout *layout;
-    TupToolPlugin::Mode mode;
-    QLineEdit *input;
-    TRadioButtonGroup *options;
-
-    QSpinBox *comboInit;
-    QSpinBox *comboEnd;
-
-    QLabel *totalLabel;
-    int totalSteps;
-
-    TupItemTweener::TransformAxes shearAxes;
-    QComboBox *comboAxes;
-
-    QDoubleSpinBox *comboFactor;
-    QSpinBox *comboIterations;
-
-    QCheckBox *loopBox;
-    QCheckBox *reverseLoopBox;
-
-    bool selectionDone;
-    bool propertiesDone;
-
-    TImageButton *apply;
-    TImageButton *remove;
-};
-
-Settings::Settings(QWidget *parent) : QWidget(parent), k(new Private)
-{
-    k->shearAxes = TupItemTweener::XY;
-    k->selectionDone = false;
-    k->totalSteps = 0;
-
-    k->layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    k->layout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    setFont(QFont("Arial", 8, QFont::Normal, false));
-
-    QLabel *nameLabel = new QLabel(tr("Name") + ": ");
-    k->input = new QLineEdit;
-
-    QHBoxLayout *nameLayout = new QHBoxLayout;
-    nameLayout->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
-    nameLayout->setMargin(0);
-    nameLayout->setSpacing(0);
-    nameLayout->addWidget(nameLabel);
-    nameLayout->addWidget(k->input);
-
-    k->options = new TRadioButtonGroup(tr("Options"), Qt::Vertical);
-    k->options->addItem(tr("Select object"), 0);
-    k->options->addItem(tr("Set Properties"), 1);
-    connect(k->options, SIGNAL(clicked(int)), this, SLOT(emitOptionChanged(int)));
-
-    k->apply = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "save.png"), 22);
-    connect(k->apply, SIGNAL(clicked()), this, SLOT(applyTween()));
-
-    k->remove = new TImageButton(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"), 22);
-    connect(k->remove, SIGNAL(clicked()), this, SIGNAL(clickedResetTween()));
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout;
-    buttonsLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    buttonsLayout->setMargin(0);
-    buttonsLayout->setSpacing(10);
-    buttonsLayout->addWidget(k->apply);
-    buttonsLayout->addWidget(k->remove);
-
-    k->layout->addLayout(nameLayout);
-    k->layout->addWidget(k->options);
-
-    setInnerForm();
-
-    k->layout->addSpacing(10);
-    k->layout->addLayout(buttonsLayout);
-    k->layout->setSpacing(5);
-
-    activateMode(TupToolPlugin::Selection);
-}
-
-Settings::~Settings()
-{
-    delete k;
-}
-
-void Settings::setInnerForm()
-{
-    k->innerPanel = new QWidget;
-
-    QBoxLayout *innerLayout = new QBoxLayout(QBoxLayout::TopToBottom, k->innerPanel);
-    innerLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-
-    QLabel *startingLabel = new QLabel(tr("Starting at frame") + ": ");
-    startingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboInit = new QSpinBox;
-    k->comboInit->setEnabled(false);
-    connect(k->comboInit, SIGNAL(valueChanged(int)), this, SLOT(updateLastFrame()));
-
-    QLabel *endingLabel = new QLabel(tr("Ending at frame") + ": ");
-    endingLabel->setAlignment(Qt::AlignVCenter);
-
-    k->comboEnd = new QSpinBox;
-    k->comboEnd->setEnabled(true);
-    k->comboEnd->setValue(1);
-    connect(k->comboEnd, SIGNAL(valueChanged(int)), this, SLOT(checkTopLimit(int)));
-
-    QHBoxLayout *startLayout = new QHBoxLayout;
-    startLayout->setAlignment(Qt::AlignHCenter);
-    startLayout->setMargin(0);
-    startLayout->setSpacing(0);
-    startLayout->addWidget(startingLabel);
-    startLayout->addWidget(k->comboInit);
-
-    QHBoxLayout *endLayout = new QHBoxLayout;
-    endLayout->setAlignment(Qt::AlignHCenter);
-    endLayout->setMargin(0);
-    endLayout->setSpacing(0);
-    endLayout->addWidget(endingLabel);
-    endLayout->addWidget(k->comboEnd);
-
-    k->totalLabel = new QLabel(tr("Frames Total") + ": 1");
-    k->totalLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-    QHBoxLayout *totalLayout = new QHBoxLayout;
-    totalLayout->setAlignment(Qt::AlignHCenter);
-    totalLayout->setMargin(0);
-    totalLayout->setSpacing(0);
-    totalLayout->addWidget(k->totalLabel);
-
-    k->comboAxes = new QComboBox();
-    k->comboAxes->addItem(tr("Width & Height"));
-    k->comboAxes->addItem(tr("Only Width"));
-    k->comboAxes->addItem(tr("Only Height"));
-    QLabel *axesLabel = new QLabel(tr("Shear in") + ": ");
-    axesLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *axesLayout = new QHBoxLayout;
-    axesLayout->setAlignment(Qt::AlignHCenter);
-    axesLayout->setMargin(0);
-    axesLayout->setSpacing(0);
-    axesLayout->addWidget(axesLabel);
-    axesLayout->addWidget(k->comboAxes);
-
-    k->comboFactor = new QDoubleSpinBox;
-    k->comboFactor->setMinimum(-9.0);
-    k->comboFactor->setMaximum(9.0);
-    k->comboFactor->setDecimals(2);
-    k->comboFactor->setSingleStep(0.05);
-    k->comboFactor->setValue(0.10);
-
-    QLabel *speedLabel = new QLabel(tr("Scaling Factor") + ": ");
-    speedLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *speedLayout = new QHBoxLayout;
-    speedLayout->setAlignment(Qt::AlignHCenter);
-    speedLayout->setMargin(0);
-    speedLayout->setSpacing(0);
-    speedLayout->addWidget(speedLabel);
-    speedLayout->addWidget(k->comboFactor);
-
-    k->comboIterations = new QSpinBox;
-    k->comboIterations->setEnabled(true);
-    k->comboIterations->setMinimum(1);
-
-    QLabel *iterationsLabel = new QLabel(tr("Iterations") + ": ");
-    iterationsLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-    QHBoxLayout *iterationsLayout = new QHBoxLayout;
-    iterationsLayout->setAlignment(Qt::AlignHCenter);
-    iterationsLayout->setMargin(0);
-    iterationsLayout->setSpacing(0);
-    iterationsLayout->addWidget(iterationsLabel);
-    iterationsLayout->addWidget(k->comboIterations);
-
-    k->loopBox = new QCheckBox(tr("Loop"), k->innerPanel);
-    connect(k->loopBox, SIGNAL(stateChanged(int)), this, SLOT(updateReverseCheckbox(int)));
-
-    QVBoxLayout *loopLayout = new QVBoxLayout;
-    loopLayout->setAlignment(Qt::AlignHCenter);
-    loopLayout->setMargin(0);
-    loopLayout->setSpacing(0);
-    loopLayout->addWidget(k->loopBox);
-
-    k->reverseLoopBox = new QCheckBox(tr("Loop with Reverse"), k->innerPanel);
-    connect(k->reverseLoopBox, SIGNAL(stateChanged(int)), this, SLOT(updateLoopCheckbox(int)));
-
-    QVBoxLayout *reverseLayout = new QVBoxLayout;
-    reverseLayout->setAlignment(Qt::AlignHCenter);
-    reverseLayout->setMargin(0);
-    reverseLayout->setSpacing(0);
-    reverseLayout->addWidget(k->reverseLoopBox);
-
-    innerLayout->addLayout(startLayout);
-    innerLayout->addLayout(endLayout);
-    innerLayout->addLayout(totalLayout);
-
-    innerLayout->addSpacing(15);
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    innerLayout->addLayout(axesLayout);
-    innerLayout->addLayout(speedLayout);
-    innerLayout->addLayout(iterationsLayout);
-    innerLayout->addLayout(loopLayout);
-    innerLayout->addLayout(reverseLayout);
-
-    innerLayout->addWidget(new TSeparator(Qt::Horizontal));
-
-    k->layout->addWidget(k->innerPanel);
-
-    activeInnerForm(false);
-}
-
-void Settings::activeInnerForm(bool enable)
-{
-    if (enable && !k->innerPanel->isVisible()) {
-        k->propertiesDone = true;
-        k->innerPanel->show();
-    } else {
-        k->propertiesDone = false;
-        k->innerPanel->hide();
-    }
-}
-
-// Adding new Tween
-
-void Settings::setParameters(const QString &name, int framesTotal, int initFrame)
-{
-    k->mode = TupToolPlugin::Add;
-    k->input->setText(name);
-
-    k->comboInit->setEnabled(false);
-    activateMode(TupToolPlugin::Selection);
-    k->apply->setToolTip(tr("Save Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close.png"));
-    k->remove->setToolTip(tr("Cancel Tween"));
-
-    initStartCombo(framesTotal, initFrame);
-}
-
-// Editing new Tween
-
-void Settings::setParameters(TupItemTweener *currentTween)
-{
-    setEditMode();
-    activateMode(TupToolPlugin::Properties);
-
-    k->input->setText(currentTween->name());
-
-    k->comboInit->setEnabled(true);
-    k->comboInit->setValue(currentTween->initFrame() + 1);
-    k->comboEnd->setValue(currentTween->initFrame() + currentTween->frames());
-
-    checkFramesRange();
-
-    k->comboAxes->setCurrentIndex(currentTween->tweenShearAxes());
-    k->comboFactor->setValue(currentTween->tweenShearFactor());
-    k->comboIterations->setValue(currentTween->tweenShearIterations());
-    k->loopBox->setChecked(currentTween->tweenShearLoop());
-    k->reverseLoopBox->setChecked(currentTween->tweenShearReverseLoop());
-}
-
-void Settings::initStartCombo(int framesTotal, int currentIndex)
-{
-    k->comboInit->clear();
-    k->comboEnd->clear();
-
-    k->comboInit->setMinimum(1);
-    k->comboInit->setMaximum(framesTotal);
-    k->comboInit->setValue(currentIndex + 1);
-
-    k->comboEnd->setMinimum(1);
-    k->comboEnd->setValue(framesTotal);
-}
-
-void Settings::setStartFrame(int currentIndex)
-{
-    k->comboInit->setValue(currentIndex + 1);
-    int end = k->comboEnd->value();
-    if (end < currentIndex+1)
-        k->comboEnd->setValue(currentIndex + 1);
-}
-
-int Settings::startFrame()
-{
-    return k->comboInit->value() - 1;
-}
-
-int Settings::startComboSize()
-{
-    return k->comboInit->maximum();
-}
-
-int Settings::totalSteps()
-{
-    return k->comboEnd->value() - (k->comboInit->value() - 1);
-}
-
-void Settings::setEditMode()
-{
-    k->mode = TupToolPlugin::Edit;
-    k->apply->setToolTip(tr("Update Tween"));
-    k->remove->setIcon(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "close_properties.png"));
-    k->remove->setToolTip(tr("Close Tween properties"));
-}
-
-void Settings::applyTween()
-{
-    if (!k->selectionDone) {
-        TOsd::self()->display(tr("Info"), tr("You must select at least one object!"), TOsd::Info);
-        return;
-    }
-
-    if (!k->propertiesDone) {
-        TOsd::self()->display(tr("Info"), tr("You must set Tween properties first!"), TOsd::Info);
-        return;
-    }
-
-    // SQA: Verify whether tween is really well applied before call setEditMode!
-    setEditMode();
-
-    if (!k->comboInit->isEnabled())
-        k->comboInit->setEnabled(true);
-
-    emit clickedApplyTween();
-}
-
-void Settings::notifySelection(bool flag)
-{
-    k->selectionDone = flag;
-}
-
-QString Settings::currentTweenName() const
-{
-    QString tweenName = k->input->text();
-    if (tweenName.length() > 0)
-        k->input->setFocus();
-
-    return tweenName;
-}
-
-void Settings::emitOptionChanged(int option)
-{
-    switch (option) {
-            case 0:
-             {
-                 activeInnerForm(false);
-                 emit clickedSelect();
-             }
-            break;
-            case 1:
-             {
-                 if (k->selectionDone) {
-                     activeInnerForm(true);
-                     emit clickedDefineProperties();
-                 } else {
-                     k->options->setCurrentIndex(0);
-                     TOsd::self()->display(tr("Info"), tr("Select objects for Tweening first!"), TOsd::Info);
-                 }
-             }
-    }
-}
-
-QString Settings::tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point)
-{
-    QDomDocument doc;
-
-    QDomElement root = doc.createElement("tweening");
-    root.setAttribute("name", currentTweenName());
-    root.setAttribute("type", TupItemTweener::Shear);
-    root.setAttribute("initFrame", currentFrame);
-    root.setAttribute("initLayer", currentLayer);
-    root.setAttribute("initScene", currentScene);
-   
-    checkFramesRange();
-    root.setAttribute("frames", k->totalSteps);
-    root.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
-    k->shearAxes = TupItemTweener::TransformAxes(k->comboAxes->currentIndex());
-    root.setAttribute("shearAxes", k->shearAxes);
-
-    double factor = k->comboFactor->value();
-    root.setAttribute("shearFactor", factor);
-
-    int iterations = k->comboIterations->value();
-    if (iterations == 0) {
-        iterations = 1;
-        k->comboIterations->setValue(1);
-    }
-    root.setAttribute("shearIterations", iterations);
-
-    bool loop = k->loopBox->isChecked();
-    if (loop)
-        root.setAttribute("shearLoop", "1");
-    else
-        root.setAttribute("shearLoop", "0");
-
-    bool reverse = k->reverseLoopBox->isChecked();
-    if (reverse)
-        root.setAttribute("shearReverseLoop", "1");
-    else
-        root.setAttribute("shearReverseLoop", "0");
-
-    double factorX = 1.0;
-    double factorY = 1.0;
-    double shearX = 1.0;
-    double shearY = 1.0;
-
-    if (k->shearAxes == TupItemTweener::XY) {
-        factorX = factor;
-        factorY = factor;
-    } else if (k->shearAxes == TupItemTweener::X) {
-               factorX = factor;
-    } else {
-        factorY = factor;
-    }
-
-    int cycle = 1;
-    int reverseTop = (iterations*2)-2;
-
-    for (int i=0; i < k->totalSteps; i++) {
-         if (cycle <= iterations) {
-             if (cycle == 1) {
-                 shearX = 0;
-                 shearY = 0;
-             } else {
-                 shearX += factorX;
-                 shearY += factorY;
-             }
-             cycle++;
-         } else {
-             // if repeat option is enabled
-             if (loop) {
-                 cycle = 2;
-                 shearX = 0;
-                 shearY = 0;
-             } else if (reverse) { // if reverse option is enabled
-                        shearX -= factorX;
-                        shearY -= factorY;
-
-                        if (cycle < reverseTop)
-                            cycle++;
-                        else
-                            cycle = 1;
-
-             } else { // If cycle is done and no loop and no reverse
-                 shearX = 0;
-                 shearY = 0;
-             }
-         }
-
-         TupTweenerStep *step = new TupTweenerStep(i);
-         step->setShear(shearX, shearY);
-         root.appendChild(step->toXml(doc));
-    }
-
-    doc.appendChild(root);
-
-    return doc.toString();
-}
-
-void Settings::activateMode(TupToolPlugin::EditMode mode)
-{
-    k->options->setCurrentIndex(mode);
-}
-
-/*
-void Settings::checkBottomLimit(int index)
-{
-    if (index >= 0) {
-        emit initFrameChanged(index);
-        checkFramesRange();
-    }
-}
-*/
-
-void Settings::checkTopLimit(int index)
-{
-    Q_UNUSED(index);
-    checkFramesRange();
-}
-
-void Settings::updateLastFrame()
-{
-    int end = k->comboInit->value() + k->totalSteps - 1;
-    k->comboEnd->setValue(end);
-}
-
-void Settings::checkFramesRange()
-{
-    int begin = k->comboInit->value();
-    int end = k->comboEnd->value();
-
-    if (begin > end) {
-        k->comboEnd->setValue(k->comboEnd->maximum() - 1);
-        end = k->comboEnd->value();
-    }
-
-    k->totalSteps = end - begin + 1;
-    k->totalLabel->setText(tr("Frames Total") + ": " + QString::number(k->totalSteps));
-}
-
-void Settings::updateLoopCheckbox(int state)
-{
-    Q_UNUSED(state);
-
-    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
-        k->loopBox->setChecked(false);
-}
-
-void Settings::updateReverseCheckbox(int state)
-{
-    Q_UNUSED(state);
-
-    if (k->reverseLoopBox->isChecked() && k->loopBox->isChecked())
-        k->reverseLoopBox->setChecked(false);
-}
-
-void Settings::updateTotalSteps(const QString &text)
-{
-    Q_UNUSED(text);
-    checkFramesRange();
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/sheartool/settings.h tupi-0.2+git05/src/plugins/tools/sheartool/settings.h
--- tupi-0.2+git04/src/plugins/tools/sheartool/settings.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/sheartool/settings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustav Gonzalez / xtingray                                           *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
-#include "tuptoolplugin.h"
-#include <QWidget>
-
-class TupItemTweener;
-
-/**
- * @author Gustav Gonzalez 
-*/
-
-class Settings : public QWidget 
-{
-    Q_OBJECT
-
-    public:
-        Settings(QWidget *parent = 0);
-        ~Settings();
-
-        void setParameters(const QString &name, int framesTotal, int startFrame);
-        void setParameters(TupItemTweener *currentTween);
-        void initStartCombo(int totalFrames, int currentIndex);
-        void setStartFrame(int currentIndex);
-
-        int totalSteps();
-
-        void notifySelection(bool flag);
-        int startFrame();
-        int startComboSize();
-        QString currentTweenName() const;
-        void activateMode(TupToolPlugin::EditMode mode);
-        QString tweenToXml(int currentScene, int currentLayer, int currentFrame, QPointF point);
-
-    private slots:
-        void applyTween();
-        void emitOptionChanged(int option);
-        // void checkBottomLimit(int index);
-        void checkTopLimit(int index);
-        void updateTotalSteps(const QString &text);
-        void updateLoopCheckbox(int state);
-        void updateReverseCheckbox(int state);
-        void updateLastFrame();
-     
-    signals:
-        void clickedSelect();
-        void clickedDefineProperties();
-        void clickedApplyTween();
-        void clickedResetTween();
-        void initFrameChanged(int index);
-        
-    private:
-        void setInnerForm();
-        void activeInnerForm(bool enable);
-        void setEditMode();
-        void checkFramesRange();
-
-        struct Private;
-        Private *const k;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/sheartool/sheartool.json tupi-0.2+git05/src/plugins/tools/sheartool/sheartool.json
--- tupi-0.2+git04/src/plugins/tools/sheartool/sheartool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/sheartool/sheartool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "ShearTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/sheartool/sheartool.pro tupi-0.2+git05/src/plugins/tools/sheartool/sheartool.pro
--- tupi-0.2+git04/src/plugins/tools/sheartool/sheartool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/sheartool/sheartool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/sheartool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/
-
-HEADERS += tweener.h \
-           configurator.h \
-           settings.h
-
-SOURCES += tweener.cpp \
-           configurator.cpp \
-           settings.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupisheartool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/sheartool/tweener.cpp tupi-0.2+git05/src/plugins/tools/sheartool/tweener.cpp
--- tupi-0.2+git04/src/plugins/tools/sheartool/tweener.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/sheartool/tweener.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,640 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "tweener.h"
-#include "configurator.h"
-#include "target.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "taction.h"
-#include "tosd.h"
-#include "tupinputdeviceinformation.h"
-#include "tupbrushmanager.h"
-#include "tupgraphicsscene.h"
-#include "tupgraphicobject.h"
-#include "tupsvgitem.h"
-#include "tuppathitem.h"
-#include "tuppixmapitem.h"
-#include "tupitemtweener.h"
-#include "tuprequestbuilder.h"
-#include "tupprojectrequest.h"
-#include "tuplibraryobject.h"
-#include "tupscene.h"
-#include "tuplayer.h"
-
-#include <QPointF>
-#include <QKeySequence>
-#include <QMatrix>
-#include <QGraphicsView>
-#include <QDomDocument>
-#include <QDir>
-
-struct Tweener::Private
-{
-    QMap<QString, TAction *> actions;
-    Configurator *configurator;
-
-    TupGraphicsScene *scene;
-    QList<QGraphicsItem *> objects;
-
-    TupItemTweener *currentTween;
-    int initFrame;
-    int initLayer;
-    int initScene;
-    int framesTotal;
-
-    QPointF origin;
-    Target *target;
-
-    TupToolPlugin::Mode mode;
-    TupToolPlugin::EditMode editMode;
-
-    int baseZValue;
-};
-
-Tweener::Tweener() : TupToolPlugin(), k(new Private)
-{
-    setupActions();
-
-    k->configurator = 0;
-    k->framesTotal = 1;
-    k->target = 0;
-}
-
-Tweener::~Tweener()
-{
-    delete k;
-}
-
-/* This method initializes the plugin */
-
-void Tweener::init(TupGraphicsScene *scene)
-{
-    k->scene = scene;
-    k->objects.clear();
-    if (k->target)
-        k->scene->removeItem(k->target);
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-    k->baseZValue = 20000 + (scene->scene()->layersTotal() * 10000);
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-
-    k->configurator->resetUI();
-
-    QList<QString> tweenList = k->scene->scene()->getTweenNames(TupItemTweener::Shear);
-    if (tweenList.size() > 0) {
-        k->configurator->loadTweenList(tweenList);
-        setCurrentTween(tweenList.at(0));
-    }
-
-    k->framesTotal = framesTotal();
-    k->configurator->initStartCombo(k->framesTotal, k->initFrame);
-}
-
-void Tweener::updateInitFrame(int index)
-{
-     if ((k->initFrame != index) && (index >= 0))
-         k->initFrame = index;
-}
-
-/* This method returns the plugin name */
-
-QStringList Tweener::keys() const
-{
-    return QStringList() << tr("Shear Tween");
-}
-
-/* This method makes an action when the mouse is pressed on the workspace 
- * depending on the active mode: Selecting an object or Creating a path  
-*/
-
-void Tweener::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method is executed while the mouse is pressed and on movement */
-
-void Tweener::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-}
-
-/* This method finishes the action started on the press method depending
- * on the active mode: Selecting an object or Creating a path
-*/
-
-void Tweener::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (scene->currentFrameIndex() == k->initFrame) {
-        if (k->editMode == TupToolPlugin::Selection) {
-            if (scene->selectedItems().size() > 0) {
-                k->objects = scene->selectedItems();
-                k->configurator->notifySelection(true);
-                QGraphicsItem *item = k->objects.at(0);
-                QRectF rect = item->sceneBoundingRect();
-                k->origin = rect.center();
-            }
-        }
-    }
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-QMap<QString, TAction *> Tweener::actions() const
-{
-    return k->actions;
-}
-
-/* This method returns the list of actions defined in this plugin */
-
-int Tweener::toolType() const
-{
-    return TupToolInterface::Tweener;
-}
-
-/* This method returns the tool panel associated to this plugin */
-
-QWidget *Tweener::configurator()
-{
-    if (!k->configurator) {
-        k->mode = TupToolPlugin::View;
-
-        k->configurator = new Configurator;
-        connect(k->configurator, SIGNAL(initFrameChanged(int)), this, SLOT(updateInitFrame(int)));
-        connect(k->configurator, SIGNAL(clickedApplyTween()), this, SLOT(applyTween()));
-        connect(k->configurator, SIGNAL(clickedSelect()), this, SLOT(setSelection()));
-        connect(k->configurator, SIGNAL(clickedResetInterface()), this, SLOT(applyReset()));
-        connect(k->configurator, SIGNAL(setMode(TupToolPlugin::Mode)), this, SLOT(updateMode(TupToolPlugin::Mode)));
-        connect(k->configurator, SIGNAL(clickedDefineProperties()), this, SLOT(setPropertiesMode()));
-        connect(k->configurator, SIGNAL(getTweenData(const QString &)), this, SLOT(setCurrentTween(const QString &)));
-        connect(k->configurator, SIGNAL(clickedRemoveTween(const QString &)), this, SLOT(removeTween(const QString &)));
-    } 
-
-    return k->configurator;
-}
-
-/* This method is called when there's a change on/of scene */
-void Tweener::aboutToChangeScene(TupGraphicsScene *)
-{
-}
-
-/* This method is called when this plugin is off */
-
-void Tweener::aboutToChangeTool()
-{
-    if (k->editMode == TupToolPlugin::Selection) {
-        clearSelection();
-        disableSelection();
-
-        return;
-    }
-
-    if (k->editMode == TupToolPlugin::Properties)
-        k->scene->removeItem(k->target);
-}
-
-/* This method defines the actions contained in this plugin */
-
-void Tweener::setupActions()
-{
-    TAction *translater = new TAction(QPixmap(kAppProp->themeDir() + "icons" + QDir::separator() + "shear_tween.png"), 
-                                      tr("Shear Tween"), this);
-    translater->setCursor(QCursor(kAppProp->themeDir() + "cursors" + QDir::separator() + "tweener.png"));
-    translater->setShortcut(QKeySequence(tr("Shift+H")));
-
-    k->actions.insert(tr("Shear Tween"), translater);
-}
-
-/* This method saves the settings of this plugin */
-
-void Tweener::saveConfig()
-{
-}
-
-/* This method updates the workspace when the plugin changes the scene */
-
-void Tweener::updateScene(TupGraphicsScene *scene)
-{ 
-    k->mode = k->configurator->mode();
-
-    if (k->mode == TupToolPlugin::Edit) {
-       int framesNumber = framesTotal();
-
-       if (k->configurator->startComboSize() < framesNumber)
-           k->configurator->initStartCombo(framesNumber, k->initFrame);
-
-       int tweenLimit = k->initFrame + (k->configurator->totalSteps() - 1); 
-       if (scene->currentFrameIndex() >= k->initFrame && scene->currentFrameIndex() <= tweenLimit)
-           k->scene->addItem(k->target);
-
-    } else if (k->mode == TupToolPlugin::Add) {
-               int total = framesTotal();
-
-               if (k->editMode == TupToolPlugin::Properties) {
-                   if (total > k->configurator->startComboSize()) {
-                       k->configurator->activateMode(TupToolPlugin::Selection);
-                       clearSelection();
-                       setSelection();
-                   } 
-               } else if (k->editMode == TupToolPlugin::Selection) {
-                          if (scene->currentFrameIndex() != k->initFrame)
-                              clearSelection();
-                          k->initFrame = scene->currentFrameIndex();
-                          setSelection();
-               }
-
-               if (k->configurator->startComboSize() < total) {
-                   k->configurator->initStartCombo(total, k->initFrame);
-               } else {
-                   if (scene->currentFrameIndex() != k->initFrame)
-                       k->configurator->setStartFrame(scene->currentFrameIndex());
-               }
-
-    } else {
-        if (scene->currentFrameIndex() != k->initFrame)
-            k->configurator->setStartFrame(scene->currentFrameIndex());
-    }
-}
-
-void Tweener::setCurrentTween(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    k->currentTween = scene->tween(name, TupItemTweener::Shear);
-
-    if (k->currentTween)
-        k->configurator->setCurrentTween(k->currentTween);
-}
-
-int Tweener::framesTotal()
-{
-    int total = 1;
-    TupLayer *layer = k->scene->scene()->layer(k->scene->currentLayerIndex());
-    if (layer)
-        total = layer->framesTotal();
-
-    return total;
-}
-
-/* This method clears selection */
-
-void Tweener::clearSelection()
-{
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 if (item->isSelected())
-                     item->setSelected(false);
-        }
-        k->objects.clear();
-        k->configurator->notifySelection(false);
-    }
-}
-
-/* This method disables object selection */
-
-void Tweener::disableSelection()
-{
-    foreach (QGraphicsView *view, k->scene->views()) {
-             view->setDragMode (QGraphicsView::NoDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-/* This method initializes the "Select object" mode */
-
-void Tweener::setSelection()
-{
-    if (k->editMode == TupToolPlugin::Properties)
-        k->scene->removeItem(k->target);
-
-    k->editMode = TupToolPlugin::Selection;
-
-    int bottomBoundary = 20000 + (k->scene->currentLayerIndex()*10000);
-    int topBoundary = bottomBoundary + 10000;
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             view->setDragMode(QGraphicsView::RubberBandDrag);
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      if ((item->zValue() >= bottomBoundary) && (item->zValue() < topBoundary) && (item->toolTip().length()==0))
-                          item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-             }
-    }
-
-    // When Object selection is enabled, previous selection is set
-    if (k->objects.size() > 0) {
-        foreach (QGraphicsItem *item, k->objects) {
-                 item->setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
-                 item->setSelected(true);
-        }
-        k->configurator->notifySelection(true);
-    }
-
-}
-
-void Tweener::setPropertiesMode()
-{
-    k->editMode = TupToolPlugin::Properties;
-    disableSelection();
-
-    addTarget();
-}
-
-/* This method resets this plugin */
-
-void Tweener::applyReset()
-{
-    if ((k->mode == TupToolPlugin::Edit || k->mode == TupToolPlugin::Add) && k->editMode == TupToolPlugin::Properties)
-        k->scene->removeItem(k->target);
-
-    disableSelection();
-    clearSelection();
-
-    k->mode = TupToolPlugin::View;
-    k->editMode = TupToolPlugin::None;
-
-    k->initFrame = k->scene->currentFrameIndex();
-    k->initLayer = k->scene->currentLayerIndex();
-    k->initScene = k->scene->currentSceneIndex();
-}
-
-/* This method applies to the project, the Tween created from this plugin */
-
-void Tweener::applyTween()
-{
-    QString name = k->configurator->currentTweenName();
-
-    if (name.length() == 0) {
-        TOsd::self()->display(tr("Error"), tr("Tween name is missing!"), TOsd::Error);
-        return;
-    }
-
-    if (!k->scene->scene()->tweenExists(name, TupItemTweener::Shear)) {
-        k->initFrame = k->scene->currentFrameIndex();
-        k->initLayer = k->scene->currentLayerIndex();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 int objectIndex = k->scene->currentFrame()->indexOf(item);
-                 QPointF origin = item->mapFromParent(k->origin);
-
-                 if (TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item)) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = k->scene->currentFrame()->indexOf(svg);
-                 } else {
-                     if (qgraphicsitem_cast<TupPathItem *>(item))
-                         origin = k->origin;
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                               k->initScene,
-                                               k->initLayer,
-                                               k->initFrame,
-                                               objectIndex,
-                                               QPointF(), k->scene->spaceMode(), type,
-                                               TupProjectRequest::SetTween,
-                                               k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
-                 emit requested(&request);
-        }
-    } else {
-        removeTweenFromProject(name);
-        QList<QGraphicsItem *> newList;
-
-        k->initFrame = k->configurator->startFrame();
-        k->initLayer = k->currentTween->initLayer();
-        k->initScene = k->scene->currentSceneIndex();
-
-        foreach (QGraphicsItem *item, k->objects) {
-                 TupLibraryObject::Type type = TupLibraryObject::Item;
-                 TupScene *scene = k->scene->scene();
-                 TupLayer *layer = scene->layer(k->currentTween->initLayer());
-                 TupFrame *frame = layer->frame(k->currentTween->initFrame());
-                 int objectIndex = frame->indexOf(item);
-                 QPointF origin = item->mapFromParent(k->origin);
-                 TupSvgItem *svg = qgraphicsitem_cast<TupSvgItem *>(item);
-
-                 if (svg) {
-                     type = TupLibraryObject::Svg;
-                     objectIndex = k->scene->currentFrame()->indexOf(svg);
-                 } else {
-                     if (qgraphicsitem_cast<TupPathItem *>(item))
-                         origin = k->origin;
-                 }
-
-                 if (k->initFrame != k->currentTween->initFrame()) {
-                     QDomDocument dom;
-                     if (type == TupLibraryObject::Svg)
-                         dom.appendChild(svg->toXml(dom));
-                     else
-                         dom.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(dom));
-
-                     TupProjectRequest request = TupRequestBuilder::createItemRequest(k->initScene, k->initLayer, k->initFrame, 
-                                                                                      0, QPointF(), k->scene->spaceMode(), 
-                                                                                      type, TupProjectRequest::Add, dom.toString());
-                     emit requested(&request);
-
-                     request = TupRequestBuilder::createItemRequest(k->initScene,
-                                                                   k->initLayer,
-                                                                   k->currentTween->initFrame(),
-                                                                   objectIndex, QPointF(), 
-                                                                   k->scene->spaceMode(), type,
-                                                                   TupProjectRequest::Remove);
-                     emit requested(&request);
-
-                     frame = layer->frame(k->initFrame);
-                     if (type == TupLibraryObject::Item) {
-                         objectIndex = frame->graphicItemsCount() - 1;
-                         newList.append(frame->graphic(objectIndex)->item());
-                     } else {
-                         objectIndex = frame->svgItemsCount() - 1;
-                         newList.append(frame->svg(objectIndex));
-                     }
-
-                     newList.append(frame->graphic(objectIndex)->item());
-                 }
-
-                 TupProjectRequest request = TupRequestBuilder::createItemRequest(
-                                            k->initScene,
-                                            k->initLayer,
-                                            k->initFrame,
-                                            objectIndex,
-                                            QPointF(), k->scene->spaceMode(), 
-                                            type, TupProjectRequest::SetTween,
-                                            k->configurator->tweenToXml(k->initScene, k->initLayer, k->initFrame, origin));
-                 emit requested(&request);
-        }
-
-        if (newList.size() > 0)
-            k->objects = newList;
-    }
-
-    int framesNumber = framesTotal();
-    int total = k->initFrame + k->configurator->totalSteps() - 1;
-    int layersTotal = k->scene->scene()->layersTotal();
-    TupProjectRequest request;
-
-    if (total > framesNumber) {
-        for (int i = framesNumber; i <= total; i++) {
-             for (int j = 0; j < layersTotal; j++) {
-                  request = TupRequestBuilder::createFrameRequest(k->initScene, j, i, TupProjectRequest::Add,
-                                                                  tr("Frame %1").arg(i + 1));
-                  emit requested(&request);
-             }
-        }
-    }
-
-    request = TupRequestBuilder::createFrameRequest(k->initScene, k->initLayer, k->initFrame,
-                                                    TupProjectRequest::Select, "1");
-    emit requested(&request);
-
-    setCurrentTween(name);
-    TOsd::self()->display(tr("Info"), tr("Tween %1 applied!").arg(name), TOsd::Info);
-}
-
-void Tweener::removeTweenFromProject(const QString &name)
-{
-    TupScene *scene = k->scene->scene();
-    scene->removeTween(name, TupItemTweener::Shear);
-
-    foreach (QGraphicsView * view, k->scene->views()) {
-             foreach (QGraphicsItem *item, view->scene()->items()) {
-                      QString tip = item->toolTip();
-                      if (tip.startsWith(tr("Shear Tween") + ": " + name))
-                          item->setToolTip("");
-             }
-    }
-}
-
-void Tweener::removeTween(const QString &name)
-{
-    removeTweenFromProject(name);
-    applyReset();
-}
-
-void Tweener::updateOriginPoint(const QPointF &point)
-{
-    k->origin = point;
-}
-
-void Tweener::addTarget()
-{
-    if (k->mode == TupToolPlugin::Add) {
-        k->target = new Target(k->origin, k->baseZValue, k->scene);
-        connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
-    } else {
-        if (k->objects.size() > 0) {
-            QGraphicsItem *item = k->objects.at(0);
-            k->origin = item->mapToParent(k->currentTween->transformOriginPoint());
-            k->target = new Target(k->origin, k->baseZValue, k->scene);
-            connect(k->target, SIGNAL(positionUpdated(const QPointF &)), this, SLOT(updateOriginPoint(const QPointF &)));
-        }
-    }
-}
-
-void Tweener::updateMode(TupToolPlugin::Mode mode)
-{
-    k->mode = mode;
-
-    if (k->mode == TupToolPlugin::Edit) {
-        k->editMode = TupToolPlugin::Properties;
-
-        k->initScene = k->currentTween->initScene();
-        k->initLayer = k->currentTween->initLayer();
-        k->initFrame = k->currentTween->initFrame();
-
-        if (k->initFrame != k->scene->currentFrameIndex()) {
-            TupProjectRequest request = TupRequestBuilder::createFrameRequest(k->initScene,
-                                                                              k->initLayer,
-                                                                              k->initFrame, TupProjectRequest::Select, "1");
-            emit requested(&request);
-        }
-
-        if (k->objects.isEmpty()) {
-            k->objects = k->scene->scene()->getItemsFromTween(k->currentTween->name(), TupItemTweener::Shear);
-            k->origin = k->currentTween->transformOriginPoint();
-        }
-
-        addTarget();
-    }
-}
-
-void Tweener::sceneResponse(const TupSceneResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove) {
-        k->objects.clear();
-        k->configurator->notifySelection(false);
-        k->configurator->resetUI();
-    }
-}
-
-void Tweener::layerResponse(const TupLayerResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove)
-        init(k->scene);
-}
-
-void Tweener::frameResponse(const TupFrameResponse *event)
-{
-    if (event->action() == TupProjectRequest::Remove && k->initLayer == event->layerIndex())
-        init(k->scene);
-
-    if (event->action() == TupProjectRequest::Select) {
-        if (k->initLayer != event->layerIndex() || k->initScene != event->sceneIndex())
-            init(k->scene);
-    }
-}
-
-Q_EXPORT_PLUGIN2(tup_tweener, Tweener);
diff -Nru tupi-0.2+git04/src/plugins/tools/sheartool/tweener.h tupi-0.2+git05/src/plugins/tools/sheartool/tweener.h
--- tupi-0.2+git04/src/plugins/tools/sheartool/tweener.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/sheartool/tweener.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef SHEARTWEENER_H
-#define SHEARTWEENER_H
-
-#include "tuptoolplugin.h"
-#include "settings.h"
-#include "tupprojectresponse.h"
-
-/**
- * @author Gustav Gonzalez 
- * 
-*/
-
-class Tweener : public TupToolPlugin
-{
-    Q_OBJECT
-
-    public:
-        Tweener();
-        virtual ~Tweener();
-        virtual void init(TupGraphicsScene *scene);
-
-        virtual QStringList keys() const;
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-        virtual QWidget *configurator();
-
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-
-        virtual void updateScene(TupGraphicsScene *scene);
-        virtual void saveConfig();
-
-        virtual void sceneResponse(const TupSceneResponse *event);
-        virtual void layerResponse(const TupLayerResponse *event);
-        virtual void frameResponse(const TupFrameResponse *event);
-
-    private:
-        void setupActions();
-        int framesTotal();
-        void clearSelection();
-        void disableSelection();
-        void addTarget();
-        void removeTweenFromProject(const QString &name);
-
-    private:
-        struct Private;
-        Private *const k;
-
-    private slots:
-        void setSelection();
-        void setPropertiesMode();
-        void updateMode(TupToolPlugin::Mode mode);
-        void applyReset();
-        void applyTween();
-        void removeTween(const QString &name);
-        void updateInitFrame(int index);
-        void setCurrentTween(const QString &name);
-        void updateOriginPoint(const QPointF &point);
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/shift/shift.pro tupi-0.2+git05/src/plugins/tools/shift/shift.pro
--- tupi-0.2+git04/src/plugins/tools/shift/shift.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shift/shift.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,37 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/ 
+
+HEADERS += shifttool.h
+           # zoomconfigurator.h
+
+SOURCES += shifttool.cpp 
+           # zoomconfigurator.cpp
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupishifttool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/shift/shifttool.cpp tupi-0.2+git05/src/plugins/tools/shift/shifttool.cpp
--- tupi-0.2+git04/src/plugins/tools/shift/shifttool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shift/shifttool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,217 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "shifttool.h"
+#include "tconfig.h"
+#include "tuprectitem.h"
+#include "tupellipseitem.h"
+#include "tuplineitem.h"
+#include "tupscene.h"
+#include "tupinputdeviceinformation.h"
+#include "tupgraphicsscene.h"
+
+struct ShiftTool::Private
+{
+    QString activeView;
+    QMap<QString, TAction *> actions;
+    QGraphicsRectItem *rect;
+    bool added;
+    QPointF currentCenter;
+    QPointF firstPoint;
+    TupGraphicsScene *scene;
+    // ZoomConfigurator *configurator;
+    QCursor shiftCursor;
+    QSize projectSize;
+};
+
+ShiftTool::ShiftTool() : k(new Private)
+{
+    k->activeView = "WORKSPACE";
+    k->rect = 0;
+    k->scene = 0;
+    // k->configurator = 0;
+
+    setupActions();
+}
+
+ShiftTool::~ShiftTool()
+{
+}
+
+void ShiftTool::init(TupGraphicsScene *scene)
+{
+    k->scene = scene;
+
+    foreach (QGraphicsView *view, scene->views()) {
+             k->currentCenter =  view->sceneRect().center();
+             view->setDragMode(QGraphicsView::NoDrag);
+             foreach (QGraphicsItem *item, scene->items()) {
+                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
+                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
+             }
+    }
+}
+
+QStringList ShiftTool::keys() const
+{
+    return QStringList() << tr("Shift");
+}
+
+void ShiftTool::setupActions()
+{
+    TAction *shiftAction = new TAction(QIcon(kAppProp->themeDir() + "icons/shift.png"), tr("Shift"), this);
+    shiftAction->setShortcut(QKeySequence(tr("H")));
+    shiftAction->setToolTip(tr("Shift") + " - " + "H");
+    k->shiftCursor = QCursor(kAppProp->themeDir() + "cursors/shift.png");
+    shiftAction->setCursor(k->shiftCursor);
+
+    k->actions.insert(tr("Shift"), shiftAction);
+}
+
+void ShiftTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+    Q_UNUSED(scene);
+
+    k->added = false;
+    k->rect = new QGraphicsRectItem(QRectF(input->pos(), QSize(0,0)));
+    k->rect->setPen(QPen(Qt::red, 1, Qt::SolidLine));
+
+    k->firstPoint = input->pos();
+}
+
+void ShiftTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (name() == tr("Shift")) 
+        k->scene = scene; // <- SQA: Trace this variable
+}
+
+void ShiftTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(brushManager);
+
+    if (name() == tr("Shift")) {
+        k->currentCenter = input->pos();
+        foreach (QGraphicsView *view, scene->views()) {
+                 if (k->activeView.compare(view->accessibleName()) == 0) {
+                     view->centerOn(k->currentCenter);
+                     view->setSceneRect(input->pos().x() - (k->projectSize.width()/2), input->pos().y() - (k->projectSize.height()/2),
+                                        k->projectSize.width(), k->projectSize.height());
+                     break;
+                 }  
+        }
+    } 
+}
+
+void ShiftTool::setProjectSize(const QSize size)
+{
+    k->projectSize = size;
+}
+
+QMap<QString, TAction *> ShiftTool::actions() const
+{
+    return k->actions;
+}
+
+int ShiftTool::toolType() const
+{
+    return TupToolInterface::View;
+}
+
+QWidget *ShiftTool::configurator()
+{
+    /*
+    if (name() != tr("Shift")) {
+        if (! k->configurator)
+            k->configurator = new ZoomConfigurator;
+
+        return k->configurator;
+    }
+    */
+
+    return 0;
+}
+
+void ShiftTool::aboutToChangeScene(TupGraphicsScene *)
+{
+}
+
+void ShiftTool::aboutToChangeTool()
+{
+    if (name() == tr("Shift")) {
+       if (k->scene) {
+           foreach (QGraphicsView * view, k->scene->views())
+                    view->setDragMode(QGraphicsView::NoDrag);
+       }
+    }
+}
+
+void ShiftTool::saveConfig()
+{
+/*
+    if (k->configurator) {
+        TCONFIG->beginGroup("ZoomTool");
+        TCONFIG->setValue("zoomFactor", k->configurator->getFactor());
+    }
+*/
+}
+
+void ShiftTool::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
+        emit closeHugeCanvas();
+    } else {
+        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
+        if (flags.first != -1 && flags.second != -1)
+            emit callForPlugin(flags.first, flags.second);
+    }
+}
+
+QCursor ShiftTool::cursor() const
+{
+   if (name() == tr("Shift"))
+       return k->shiftCursor;
+
+   return QCursor(Qt::ArrowCursor);
+}
+
+void ShiftTool::setActiveView(const QString &viewID)
+{
+    k->activeView = viewID;
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/shift/shifttool.h tupi-0.2+git05/src/plugins/tools/shift/shifttool.h
--- tupi-0.2+git04/src/plugins/tools/shift/shifttool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shift/shifttool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,101 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef SHIFTTOOL_H
+#define SHIFTTOOL_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+// #include "zoomconfigurator.h"
+#include "tupgraphicsscene.h"
+
+#include <QObject>
+#include <QLabel>
+#include <QGraphicsRectItem>
+#include <QSize>
+#include <QKeySequence>
+#include <QImage>
+#include <QPaintDevice>
+#include <QGraphicsView>
+
+// class TupGraphicsScene;
+
+/**
+ * @author Jorge Cuadrado
+*/
+
+class TUPI_PLUGIN ShiftTool: public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "shifttool.json")
+
+    public:
+        ShiftTool();
+        ~ShiftTool();
+
+        virtual void init(TupGraphicsScene *scene);
+        virtual QStringList keys() const;
+        
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+
+        virtual QMap<QString, TAction *> actions() const;
+        int toolType() const;
+        
+        virtual QWidget *configurator();
+        virtual void aboutToChangeScene(TupGraphicsScene *scene);
+        virtual void aboutToChangeTool();
+        virtual void saveConfig();
+        virtual void keyPressEvent(QKeyEvent *event);
+        virtual QCursor cursor() const;
+
+        virtual void setProjectSize(const QSize size);
+
+        virtual void setActiveView(const QString &viewID);
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+
+    private:
+        void setupActions();
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/shift/shifttool.json tupi-0.2+git05/src/plugins/tools/shift/shifttool.json
--- tupi-0.2+git04/src/plugins/tools/shift/shifttool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shift/shifttool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "ShiftTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/shift/zoomconfigurator.cpp tupi-0.2+git05/src/plugins/tools/shift/zoomconfigurator.cpp
--- tupi-0.2+git04/src/plugins/tools/shift/zoomconfigurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shift/zoomconfigurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,110 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "zoomconfigurator.h"
+#include "timagebutton.h"
+#include "tseparator.h"
+#include "tconfig.h"
+
+ZoomConfigurator::ZoomConfigurator(QWidget *parent) :QWidget(parent)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[ZoomConfigurator()]";
+        #else
+            TINIT;
+        #endif
+    #endif
+
+    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
+
+    scale = new QLabel(tr("Scale Factor"));
+    scale->setFont(QFont("Arial", 8, QFont::Normal, false));
+    scale->setAlignment(Qt::AlignHCenter);
+    layout->addWidget(scale);
+
+    factor = new QDoubleSpinBox();
+
+    factor->setDecimals(1);
+    factor->setSingleStep(0.1);
+    factor->setMinimum(0.1);
+    factor->setMaximum(0.9);
+    layout->addWidget(factor);
+
+    QLabel *label = new QLabel(tr("Tips"));
+    label->setAlignment(Qt::AlignHCenter);
+    label->setFont(QFont("Arial", 8, QFont::Normal, false));
+
+    QTextEdit *textArea = new QTextEdit; 
+
+    textArea->setFont(QFont("Arial", 8, QFont::Normal, false));
+    textArea->setHtml("<p><b>" + tr("Zoom Square mode") + ":</b> " + tr("Press Ctrl key + Mouse left button") + "</p>"); 
+
+    QString text = textArea->document()->toPlainText();
+    int height = (text.length()*270)/207;
+
+    textArea->setFixedHeight(height);
+
+    mainLayout->addLayout(layout);
+    mainLayout->addWidget(label);
+    mainLayout->addWidget(textArea);
+    mainLayout->addStretch(2);
+
+    TCONFIG->beginGroup("ZoomTool");
+    double value = TCONFIG->value("zoomFactor", -1).toDouble();
+
+    if (value > 0) 
+        factor->setValue(value);
+    else 
+        factor->setValue(0.5);
+}
+
+ZoomConfigurator::~ZoomConfigurator()
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~ZoomConfigurator()]";
+        #else
+            TEND;
+        #endif
+    #endif
+}
+
+double ZoomConfigurator::getFactor() const
+{
+    return factor->value();
+}
+
diff -Nru tupi-0.2+git04/src/plugins/tools/shift/zoomconfigurator.h tupi-0.2+git05/src/plugins/tools/shift/zoomconfigurator.h
--- tupi-0.2+git04/src/plugins/tools/shift/zoomconfigurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/shift/zoomconfigurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,80 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef ZOOMCONFIGURATOR_H
+#define ZOOMCONFIGURATOR_H
+
+#include "tglobal.h"
+
+#include <QResizeEvent>
+#include <QLabel>
+#include <QRadioButton>
+#include <QDoubleSpinBox>
+#include <QBoxLayout>
+#include <QRadioButton>
+#include <QButtonGroup>
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QTextEdit>
+
+/**
+ * @author Jorge Cuadrado
+**/
+
+class TUPI_PLUGIN ZoomConfigurator : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        ZoomConfigurator(QWidget *parent = 0);
+        ~ZoomConfigurator();
+        //bool zoomIn();
+        double getFactor() const;
+
+    //protected:
+        //void resizeEvent(QResizeEvent *);
+
+    /* private slots:
+        void setZoomIn();
+        void setZoomOut(); */
+
+    private:
+        //QRadioButton *in;
+        //QRadioButton *out;
+        QDoubleSpinBox *factor;
+        QLabel *scale;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/text/textconfigurator.cpp tupi-0.2+git05/src/plugins/tools/text/textconfigurator.cpp
--- tupi-0.2+git04/src/plugins/tools/text/textconfigurator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/text/textconfigurator.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,95 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "textconfigurator.h"
+
+TextConfigurator::TextConfigurator(QWidget *parent) : QWidget(parent)
+{
+    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+    setLayout(layout);
+
+    m_fontChooser = new TFontChooser;
+    layout->addWidget(m_fontChooser);
+
+    m_text = new QTextEdit(this);
+    layout->addWidget(m_text);
+
+    m_isHtml = new QCheckBox(tr("Html"));
+    layout->addWidget(m_isHtml);
+
+    layout->addStretch(1);
+
+    connect(m_fontChooser, SIGNAL(fontChanged()), this, SLOT(changeFont()));
+    changeFont();
+
+    // new KSpellHighlighter(m_text->document());
+}
+
+TextConfigurator::~TextConfigurator()
+{
+}
+
+QString TextConfigurator::text() const
+{
+    return m_text->toPlainText();
+}
+
+QFont TextConfigurator::textFont() const
+{
+    return font;
+}
+
+void TextConfigurator::changeFont()
+{
+    font = m_fontChooser->currentFont();
+
+    // kFatal() << "TextConfigurator::changeFont() - Font Family: " << font.family();
+    // kFatal() << "TextConfigurator::changeFont() - Font Style: " << font.style(); 
+    // kFatal() << "TextConfigurator::changeFont() - Font Size: " << font.pointSize();
+
+    m_text->setFont(font);
+
+    adjustSize();
+}
+
+void TextConfigurator::setDocument(QTextDocument *doc)
+{
+    m_text->setDocument(doc);
+}
+
+bool TextConfigurator::isHtml() const
+{
+    return m_isHtml->isChecked();
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/text/textconfigurator.h tupi-0.2+git05/src/plugins/tools/text/textconfigurator.h
--- tupi-0.2+git04/src/plugins/tools/text/textconfigurator.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/text/textconfigurator.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,77 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TEXTCONFIGURATOR_H
+#define TEXTCONFIGURATOR_H
+
+#include "tglobal.h"
+#include "tfontchooser.h"
+
+#include <QWidget>
+#include <QLineEdit>
+#include <QFont>
+#include <QTextEdit>
+#include <QCheckBox>
+#include <QBoxLayout>
+#include <QFontDatabase>
+
+/**
+ * @author David Cuadrado
+*/
+
+class TUPI_PLUGIN TextConfigurator : public QWidget
+{
+    Q_OBJECT
+
+    public:
+        TextConfigurator(QWidget *parent = 0);
+        ~TextConfigurator();
+
+        QString text() const;
+        QFont textFont() const;
+        void setDocument(QTextDocument *doc);
+        bool isHtml() const;
+
+    private slots:
+        void changeFont();
+
+    private:
+        QTextEdit *m_text;
+        TFontChooser *m_fontChooser;
+        QCheckBox *m_isHtml;
+        QFont font;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/text/text.pro tupi-0.2+git05/src/plugins/tools/text/text.pro
--- tupi-0.2+git04/src/plugins/tools/text/text.pro	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/text/text.pro	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,37 @@
+QT += opengl core gui svg xml network
+
+unix {
+    !include(../../../../tupiglobal.pri){
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    include(../../../../win.pri)
+}
+
+INSTALLS += target 
+target.path = /plugins/ 
+
+HEADERS += texttool.h \
+           textconfigurator.h 
+
+SOURCES += texttool.cpp \
+           textconfigurator.cpp 
+
+CONFIG += plugin warn_on
+TEMPLATE = lib
+TARGET = tupitexttool
+
+FRAMEWORK_DIR = "../../../framework"
+include($$FRAMEWORK_DIR/framework.pri)
+
+LIBBASE_DIR = ../../../libbase
+STORE_DIR = ../../../store
+LIBTUPI_DIR = ../../../libtupi
+COMMON_DIR = ../common
+
+include($$LIBBASE_DIR/libbase.pri)	
+include($$STORE_DIR/store.pri)
+include($$LIBTUPI_DIR/libtupi.pri)
+include($$COMMON_DIR/common.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/text/texttool.cpp tupi-0.2+git05/src/plugins/tools/text/texttool.cpp
--- tupi-0.2+git04/src/plugins/tools/text/texttool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/text/texttool.cpp	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,171 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "texttool.h"
+#include "tupscene.h"
+#include "tupinputdeviceinformation.h"
+#include "tupgraphicsscene.h"
+#include "tupprojectrequest.h"
+#include "tupprojectresponse.h"
+#include "tuplibraryobject.h"
+#include "tuprequestbuilder.h"
+
+TextTool::TextTool()
+{
+    m_configurator = new TextConfigurator;
+    setupActions();
+}
+
+TextTool::~TextTool()
+{
+}
+
+QStringList TextTool::keys() const
+{
+    return QStringList() << tr("Text");
+}
+
+void TextTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(brushManager);
+
+    QList<QGraphicsItem *> items = scene->items(input->pos());
+
+    if (items.count() > 0) {
+        QGraphicsItem *itemPress = items[0];
+        if  (itemPressed(itemPress))
+             return;
+    }
+
+    m_item = new TupTextItem;
+    m_item->setPos(input->pos());
+    m_item->setDefaultTextColor(brushManager->penColor());
+}
+
+void TextTool::doubleClick(const TupInputDeviceInformation *input, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(scene);
+}
+
+bool TextTool::itemPressed(QGraphicsItem *item)
+{
+    if (TupTextItem *text = qgraphicsitem_cast<TupTextItem *>(item)) {
+        text->setEditable(true);
+        text->setFocus();
+        return true;
+    }
+
+    return false;
+}
+
+void TextTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(scene);
+    Q_UNUSED(scene);
+    Q_UNUSED(brushManager);
+}
+
+void TextTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
+{
+    Q_UNUSED(input);
+    Q_UNUSED(brushManager);
+
+    if (m_configurator->text().isEmpty()) {
+        delete m_item;
+        return;
+    }
+
+    if (m_configurator->isHtml())
+        m_item->setHtml(m_configurator->text());
+    else
+        m_item->setPlainText(m_configurator->text());
+
+    m_item->setFont(m_configurator->textFont());
+
+    scene->includeObject(m_item);
+
+    QDomDocument doc;
+    doc.appendChild(m_item->toXml(doc));
+
+    TupProjectRequest event = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), 
+                                                                   scene->currentFrameIndex(), 0, QPointF(), scene->spaceMode(), 
+                                                                   TupLibraryObject::Item, TupProjectRequest::Add, doc.toString());
+    emit requested(&event);
+}
+
+QMap<QString, TAction *> TextTool::actions() const
+{
+    return m_actions;
+}
+
+int TextTool::toolType() const
+{
+    return Brush;
+}
+		
+QWidget *TextTool::configurator()
+{
+    return m_configurator;
+}
+
+void TextTool::aboutToChangeTool()
+{
+}
+
+void TextTool::aboutToChangeScene(TupGraphicsScene *scene)
+{
+    Q_UNUSED(scene);
+}
+
+void TextTool::setupActions()
+{
+    TAction *text = new TAction(QIcon(kAppProp->themeDir() + "icons/text.png"), tr("Text"), this);
+    text->setShortcut(QKeySequence(tr("T")));
+    text->setCursor(QCursor(kAppProp->themeDir() + "cursors/text.png"));
+
+    m_actions.insert(tr("Text"), text);
+}
+
+void TextTool::saveConfig()
+{
+}
+
+void TextTool::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape)
+        emit closeHugeCanvas();
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/text/texttool.h tupi-0.2+git05/src/plugins/tools/text/texttool.h
--- tupi-0.2+git04/src/plugins/tools/text/texttool.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/text/texttool.h	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,90 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez / xtingray                                          *
+ *                                                                         *
+ *   KTooN's versions:                                                     * 
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TEXTTOOL_H
+#define TEXTTOOL_H
+
+#include "tglobal.h"
+#include "tuptoolplugin.h"
+#include "tuptextitem.h"
+#include "textconfigurator.h"
+#include "tupbrushmanager.h"
+
+#include <QPointF>
+#include <QFontMetrics>
+#include <QKeySequence>
+#include <QGraphicsView>
+
+/**
+ * @author David Cuadrado
+*/
+class TUPI_PLUGIN TextTool : public TupToolPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.maefloresta.tupi.TupToolInterface" FILE "texttool.json")
+    
+    public:
+        TextTool();
+        virtual ~TextTool();
+        
+        virtual QStringList keys() const;
+        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void doubleClick(const TupInputDeviceInformation *input, TupGraphicsScene *scene);
+        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
+        virtual bool itemPressed(QGraphicsItem *item);
+        virtual QMap<QString, TAction *>actions() const;
+        int toolType() const;
+        virtual QWidget *configurator();
+        void aboutToChangeScene(TupGraphicsScene *scene);
+        void aboutToChangeTool();
+        virtual void saveConfig();
+        virtual void keyPressEvent(QKeyEvent *event);
+
+    signals:
+        void closeHugeCanvas();
+        void callForPlugin(int menu, int index);
+ 
+    private:
+        void setupActions();
+        
+    private:
+        TupTextItem *m_item;
+        TextConfigurator *m_configurator;
+        QPoint m_position;
+        QMap<QString, TAction *> m_actions;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/text/texttool.json tupi-0.2+git05/src/plugins/tools/text/texttool.json
--- tupi-0.2+git04/src/plugins/tools/text/texttool.json	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/text/texttool.json	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,3 @@
+{
+"Keys": [ "TextTool" ]
+}
diff -Nru tupi-0.2+git04/src/plugins/tools/texttool/textconfigurator.cpp tupi-0.2+git05/src/plugins/tools/texttool/textconfigurator.cpp
--- tupi-0.2+git04/src/plugins/tools/texttool/textconfigurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/texttool/textconfigurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "textconfigurator.h"
-#include "tfontchooser.h"
-// #include "kspellhighlighter.h"
-#include "tdebug.h"
-
-#include <QBoxLayout>
-#include <QFontDatabase>
-#include <QCheckBox>
-
-TextConfigurator::TextConfigurator(QWidget *parent) : QWidget(parent)
-{
-    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    setLayout(layout);
-
-    m_fontChooser = new TFontChooser;
-    layout->addWidget(m_fontChooser);
-
-    m_text = new QTextEdit(this);
-    layout->addWidget(m_text);
-
-    m_isHtml = new QCheckBox(tr("Html"));
-    layout->addWidget(m_isHtml);
-
-    layout->addStretch(1);
-
-    connect(m_fontChooser, SIGNAL(fontChanged()), this, SLOT(changeFont()));
-    changeFont();
-
-    // new KSpellHighlighter(m_text->document());
-}
-
-TextConfigurator::~TextConfigurator()
-{
-}
-
-QString TextConfigurator::text() const
-{
-    return m_text->toPlainText();
-}
-
-QFont TextConfigurator::textFont() const
-{
-    return font;
-}
-
-void TextConfigurator::changeFont()
-{
-    font = m_fontChooser->currentFont();
-
-    // kFatal() << "TextConfigurator::changeFont() - Font Family: " << font.family();
-    // kFatal() << "TextConfigurator::changeFont() - Font Style: " << font.style(); 
-    // kFatal() << "TextConfigurator::changeFont() - Font Size: " << font.pointSize();
-
-    m_text->setFont(font);
-
-    adjustSize();
-}
-
-void TextConfigurator::setDocument(QTextDocument *doc)
-{
-    m_text->setDocument(doc);
-}
-
-bool TextConfigurator::isHtml() const
-{
-    return m_isHtml->isChecked();
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/texttool/textconfigurator.h tupi-0.2+git05/src/plugins/tools/texttool/textconfigurator.h
--- tupi-0.2+git04/src/plugins/tools/texttool/textconfigurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/texttool/textconfigurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TEXTCONFIGURATOR_H
-#define TEXTCONFIGURATOR_H
-
-#include <QWidget>
-#include <QLineEdit>
-#include <QFont>
-#include <QTextEdit>
-
-class TFontChooser;
-class QCheckBox;
-
-/**
- * @author David Cuadrado
-*/
-
-class TextConfigurator : public QWidget
-{
-    Q_OBJECT
-    public:
-        TextConfigurator(QWidget *parent = 0);
-        ~TextConfigurator();
-        QString text() const;
-
-        QFont textFont() const;
-
-        void setDocument(QTextDocument *doc);
-
-        bool isHtml() const;
-
-    private slots:
-        void changeFont();
-
-    private:
-        QTextEdit *m_text;
-        TFontChooser *m_fontChooser;
-        QCheckBox *m_isHtml;
-        QFont font;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/texttool/texttool.cpp tupi-0.2+git05/src/plugins/tools/texttool/texttool.cpp
--- tupi-0.2+git04/src/plugins/tools/texttool/texttool.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/texttool/texttool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "texttool.h"
-
-#include "tglobal.h"
-#include "tupscene.h"
-#include "tupinputdeviceinformation.h"
-#include "tupgraphicsscene.h"
-#include "tupprojectrequest.h"
-#include "tupprojectresponse.h"
-#include "tuplibraryobject.h"
-#include "tuprequestbuilder.h"
-
-#include <QPointF>
-#include <QFontMetrics>
-#include <QKeySequence>
-#include <QGraphicsView>
-
-TextTool::TextTool()
-{
-    m_configurator = new TextConfigurator;
-    setupActions();
-}
-
-TextTool::~TextTool()
-{
-}
-
-QStringList TextTool::keys() const
-{
-    return QStringList() << tr("Text");
-}
-
-void TextTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(brushManager);
-
-    QList<QGraphicsItem *> items = scene->items(input->pos());
-
-    if (items.count() > 0) {
-        QGraphicsItem *itemPress = items[0];
-        if  (itemPressed(itemPress))
-             return;
-    }
-
-    m_item = new TupTextItem;
-    m_item->setPos(input->pos());
-    m_item->setDefaultTextColor(brushManager->penColor());
-}
-
-void TextTool::doubleClick(const TupInputDeviceInformation *input, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(scene);
-}
-
-bool TextTool::itemPressed(QGraphicsItem *item)
-{
-    if (TupTextItem *text = qgraphicsitem_cast<TupTextItem *>(item)) {
-        text->setEditable(true);
-        text->setFocus();
-        return true;
-    }
-
-    return false;
-}
-
-void TextTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(scene);
-    Q_UNUSED(scene);
-    Q_UNUSED(brushManager);
-}
-
-void TextTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    if (m_configurator->text().isEmpty()) {
-        delete m_item;
-        return;
-    }
-
-    if (m_configurator->isHtml())
-        m_item->setHtml(m_configurator->text());
-    else
-        m_item->setPlainText(m_configurator->text());
-
-    m_item->setFont(m_configurator->textFont());
-
-    scene->includeObject(m_item);
-
-    QDomDocument doc;
-    doc.appendChild(m_item->toXml(doc));
-
-    TupProjectRequest event = TupRequestBuilder::createItemRequest(scene->currentSceneIndex(), scene->currentLayerIndex(), 
-                                                                   scene->currentFrameIndex(), 0, QPointF(), scene->spaceMode(), 
-                                                                   TupLibraryObject::Item, TupProjectRequest::Add, doc.toString());
-    emit requested(&event);
-}
-
-QMap<QString, TAction *> TextTool::actions() const
-{
-    return m_actions;
-}
-
-int TextTool::toolType() const
-{
-    return Brush;
-}
-		
-QWidget *TextTool::configurator()
-{
-    return m_configurator;
-}
-
-void TextTool::aboutToChangeTool()
-{
-}
-
-void TextTool::aboutToChangeScene(TupGraphicsScene *scene)
-{
-    Q_UNUSED(scene);
-}
-
-void TextTool::setupActions()
-{
-    TAction *text = new TAction(QIcon(kAppProp->themeDir() + "icons/text.png"), tr("Text"), this);
-    text->setShortcut(QKeySequence(tr("T")));
-    text->setCursor(QCursor(kAppProp->themeDir() + "cursors/text.png"));
-
-    m_actions.insert(tr("Text"), text);
-}
-
-void TextTool::saveConfig()
-{
-}
-
-void TextTool::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape)
-        emit closeHugeCanvas();
-}
-
-Q_EXPORT_PLUGIN2(tup_textool, TextTool);
diff -Nru tupi-0.2+git04/src/plugins/tools/texttool/texttool.h tupi-0.2+git05/src/plugins/tools/texttool/texttool.h
--- tupi-0.2+git04/src/plugins/tools/texttool/texttool.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/texttool/texttool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TEXTTOOL_H
-#define TEXTTOOL_H
-
-#include "tuptoolplugin.h"
-#include "tuptextitem.h"
-#include "textconfigurator.h"
-#include "tupbrushmanager.h"
-
-/**
- * @author David Cuadrado
-*/
-class TextTool : public TupToolPlugin
-{
-    Q_OBJECT
-    
-    public:
-        TextTool();
-        virtual ~TextTool();
-        
-        virtual QStringList keys() const;
-        
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void doubleClick(const TupInputDeviceInformation *input, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual bool itemPressed(QGraphicsItem *item);
-        virtual QMap<QString, TAction *>actions() const;
-        int toolType() const;
-        virtual QWidget *configurator();
-        void aboutToChangeScene(TupGraphicsScene *scene);
-        void aboutToChangeTool();
-        virtual void saveConfig();
-        virtual void keyPressEvent(QKeyEvent *event);
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
- 
-    private:
-        void setupActions();
-        
-    private:
-        TupTextItem *m_item;
-        TextConfigurator *m_configurator;
-        QPoint m_position;
-        QMap<QString, TAction *> m_actions;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/texttool/texttool.json tupi-0.2+git05/src/plugins/tools/texttool/texttool.json
--- tupi-0.2+git04/src/plugins/tools/texttool/texttool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/texttool/texttool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "TextTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/texttool/texttool.pro tupi-0.2+git05/src/plugins/tools/texttool/texttool.pro
--- tupi-0.2+git04/src/plugins/tools/texttool/texttool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/texttool/texttool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/texttool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/ 
-
-HEADERS += texttool.h \
-           textconfigurator.h 
-SOURCES += texttool.cpp \
-           textconfigurator.cpp 
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupitexttool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/tools_config.pri tupi-0.2+git05/src/plugins/tools/tools_config.pri
--- tupi-0.2+git04/src/plugins/tools/tools_config.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/tools_config.pri	2014-12-15 14:21:33.000000000 +0000
@@ -1,8 +1,7 @@
-
-STORE_DIR = ../../../../src/store
-LIBTUPI_DIR = ../../../../src/libtupi
-LIBBASE_DIR = ../../../../src/libbase
-COMMON_DIR = ../../../../src/plugins/tools/common
+STORE_DIR = ../../store
+LIBTUPI_DIR = ../../libtupi
+LIBBASE_DIR = ../../libbase
+COMMON_DIR = ../../plugins/tools/common
 
 include($$STORE_DIR/store.pri)
 include($$LIBTUPI_DIR/libtupi.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/tools.pro tupi-0.2+git05/src/plugins/tools/tools.pro
--- tupi-0.2+git04/src/plugins/tools/tools.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/tools.pro	2014-12-15 14:21:33.000000000 +0000
@@ -1,27 +1,23 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools
-# Target is a subdirs project 
-
 SUBDIRS += common \
-           penciltool \
-           inktool \
-           # schemetool \
-           selecttool \
-           contourselectiontool \
-           texttool \
-           geometrictool \
-           viewtool \
-           filltool \
-           erasertool  \
-           polylinetool \
-           positiontool \
-           rotationtool \
-           scaletool \
-           sheartool \
-           opacitytool \
-           coloringtool \
-           compoundtool
+           pencil \
+           ink \
+           # scheme \
+           selection \
+           nodes \
+           text \
+           geometric \
+           shift \
+           fill \
+           eraser \
+           polyline \
+           position \
+           rotation \
+           scale \
+           shear \
+           opacity \
+           color \
+           compound \
+           papagayo
 
 CONFIG += ordered warn_on
 TEMPLATE = subdirs
diff -Nru tupi-0.2+git04/src/plugins/tools/viewtool/viewtool.cpp tupi-0.2+git05/src/plugins/tools/viewtool/viewtool.cpp
--- tupi-0.2+git04/src/plugins/tools/viewtool/viewtool.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/viewtool/viewtool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,349 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "viewtool.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "tconfig.h"
-#include "tuprectitem.h"
-#include "tupellipseitem.h"
-#include "tuplineitem.h"
-#include "tupscene.h"
-#include "tupinputdeviceinformation.h"
-#include "tupgraphicsscene.h"
-
-#include <QKeySequence>
-#include <QDebug>
-#include <QImage>
-#include <QPaintDevice>
-#include <QGraphicsView>
-
-struct ViewTool::Private
-{
-    QMap<QString, TAction *> actions;
-    QGraphicsRectItem *rect;
-    bool added;
-    QPointF firstPoint;
-    TupGraphicsScene *scene;
-    ZoomConfigurator *configurator;
-    QCursor zoomInCursor;
-    QCursor zoomOutCursor;
-    QCursor handCursor;
-    QSize projectSize;
-};
-
-ViewTool::ViewTool() : k(new Private)
-{
-    k->rect = 0;
-    k->scene = 0;
-    k->configurator = 0;
-
-    setupActions();
-}
-
-ViewTool::~ViewTool()
-{
-}
-
-void ViewTool::init(TupGraphicsScene *scene)
-{
-    k->scene = scene;
-
-    foreach (QGraphicsView *view, scene->views()) {
-             view->setDragMode(QGraphicsView::NoDrag);
-             foreach (QGraphicsItem *item, scene->items()) {
-                      item->setFlag(QGraphicsItem::ItemIsSelectable, false);
-                      item->setFlag(QGraphicsItem::ItemIsMovable, false);
-             }
-    }
-}
-
-QStringList ViewTool::keys() const
-{
-    return QStringList() << tr("Zoom In") << tr("Zoom Out") << tr("Hand");
-}
-
-void ViewTool::setupActions()
-{
-    TAction *zoomIn = new TAction(QIcon(kAppProp->themeDir() + "icons/zoom_in.png"), tr("Zoom In"), this);
-    zoomIn->setShortcut(QKeySequence(tr("Z")));
-    k->zoomInCursor = QCursor(kAppProp->themeDir() + "cursors/zoom.png");
-    zoomIn->setCursor(k->zoomInCursor);
-    
-    k->actions.insert(tr("Zoom In"), zoomIn);
-
-    TAction *zoomOut = new TAction(QIcon(kAppProp->themeDir() + "icons/zoom_out.png"), tr("Zoom Out"), this);
-    zoomOut->setShortcut(QKeySequence(tr("Shift+Z")));
-    k->zoomOutCursor = QCursor(kAppProp->themeDir() + "cursors/zoom.png");
-    zoomOut->setCursor(k->zoomOutCursor);
-   
-    k->actions.insert(tr("Zoom Out"), zoomOut);
-    
-    TAction *handAction = new TAction(QIcon(kAppProp->themeDir() + "icons/hand.png"), tr("Hand"), this);
-    handAction->setShortcut(QKeySequence(tr("H")));
-    k->handCursor = QCursor(kAppProp->themeDir() + "cursors/hand.png");
-    handAction->setCursor(k->handCursor);
-
-    k->actions.insert(tr("Hand"), handAction);
-}
-
-void ViewTool::press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-    Q_UNUSED(scene);
-
-    k->added = false;
-    k->rect = new QGraphicsRectItem(QRectF(input->pos(), QSize(0,0)));
-    k->rect->setPen(QPen(Qt::red, 1, Qt::SolidLine));
-
-    k->firstPoint = input->pos();
-}
-
-void ViewTool::move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(input);
-    Q_UNUSED(brushManager);
-
-    foreach (QGraphicsView * view, scene->views()) {
-             if (name() == tr("Zoom In") || name() == tr("Zoom Out"))
-                 view->setDragMode(QGraphicsView::NoDrag);
-             // else if (name() == tr("Hand"))
-             //          view->setDragMode(QGraphicsView::ScrollHandDrag);
-    }
-
-    if (name() == tr("Hand")) {
-        k->scene = scene; // <- SQA: Trace this variable
-    } else if (name() == tr("Zoom In") && input->keyModifiers() == Qt::ControlModifier) {
-
-               if (!k->added) {
-                   scene->addItem(k->rect);
-                   k->added = true;
-               }
-
-               int xMouse = input->pos().x();
-               int yMouse = input->pos().y();
-               int xInit = k->firstPoint.x();
-               int yInit = k->firstPoint.y();
-
-               QRectF rect = k->rect->rect();
-
-               if (xMouse >= xInit) {
-                   if (yMouse >= yInit)
-                       rect.setBottomRight(input->pos());
-                   else
-                       rect.setTopRight(input->pos());
-               } else {
-                   if (yMouse >= yInit)
-                       rect.setBottomLeft(input->pos());
-                   else
-                       rect.setTopLeft(input->pos());
-               }
-
-               k->rect->setRect(rect);
-               //rect = rect.normalized();
-
-               if (rect.height() > 10 && rect.width() > 10)
-                   k->rect->setPen(QPen(Qt::gray, 0.5, Qt::SolidLine));
-               else
-                   k->rect->setPen(QPen(QColor(250, 0, 0, 150), 1, Qt::SolidLine));
-    }
-}
-
-void ViewTool::release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene)
-{
-    Q_UNUSED(brushManager);
-
-    if (name() == tr("Hand")) {
-        qreal initX = k->firstPoint.x();
-        qreal initY = k->firstPoint.y();
-        qreal x = input->pos().x();
-        qreal y = input->pos().y();
-
-        qreal deltaX = initX - x;
-        qreal deltaY = initY - y; 
-
-        /*
-        if (fabs(deltaX) > 50)
-            deltaX = 50;
-
-        if (fabs(deltaY) > 50)
-            deltaY = 50;
-        */
-
-        qreal centerX = initX + deltaX;
-        qreal centerY = initY + deltaY;
-
-        foreach (QGraphicsView *view, scene->views()) {
-                 view->centerOn(QPointF(centerX, centerY));
-                 view->setSceneRect(centerX - (k->projectSize.width()/2), centerY - (k->projectSize.height()/2), 
-                                    k->projectSize.width(), k->projectSize.height());
-        }
-
-    } else if (name() == tr("Zoom In") || name() == tr("Zoom Out")) { 
-               // Zoom Square mode
-               if (input->button() == Qt::LeftButton && input->keyModifiers() == Qt::ControlModifier) {    
-
-                   foreach (QGraphicsView *view, scene->views()) {
-                            QRectF rect;
-                            if (k->rect) {
-                                rect = k->rect->rect();
-                            } else {
-                                int xMouse = input->pos().x();
-                                int yMouse = input->pos().y();
-                                int xInit = k->firstPoint.x();
-                                int yInit = k->firstPoint.y();
-
-                                QRectF rect = k->rect->rect();
-
-                                if (xMouse >= xInit) {
-                                    if (yMouse >= yInit)
-                                        rect.setBottomRight(input->pos());
-                                    else
-                                        rect.setTopRight(input->pos());
-                                } else {
-                                    if (yMouse >= yInit)
-                                        rect.setBottomLeft(input->pos());
-                                    else
-                                        rect.setTopLeft(input->pos());
-                                }
-                            }
-
-                            view->fitInView(rect, Qt::KeepAspectRatio);
-                   }
-
-               } else { // Normal Zoom
-
-                    foreach (QGraphicsView *view, scene->views()) {
-                             if (name() == tr("Zoom In")) {
-                                 // SQA: the function centerOn is not doing what we really need :S
-                                 view->centerOn(input->pos());
-                                 view->scale(1 + k->configurator->getFactor(), 1 + k->configurator->getFactor());
-                             } else if (name() == tr("Zoom Out")) {
-                                        view->centerOn(input->pos());
-                                        view->scale(1 - k->configurator->getFactor(), 1 - k->configurator->getFactor());
-                             }
-                    }
-               } 
-
-               if (k->rect) {
-                   delete k->rect;
-                   k->rect = 0;
-               }
-    }
-}
-
-void ViewTool::autoZoom() 
-{
-    foreach (QGraphicsView * view, k->scene->views()) {
-             if (name() == tr("Zoom In")) {
-                 view->scale(1 + k->configurator->getFactor(), 1 + k->configurator->getFactor());
-             } else if (name() == tr("Zoom Out")) {
-                        view->scale(1 - k->configurator->getFactor(), 1 - k->configurator->getFactor());
-             }
-    }
-}
-
-void ViewTool::setProjectSize(const QSize size)
-{
-    k->projectSize = size;
-}
-
-QMap<QString, TAction *> ViewTool::actions() const
-{
-    return k->actions;
-}
-
-int ViewTool::toolType() const
-{
-    return TupToolInterface::View;
-}
-
-QWidget *ViewTool::configurator()
-{
-    if (! k->configurator)
-        k->configurator = new ZoomConfigurator;
-
-    return k->configurator;
-}
-
-void ViewTool::aboutToChangeScene(TupGraphicsScene *)
-{
-}
-
-void ViewTool::aboutToChangeTool()
-{
-    if (name() == tr("Hand")) {
-       if (k->scene) {
-           foreach (QGraphicsView * view, k->scene->views())
-                    view->setDragMode(QGraphicsView::NoDrag);
-       }
-    }
-}
-
-void ViewTool::saveConfig()
-{
-    if (k->configurator) {
-        TCONFIG->beginGroup("ZoomTool");
-        TCONFIG->setValue("zoomFactor", k->configurator->getFactor());
-    }
-}
-
-void ViewTool::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_F11 || event->key() == Qt::Key_Escape) {
-        emit closeHugeCanvas();
-    // } else if (event->modifiers() != Qt::ShiftModifier && event->modifiers() != Qt::ControlModifier) {
-    } else {
-        QPair<int, int> flags = TupToolPlugin::setKeyAction(event->key(), event->modifiers());
-        if (flags.first != -1 && flags.second != -1)
-            emit callForPlugin(flags.first, flags.second);
-    }
-}
-
-QCursor ViewTool::cursor() const
-{
-   if (name() == tr("Hand")) {
-       return k->handCursor;
-   } else if (name() == tr("Zoom In")) {
-              return k->zoomInCursor;
-   } else if (name() == tr("Zoom Out")) {
-              return k->zoomOutCursor;
-   } 
-
-   return QCursor(Qt::ArrowCursor);
-}
-
-Q_EXPORT_PLUGIN2(tup_view, ViewTool)
diff -Nru tupi-0.2+git04/src/plugins/tools/viewtool/viewtool.h tupi-0.2+git05/src/plugins/tools/viewtool/viewtool.h
--- tupi-0.2+git04/src/plugins/tools/viewtool/viewtool.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/viewtool/viewtool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef VIEWTOOL_H
-#define VIEWTOOL_H
-
-#include "tuptoolplugin.h"
-#include "zoomconfigurator.h"
-
-#include <QObject>
-#include <QLabel>
-#include <QGraphicsRectItem>
-#include <QSize>
-
-class TupGraphicsScene;
-
-/**
- * @author Jorge Cuadrado
-*/
-
-class ViewTool: public TupToolPlugin
-{
-    Q_OBJECT
-
-    public:
-        ViewTool();
-        ~ViewTool();
-
-        virtual void init(TupGraphicsScene *scene);
-        virtual QStringList keys() const;
-        
-        virtual void press(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void move(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-        virtual void release(const TupInputDeviceInformation *input, TupBrushManager *brushManager, TupGraphicsScene *scene);
-
-        virtual QMap<QString, TAction *> actions() const;
-        int toolType() const;
-        
-        virtual QWidget *configurator();
-        virtual void aboutToChangeScene(TupGraphicsScene *scene);
-        virtual void aboutToChangeTool();
-        virtual void saveConfig();
-        virtual void keyPressEvent(QKeyEvent *event);
-        virtual QCursor cursor() const;
-
-        virtual void autoZoom();
-        virtual void setProjectSize(const QSize size);
-
-    signals:
-        void closeHugeCanvas();
-        void callForPlugin(int menu, int index);
-
-    private:
-        void setupActions();
-
-    private:
-        struct Private;
-        Private *const k;
-
-    /*
-    private:
-        QMap<QString, TAction *> m_actions;
-        QGraphicsRectItem *m_rect;
-        bool added;
-        QPointF firstPoint; 
-        TupGraphicsScene *m_scene;
-        ZoomConfigurator *m_configurator;
-    */
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/plugins/tools/viewtool/viewtool.json tupi-0.2+git05/src/plugins/tools/viewtool/viewtool.json
--- tupi-0.2+git04/src/plugins/tools/viewtool/viewtool.json	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/viewtool/viewtool.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-{
-"Keys": [ "ViewTool" ]
-}
diff -Nru tupi-0.2+git04/src/plugins/tools/viewtool/viewtool.pro tupi-0.2+git05/src/plugins/tools/viewtool/viewtool.pro
--- tupi-0.2+git04/src/plugins/tools/viewtool/viewtool.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/viewtool/viewtool.pro	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/plugins/tools/viewtool
-# Target is a library:  
-
-INSTALLS += target 
-target.path = /plugins/ 
-
-HEADERS += viewtool.h \
-           zoomconfigurator.h
-SOURCES += viewtool.cpp \ 
-           zoomconfigurator.cpp
-
-CONFIG += plugin warn_on
-TEMPLATE = lib
-TARGET = tupiviewtool
-
-FRAMEWORK_DIR = "../../../framework"
-include($$FRAMEWORK_DIR/framework.pri)
-include(../tools_config.pri)
-
-include(../../../../tupiglobal.pri)
diff -Nru tupi-0.2+git04/src/plugins/tools/viewtool/zoomconfigurator.cpp tupi-0.2+git05/src/plugins/tools/viewtool/zoomconfigurator.cpp
--- tupi-0.2+git04/src/plugins/tools/viewtool/zoomconfigurator.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/viewtool/zoomconfigurator.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#include "zoomconfigurator.h"
-#include <QBoxLayout>
-#include <QRadioButton>
-#include <QButtonGroup>
-#include <QLabel>
-
-#include "timagebutton.h"
-#include "tseparator.h"
-
-#include "tglobal.h"
-#include "tdebug.h"
-#include "tconfig.h"
-
-ZoomConfigurator::ZoomConfigurator(QWidget *parent) :QWidget(parent)
-{
-    TINIT;
-
-    QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
-    QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom);
-
-    scale = new QLabel(tr("Scale Factor"));
-    scale->setFont(QFont("Arial", 8, QFont::Normal, false));
-    scale->setAlignment(Qt::AlignHCenter);
-    layout->addWidget(scale);
-
-    factor = new QDoubleSpinBox();
-
-    factor->setDecimals(1);
-    factor->setSingleStep(0.1);
-    factor->setMinimum(0.1);
-    factor->setMaximum(0.9);
-    layout->addWidget(factor);
-
-    QLabel *label = new QLabel(tr("Tips"));
-    label->setAlignment(Qt::AlignHCenter);
-    label->setFont(QFont("Arial", 8, QFont::Normal, false));
-
-    QTextEdit *textArea = new QTextEdit; 
-
-    textArea->setFont(QFont("Arial", 8, QFont::Normal, false));
-    textArea->setHtml("<p><b>" + tr("Zoom Square mode") + ":</b> " + tr("Press Ctrl key + Mouse left button") + "</p>"); 
-
-    QString text = textArea->document()->toPlainText();
-    int height = (text.length()*270)/207;
-
-    textArea->setFixedHeight(height);
-
-    mainLayout->addLayout(layout);
-    mainLayout->addWidget(label);
-    mainLayout->addWidget(textArea);
-    mainLayout->addStretch(2);
-
-    TCONFIG->beginGroup("ZoomTool");
-    double value = TCONFIG->value("zoomFactor", -1).toDouble();
-
-    if (value > 0) 
-        factor->setValue(value);
-    else 
-        factor->setValue(0.5);
-}
-
-ZoomConfigurator::~ZoomConfigurator()
-{
-    TEND;
-}
-
-double ZoomConfigurator::getFactor() const
-{
-    return factor->value();
-}
-
diff -Nru tupi-0.2+git04/src/plugins/tools/viewtool/zoomconfigurator.h tupi-0.2+git05/src/plugins/tools/viewtool/zoomconfigurator.h
--- tupi-0.2+git04/src/plugins/tools/viewtool/zoomconfigurator.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/plugins/tools/viewtool/zoomconfigurator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef ZOOMCONFIGURATOR_H
-#define ZOOMCONFIGURATOR_H
-
-#include <QResizeEvent>
-#include <QLabel>
-#include <QRadioButton>
-#include <QDoubleSpinBox>
-
-class QTableWidget;
-class QTableWidgetItem;
-
-/**
- * @author Jorge Cuadrado
-**/
-
-class ZoomConfigurator : public QWidget
-{
-    Q_OBJECT
-
-    public:
-        ZoomConfigurator(QWidget *parent = 0);
-        ~ZoomConfigurator();
-        //bool zoomIn();
-        double getFactor() const;
-
-    //protected:
-        //void resizeEvent(QResizeEvent *);
-
-    /* private slots:
-        void setZoomIn();
-        void setZoomOut(); */
-
-    private:
-        //QRadioButton *in;
-        //QRadioButton *out;
-        QDoubleSpinBox *factor;
-        QLabel *scale;
-};
-
-#endif
diff -Nru tupi-0.2+git04/src/shell/data/ca/crashhandler.xml tupi-0.2+git05/src/shell/data/ca/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/ca/crashhandler.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ca/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<CrashHandler>
-	<Title text="Fatal error" />
-	<Message text="Querido Animador:" color="red" />
-	<Button text="Cerrar" />
-	<Default text="Tupí se ha cerrado inesperadamente debido a una infame falla de programación! Estamos terriblemente apenados contigo :(&lt;br&gt;&lt;br&gt;Pero, no todo está perdido! Puedes potencialmente ayudarnos a mejorar el programa.&lt;br&gt;Por favor, realiza un reporte del error en &lt;a href=http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug &gt;http://maefloresta.com/&lt;/a&gt; para que nosotros podamos repararlo pronto. &lt;br&gt;&lt;br&gt;Muchas gracias,&lt;br&gt;&lt;br&gt;--El &lt;i&gt;apenado&lt;/i&gt; equipo de desarrollo :S" image="crash.png" />
-</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/ca/credits.xml tupi-0.2+git05/src/shell/data/ca/credits.xml
--- tupi-0.2+git04/src/shell/data/ca/credits.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ca/credits.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-<xml>
-<credits>
-Tupí - Magia 2D Libre 
-Versión 0.2 git04 [ Código: Argentum ]
-
-http://www.maefloresta.com
-
-Desarrolladores 
-   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
-
-KTooN - Versión &#60; 0.9 
-
-Desarrolladores 
-   David A. Cuadrado 
-   Jorge H. Cuadrado 
-
-Versión &#60;= 0.7 
-
-Desarrolladores
-   Simena Dinas 
-   Fernando Jose Roldán Correa 
-
----------------------------- 
-Traductores 
-
-Alemán:
-   Alexander Greye
-
-Catalán: 
-   José Ángel Gallegos Gómez 
-   Edelweiss Garcia i Fuentes 
-
-Checo:
-   Pavel Fric
-
-Español: 
-   Gustav Gonzalez 
-   David A. Cuadrado 
-
-Inglés:
-   Tim Wootton
-
-Portugués: 
-   Alyne Castro 
-
-Ruso: 
-   Sergey Garkusha
-
----------------------------- 
-Diseño Iconográfico 
-   Gustav Gonzalez
-
-----------------------------
-Port para MacOSX
-   Cristian Cepeda
-
----------------------------- 
-Agradecimientos especiales a: 
-   Markus Bongard por su colaboración 
-   incondicional en este proyecto 
-
-----------------------------
-Mae Floresta 
-www.maefloresta.com 
-2010
-
-"Sueña como si fueras a vivir por siempre, 
- vive como si fueras a morir hoy" 
-                                James Dean 
-</credits>
-</xml>
diff -Nru tupi-0.2+git04/src/shell/data/ca/license.html tupi-0.2+git05/src/shell/data/ca/license.html
--- tupi-0.2+git04/src/shell/data/ca/license.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ca/license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="gpl.css" />
-</head>
-<body>
-<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
-<center><b>Version 2, June 1991</b></center>
-<p align="justify">
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</p>
-<center><b>Preamble</b></center>
-<p align="justify">
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</p><p align="justify">
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p><p align="justify">
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p><p align="justify">
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p><p align="justify">
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p><p align="justify">
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p><p align="justify">
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p><p align="justify">
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p><p align="justify">
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-</p><p align="justify">
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p><p align="justify">
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p><p align="justify">
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p><p align="justify">
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p><p align="justify">
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p><p align="justify">
-<ul>
-<li>
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</li><li>
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</li><li>
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</li>
-</ul>
-</p><p align="justify">
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p><p align="justify">
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p><p align="justify">
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p><p align="justify">
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p><p align="justify">
-<ul>
-<li>
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</li><li>
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</li><li>
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</li>
-</ul>
-</p><p align="justify">
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p><p align="justify">
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p><p align="justify">
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p><p align="justify">
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p><p align="justify">
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p><p align="justify">
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p><p align="justify">
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p><p align="justify">
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p><p align="justify">
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p><p align="justify">
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p><p align="justify">
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p><p align="justify">
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p><p align="justify">
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p><p align="justify">
-			    NO WARRANTY
-</p><p align="justify">
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p><p align="justify">
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p><p align="justify">
-		     END OF TERMS AND CONDITIONS
-</p><p align="justify">
-	    How to Apply These Terms to Your New Programs
-</p><p align="justify">
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</p><p align="justify">
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</p><p align="justify">
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-</p><p align="justify">
-Also add information on how to contact you by electronic and paper mail.
-</p><p align="justify">
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</p><p align="justify">
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</p><p align="justify">
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</p><p align="justify">
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</p><p align="justify">
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</p><p align="justify">
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-</p><p align="justify">
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</p>
-</body>
diff -Nru tupi-0.2+git04/src/shell/data/ca/tips.xml tupi-0.2+git05/src/shell/data/ca/tips.xml
--- tupi-0.2+git04/src/shell/data/ca/tips.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ca/tips.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<TipOfDay>
-        <tip>Una vez abierto un proyecto, usando el atajo de teclado &lt;b&gt;F11&lt;/b&gt;, se puede visualizar el entorno de trabajo en &lt;b&gt;Pantalla Completa&lt;/b&gt;. Para retornar a la interfaz habitual, volver a presionar &lt;b&gt;F11&lt;/b&gt;.</tip>
-        <tip>Es posible acercar o alejar (zoom in / zoom out) el área de trabajo girando la rueda del ratón.</tip>
-        <tip>Eligiendo un color para el relleno desde el panel &lt;b&gt;Paleta de Colores&lt;/b&gt;, se pueden dibujar formas opacas con el color elegido. Para volver a obtener trazos sin relleno, hacer clic sobre el ícono que se encuentra junto a los cuadros de color de borde y relleno en el mismo panel.</tip> 
-        <tip>Seleccionando un marco y usando el atajo de teclado &lt;b&gt;Ctrl + Avpag&lt;/b&gt;, se obtiene una copia exacta de dicho marco en la posición siguiente. Es muy útil cuando se anima con la técnica de recorte (cutout) para desplazar un objeto paso a paso.</tip>
-        <tip>Con el atajo &lt;b&gt;Alt + R&lt;/b&gt; se activa la rotación del elemento seleccionado. Para restringir su giro, presionar la tecla &lt;b&gt;Shift&lt;/b&gt; durante la acción.</tip>
-        <tip>Clic derecho sobre el panel de la &lt;b&gt;Biblioteca&lt;/b&gt;, permite crear imágenes raster (mapa de bits) y svg desde programas externos como Gimp, Krita, MyPaint e Inkscape.</tip>
-</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/ca/twitter.xml tupi-0.2+git05/src/shell/data/ca/twitter.xml
--- tupi-0.2+git04/src/shell/data/ca/twitter.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ca/twitter.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<twitter>
-<word>
-Gemo
-</word>
-<ref>
-Diccionario de la Lengua Tupí
-</ref>
-<url>
-http://www.archive.org/stream/diccionariodali00diasgoog/diccionariodali00diasgoog_djvu.txt
-</url>
-<meaning>
-Nacer.
-</meaning>
-</twitter>
diff -Nru tupi-0.2+git04/src/shell/data/cs/crashhandler.xml tupi-0.2+git05/src/shell/data/cs/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/cs/crashhandler.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/cs/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<CrashHandler>
-	<Title text="Vážná chyba" />
-	<Message text="Drazí animátoři:" color="red" />
-	<Button text="Zavřít" />
-	<Default text="Tupi spadl kvůli ohavné chybě v programu! Je nám to velice líto:(&lt;br&gt;&lt;br&gt;Ale ještě není všechno ztraceno! Můžete nám pomoci při opravě příčin tohoto pádu.&lt;br&gt;Chybu, prosím, nahlašte na &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; a pomozte nám program udělat lepší.&lt;br&gt;&lt;br&gt;Díky,&lt;br&gt;&lt;br&gt;--Zahanbené &lt;i&gt;ashamed&lt;/i&gt; družstvo vývojářů" image="crash.png" />
-</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/cs/credits.xml tupi-0.2+git05/src/shell/data/cs/credits.xml
--- tupi-0.2+git04/src/shell/data/cs/credits.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/cs/credits.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-<xml>
-<credits>
-Tupi - Open 2D Magic
-Version 0.2 git04 [ Code Name: Argentum ]
-http://www.maefloresta.com
-
-Vývojáři
-   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
-
-KTooN - Verze &#60; 0.9 
-
-Vývojáři
-   David A. Cuadrado 
-   Jorge H. Cuadrado 
-
-Verze &#60;= 0.7 
-
-Vývojáři
-   Simena Dinas 
-   Fernando Jose Roldan Correa 
-
----------------------------- 
-Překladatelé
-
-Čeština: 
-   Pavel Fric
-
-Katalánština: 
-   José Ángel Gallegos Gómez
-   Edelweiss Garcia i Fuentes 
-
-Španělština: 
-   Gustav Gonzalez 
-   David A. Cuadrado 
-
-Portugalština: 
-   Alyne Castro 
-
-Ruština: 
-   Sergey Garkusha
-
-German: 
-   Alexander Greye 
-
----------------------------- 
-Ikony
-   Gustav Gonzalez
-
-----------------------------
-MacOSX port
-   Cristian Cepeda
-
----------------------------- 
-Zvláštní poděkování: 
-   Markus Bongard za jeho bezpodmínečnou 
-   podporu tomuto projektu 
-
-----------------------------
-Mae Floresta 
-www.maefloresta.com 
-2010
-
-"Dream as if you'll live forever, 
- live as if you'll die today"
-                                James Dean 
-</credits>
-</xml>
diff -Nru tupi-0.2+git04/src/shell/data/cs/gpl.css tupi-0.2+git05/src/shell/data/cs/gpl.css
--- tupi-0.2+git04/src/shell/data/cs/gpl.css	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/cs/gpl.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-body {
-     background-color:#00ff00;
-}
-
-.title {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:underline;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:16px;
-     font-weight:bold;
-}
-
-.paragraph {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:none;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:14px;
-     font-weight:normal;
-}
diff -Nru tupi-0.2+git04/src/shell/data/cs/license.html tupi-0.2+git05/src/shell/data/cs/license.html
--- tupi-0.2+git04/src/shell/data/cs/license.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/cs/license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="gpl.css" />
-</head>
-<body>
-<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
-<center><b>Version 2, June 1991</b></center>
-<p align="justify">
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</p>
-<center><b>Preamble</b></center>
-<p align="justify">
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</p><p align="justify">
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p><p align="justify">
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p><p align="justify">
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p><p align="justify">
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p><p align="justify">
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p><p align="justify">
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p><p align="justify">
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p><p align="justify">
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-</p><p align="justify">
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p><p align="justify">
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p><p align="justify">
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p><p align="justify">
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p><p align="justify">
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p><p align="justify">
-<ul>
-<li>
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</li><li>
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</li><li>
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</li>
-</ul>
-</p><p align="justify">
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p><p align="justify">
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p><p align="justify">
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p><p align="justify">
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p><p align="justify">
-<ul>
-<li>
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</li><li>
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</li><li>
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</li>
-</ul>
-</p><p align="justify">
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p><p align="justify">
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p><p align="justify">
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p><p align="justify">
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p><p align="justify">
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p><p align="justify">
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p><p align="justify">
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p><p align="justify">
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p><p align="justify">
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p><p align="justify">
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p><p align="justify">
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p><p align="justify">
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p><p align="justify">
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p><p align="justify">
-			    NO WARRANTY
-</p><p align="justify">
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p><p align="justify">
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p><p align="justify">
-		     END OF TERMS AND CONDITIONS
-</p><p align="justify">
-	    How to Apply These Terms to Your New Programs
-</p><p align="justify">
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</p><p align="justify">
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</p><p align="justify">
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-</p><p align="justify">
-Also add information on how to contact you by electronic and paper mail.
-</p><p align="justify">
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</p><p align="justify">
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</p><p align="justify">
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</p><p align="justify">
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</p><p align="justify">
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</p><p align="justify">
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-</p><p align="justify">
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</p>
-</body>
diff -Nru tupi-0.2+git04/src/shell/data/cs/tips.xml tupi-0.2+git05/src/shell/data/cs/tips.xml
--- tupi-0.2+git04/src/shell/data/cs/tips.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/cs/tips.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<TipOfDay>
-	<tip>Můžete si vytvořit vlastní štětce výběrem volby &quot;Nástroje -> Štětce -> Tvar štětce&quot;.</tip>
-	<tip>Pokud v programu naleznete chyby, nebo máte nějaké návrhy týkající se Tupi, oznamte je, prosím, na &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>Pokud objevíte nějakou novou radu a budete ji chtít sdílet, dejte nám, prosím vědět na &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>Můžete si vybrat, jak se bude rozhraní Tupi chovat. Pokud dvakrát klepnete na jakýkoli název okna s nástrojem, ukotvené okno se změní v plovoucí okno</tip>
-</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/cs/twitter.xml tupi-0.2+git05/src/shell/data/cs/twitter.xml
--- tupi-0.2+git04/src/shell/data/cs/twitter.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/cs/twitter.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<twitter>
-<word>
-Gemo
-</word>
-<ref>
-Slovník jazyka Tupi
-</ref>
-<url>
-http://www.archive.org/stream/diccionariodali00diasgoog/diccionariodali00diasgoog_djvu.txt
-</url>
-<meaning>
-Narodit se.
-</meaning>
-</twitter>
diff -Nru tupi-0.2+git04/src/shell/data/da/crashhandler.xml tupi-0.2+git05/src/shell/data/da/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/da/crashhandler.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/da/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<CrashHandler>
-	<Title text="Ødelæggende fejl" />
-	<Message text="Kære Animator:" color="red" />
-	<Button text="Luk" />
-	<Default text="Tupi gik ned på grund af en famøs software fejl! Det er vi meget kede af :(&lt;br&gt;&lt;br&gt;Men - alt er ikke tabt! Du kan hjælpe os med at fikse problemet.&lt;br&gt;Lav venligst en bug rapport på &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; og hjælp os med at lave et bedre program.&lt;br&gt;&lt;br&gt;Tak,&lt;br&gt;&lt;br&gt;--Det &lt;i&gt;flove&lt;/i&gt; udviklings team" image="crash.png" />
-</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/da/credits.xml tupi-0.2+git05/src/shell/data/da/credits.xml
--- tupi-0.2+git04/src/shell/data/da/credits.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/da/credits.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-<xml>
-<credits>
-Tupi - Open 2D Magic
-Version 0.2 git04 [ Code Name: Argentum ]
-http://www.maefloresta.com
-
-Udviklere
-   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
-
-KTooN - Version &#60; 0.9 
-
-Udviklere
-   David A. Cuadrado 
-   Jorge H. Cuadrado 
-
-Version &#60;= 0.7 
-
-Udviklere
-   Simena Dinas 
-   Fernando Jose Roldan Correa 
-
----------------------------- 
-Oversættere
-
-Catalansk: 
-   José Ángel Gallegos Gómez
-   Edelweiss Garcia i Fuentes 
-
-Tjekkisk:
-   Pavel Fric
-
-Engelsk:
-   Tim Wootton
-
-Tysk:
-   Alexander Greye
-
-Spansk: 
-   Gustav Gonzalez 
-   David A. Cuadrado 
-
-Portugisisk: 
-   Alyne Castro 
-
-Russisk: 
-   Sergey Garkusha
-
-Dansk:
-   David Lamhauge
-
----------------------------- 
-Ikonografi
-   Gustav Gonzalez
-
-----------------------------
-MacOSX port 
-   Cristian Cepeda
-
----------------------------- 
-Speciel tak tel: 
-   Markus Bongard for hans uforbeholdne 
-   støtte til dette projekt 
-
-----------------------------
-Mae Floresta 
-www.maefloresta.com 
-2010
-
-"Dream as if you'll live forever, 
- live as if you'll die today"
-                                James Dean 
-</credits>
-</xml>
diff -Nru tupi-0.2+git04/src/shell/data/da/license.html tupi-0.2+git05/src/shell/data/da/license.html
--- tupi-0.2+git04/src/shell/data/da/license.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/da/license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="gpl.css" />
-</head>
-<body>
-<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
-<center><b>Version 2, June 1991</b></center>
-<p align="justify">
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</p>
-<center><b>Preamble</b></center>
-<p align="justify">
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</p><p align="justify">
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p><p align="justify">
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p><p align="justify">
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p><p align="justify">
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p><p align="justify">
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p><p align="justify">
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p><p align="justify">
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p><p align="justify">
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-</p><p align="justify">
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p><p align="justify">
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p><p align="justify">
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p><p align="justify">
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p><p align="justify">
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p><p align="justify">
-<ul>
-<li>
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</li><li>
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</li><li>
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</li>
-</ul>
-</p><p align="justify">
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p><p align="justify">
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p><p align="justify">
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p><p align="justify">
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p><p align="justify">
-<ul>
-<li>
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</li><li>
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</li><li>
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</li>
-</ul>
-</p><p align="justify">
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p><p align="justify">
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p><p align="justify">
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p><p align="justify">
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p><p align="justify">
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p><p align="justify">
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p><p align="justify">
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p><p align="justify">
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p><p align="justify">
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p><p align="justify">
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p><p align="justify">
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p><p align="justify">
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p><p align="justify">
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p><p align="justify">
-			    NO WARRANTY
-</p><p align="justify">
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p><p align="justify">
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p><p align="justify">
-		     END OF TERMS AND CONDITIONS
-</p><p align="justify">
-	    How to Apply These Terms to Your New Programs
-</p><p align="justify">
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</p><p align="justify">
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</p><p align="justify">
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-</p><p align="justify">
-Also add information on how to contact you by electronic and paper mail.
-</p><p align="justify">
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</p><p align="justify">
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</p><p align="justify">
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</p><p align="justify">
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</p><p align="justify">
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</p><p align="justify">
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-</p><p align="justify">
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</p>
-</body>
diff -Nru tupi-0.2+git04/src/shell/data/da/tips.xml tupi-0.2+git05/src/shell/data/da/tips.xml
--- tupi-0.2+git04/src/shell/data/da/tips.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/da/tips.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<TipOfDay>
-	<tip>Du kan tilpasse penslerne ved at vælge &quot;Pen Egenskaber i venstre side&quot;.</tip>
-	<tip>Finder du fejl i programmet, eller har du forslag omkring Tupi, må du meget gerne sende dem til &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; så vi kan gøre Tupi bedre for alle.</tip>
-	<tip>Har du forslag til nyt tip, og vil dele det, så send det venligst til &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>Hvis du dobbeltklikker på hvilket som helst vindues titel, vil vinduet blive et flydende vindue.</tip>
-</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/da/twitter.xml tupi-0.2+git05/src/shell/data/da/twitter.xml
--- tupi-0.2+git04/src/shell/data/da/twitter.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/da/twitter.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<twitter>
-<word>
-Gemo
-</word>
-<ref>
-Ordbog for Tupi Sprog
-</ref>
-<url>
-http://www.archive.org/stream/diccionariodali00diasgoog/diccionariodali00diasgoog_djvu.txt
-</url>
-<meaning>
-Endnu ikke født.
-</meaning>
-</twitter>
diff -Nru tupi-0.2+git04/src/shell/data/de/crashhandler.xml tupi-0.2+git05/src/shell/data/de/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/de/crashhandler.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/de/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<CrashHandler>
-	<Title text="Schwerer Fehler" />
-	<Message text="Lieber Animator:" color="red" />
-	<Button text="Close" />
-	<Default text="Tupi ist wegen eines schwerwiegenden Softwarefehlers abgestuerzt! Wir bedauern dieses sehr! &lt;br;&gt;&lt;br&gt;Aber, noch ist nicht alles verloren! Sie koennen uns helfen diesen Fehler zu beseitigen.&lt;br&gt;Bitte senden Sie uns einen Fehlerreport an &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; und helfen Sie uns die Software zu verbessern.&lt;br&gt;&lt;br&gt;Vielen Dank,&lt;br&gt;&lt;br&gt;--Das &lt;i&gt;beschaemted&lt;/i&gt; Entwicklerteam" image="crash.png" />
-</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/de/credits.xml tupi-0.2+git05/src/shell/data/de/credits.xml
--- tupi-0.2+git04/src/shell/data/de/credits.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/de/credits.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-<xml>
-<credits>
-Tupi - Open 2D Magic
-Version 0.2 git04 [ Code Name: Argentum ]
-http://www.maefloresta.com
-
-Entwickler
-   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
-
-KTooN - Version &#60; 0.9 
-
-Entwickler
-   David A. Cuadrado 
-   Jorge H. Cuadrado 
-
-Version &#60;= 0.7 
-
-Entwickler
-   Simena Dinas 
-   Fernando Jose Roldan Correa 
-
----------------------------- 
-Uebersetzer
-
-Katalanisch: 
-   José Ángel Gallegos Gómez
-   Edelweiss Garcia i Fuentes 
-
-Spanisch: 
-   Gustav Gonzalez 
-   David A. Cuadrado 
-
-Portugiesisch: 
-   Alyne Castro 
-
-Russisch: 
-   Sergey Garkusha
-
-Tchechisch:
-   Pavel Fric
-
-Deutsch:  
-   Alexander Greye
-
----------------------------- 
-Ikonografie
-   Gustav Gonzalez
-
-----------------------------
-MacOSX port
-   Cristian Cepeda 
-
----------------------------- 
-Speziellen Dank an: 
-   Markus Bongard fuer seine ausserordentliche 
-   Unterstuetzung dieses Projektes 
-
-----------------------------
-Mae Floresta 
-www.maefloresta.com 
-2010
-
-"Traeume als ob du fuer immer leben wuerdest, 
- lebe als ob du heute sterben wuerdest"
-                                James Dean 
-</credits>
-</xml>
diff -Nru tupi-0.2+git04/src/shell/data/de/gpl.css tupi-0.2+git05/src/shell/data/de/gpl.css
--- tupi-0.2+git04/src/shell/data/de/gpl.css	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/de/gpl.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-body {
-     background-color:#00ff00;
-}
-
-.title {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:underline;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:16px;
-     font-weight:bold;
-}
-
-.paragraph {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:none;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:14px;
-     font-weight:normal;
-}
diff -Nru tupi-0.2+git04/src/shell/data/de/license.html tupi-0.2+git05/src/shell/data/de/license.html
--- tupi-0.2+git04/src/shell/data/de/license.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/de/license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="gpl.css" />
-</head>
-<body>
-<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
-<center><b>Version 2, June 1991</b></center>
-<p align="justify">
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</p>
-<center><b>Preamble</b></center>
-<p align="justify">
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</p><p align="justify">
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p><p align="justify">
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p><p align="justify">
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p><p align="justify">
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p><p align="justify">
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p><p align="justify">
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p><p align="justify">
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p><p align="justify">
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-</p><p align="justify">
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p><p align="justify">
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p><p align="justify">
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p><p align="justify">
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p><p align="justify">
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p><p align="justify">
-<ul>
-<li>
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</li><li>
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</li><li>
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</li>
-</ul>
-</p><p align="justify">
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p><p align="justify">
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p><p align="justify">
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p><p align="justify">
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p><p align="justify">
-<ul>
-<li>
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</li><li>
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</li><li>
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</li>
-</ul>
-</p><p align="justify">
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p><p align="justify">
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p><p align="justify">
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p><p align="justify">
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p><p align="justify">
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p><p align="justify">
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p><p align="justify">
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p><p align="justify">
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p><p align="justify">
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p><p align="justify">
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p><p align="justify">
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p><p align="justify">
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p><p align="justify">
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p><p align="justify">
-			    NO WARRANTY
-</p><p align="justify">
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p><p align="justify">
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p><p align="justify">
-		     END OF TERMS AND CONDITIONS
-</p><p align="justify">
-	    How to Apply These Terms to Your New Programs
-</p><p align="justify">
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</p><p align="justify">
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</p><p align="justify">
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-</p><p align="justify">
-Also add information on how to contact you by electronic and paper mail.
-</p><p align="justify">
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</p><p align="justify">
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</p><p align="justify">
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</p><p align="justify">
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</p><p align="justify">
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</p><p align="justify">
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-</p><p align="justify">
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</p>
-</body>
diff -Nru tupi-0.2+git04/src/shell/data/de/tips.xml tupi-0.2+git05/src/shell/data/de/tips.xml
--- tupi-0.2+git04/src/shell/data/de/tips.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/de/tips.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<TipOfDay>
-	<tip>Sie koennen benutzerdefinierte Pinsel unter folgendem Menu-Punkt einstellen &quot;Werkzeuge -> Pinsel -> Pinselform&quot;.</tip>
-	<tip>Wenn Sie Fehler in dieser Software finden, oder Tips fuer die Entwicklung von Tupi haben, bitte senden Sie diese an &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>Wenn Sie einen neuen Trick entdecken und mit anderen teilen moechten, bitte lassen Sie uns es hier wissen &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>Die Benutzeroberflaeche von Tupi kann angepasst werden. Wenn Sie auf den Titel eines Werkzeugfensters doppelklicken, dann wird dieses Fenster abgedockt und kann frei bewegt werden. window.</tip>
-</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/de/twitter.xml tupi-0.2+git05/src/shell/data/de/twitter.xml
--- tupi-0.2+git04/src/shell/data/de/twitter.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/de/twitter.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<twitter>
-<word>
-Gemo
-</word>
-<ref>
-Woerterbuch der Tupi Sprache
-</ref>
-<url>
-http://www.archive.org/stream/diccionariodali00diasgoog/diccionariodali00diasgoog_djvu.txt
-</url>
-<meaning>
-geboren werden.
-</meaning>
-</twitter>
diff -Nru tupi-0.2+git04/src/shell/data/en/crashhandler.xml tupi-0.2+git05/src/shell/data/en/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/en/crashhandler.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/en/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<CrashHandler>
-	<Title text="Fatal error" />
-	<Message text="Dear Animator:" color="red" />
-	<Button text="Close" />
-	<Default text="Tupi crashed due an infamous software bug! We're terribly sorry about this :(&lt;br&gt;&lt;br&gt;But, everything's not lost! You could potentially help us to fix the crash.&lt;br&gt;Please, make a bug report on &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; and help us to make a better software.&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;&lt;br&gt;--The &lt;i&gt;ashamed&lt;/i&gt; development team" image="crash.png" />
-</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/en/credits.xml tupi-0.2+git05/src/shell/data/en/credits.xml
--- tupi-0.2+git04/src/shell/data/en/credits.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/en/credits.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-<xml>
-<credits>
-Tupi - Open 2D Magic
-Version 0.2 git04 [ Code Name: Argentum ]
-http://www.maefloresta.com
-
-Developers
-   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
-
-KTooN - Version &#60; 0.9 
-
-Developers
-   David A. Cuadrado 
-   Jorge H. Cuadrado 
-
-Version &#60;= 0.7 
-
-Developers
-   Simena Dinas 
-   Fernando Jose Roldan Correa 
-
----------------------------- 
-Translators
-
-Catalan: 
-   José Ángel Gallegos Gómez
-   Edelweiss Garcia i Fuentes 
-
-Czech:
-   Pavel Fric
-
-English:
-   Tim Wootton
-
-German:
-   Alexander Greye
-
-Spanish: 
-   Gustav Gonzalez 
-   David A. Cuadrado 
-
-Portuguese: 
-   Alyne Castro 
-
-Russian: 
-   Sergey Garkusha
-
-Spanish:
-   Gustav Gonzalez
-   David A. Cuadrado
-
----------------------------- 
-Iconography
-   Gustav Gonzalez
-
-----------------------------
-MacOSX port 
-   Cristian Cepeda
-
----------------------------- 
-Special thanks to: 
-   Markus Bongard for his unconditional 
-   support to this project 
-
-----------------------------
-Mae Floresta 
-www.maefloresta.com 
-2010
-
-"Dream as if you'll live forever, 
- live as if you'll die today"
-                                James Dean 
-</credits>
-</xml>
diff -Nru tupi-0.2+git04/src/shell/data/en/gpl.css tupi-0.2+git05/src/shell/data/en/gpl.css
--- tupi-0.2+git04/src/shell/data/en/gpl.css	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/en/gpl.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-body {
-     background-color:#00ff00;
-}
-
-.title {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:underline;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:16px;
-     font-weight:bold;
-}
-
-.paragraph {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:none;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:14px;
-     font-weight:normal;
-}
diff -Nru tupi-0.2+git04/src/shell/data/en/license.html tupi-0.2+git05/src/shell/data/en/license.html
--- tupi-0.2+git04/src/shell/data/en/license.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/en/license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="gpl.css" />
-</head>
-<body>
-<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
-<center><b>Version 2, June 1991</b></center>
-<p align="justify">
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</p>
-<center><b>Preamble</b></center>
-<p align="justify">
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</p><p align="justify">
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p><p align="justify">
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p><p align="justify">
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p><p align="justify">
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p><p align="justify">
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p><p align="justify">
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p><p align="justify">
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p><p align="justify">
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-</p><p align="justify">
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p><p align="justify">
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p><p align="justify">
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p><p align="justify">
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p><p align="justify">
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p><p align="justify">
-<ul>
-<li>
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</li><li>
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</li><li>
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</li>
-</ul>
-</p><p align="justify">
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p><p align="justify">
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p><p align="justify">
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p><p align="justify">
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p><p align="justify">
-<ul>
-<li>
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</li><li>
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</li><li>
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</li>
-</ul>
-</p><p align="justify">
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p><p align="justify">
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p><p align="justify">
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p><p align="justify">
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p><p align="justify">
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p><p align="justify">
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p><p align="justify">
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p><p align="justify">
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p><p align="justify">
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p><p align="justify">
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p><p align="justify">
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p><p align="justify">
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p><p align="justify">
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p><p align="justify">
-			    NO WARRANTY
-</p><p align="justify">
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p><p align="justify">
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p><p align="justify">
-		     END OF TERMS AND CONDITIONS
-</p><p align="justify">
-	    How to Apply These Terms to Your New Programs
-</p><p align="justify">
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</p><p align="justify">
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</p><p align="justify">
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-</p><p align="justify">
-Also add information on how to contact you by electronic and paper mail.
-</p><p align="justify">
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</p><p align="justify">
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</p><p align="justify">
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</p><p align="justify">
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</p><p align="justify">
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</p><p align="justify">
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-</p><p align="justify">
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</p>
-</body>
diff -Nru tupi-0.2+git04/src/shell/data/en/tips.xml tupi-0.2+git05/src/shell/data/en/tips.xml
--- tupi-0.2+git04/src/shell/data/en/tips.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/en/tips.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<TipOfDay>
-	<tip>You can customise the brush by choosing &quot;Pen Properties in the left sidebar&quot;.</tip>
-	<tip>If you find bugs in this application, or you have suggestions about Tupi, we'd really like you to file them at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; to help us make Tupi better for everyone.</tip>
-	<tip>If you discover a new tip and you want to share it. Please, let us know at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>You can choose the behavior of the Tupi interface. If you double click on any tool window title, the docked window will change to a floating window.</tip>
-</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/en/twitter.xml tupi-0.2+git05/src/shell/data/en/twitter.xml
--- tupi-0.2+git04/src/shell/data/en/twitter.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/en/twitter.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<twitter>
-<word>
-Gemo
-</word>
-<ref>
-Dictionary of Tupi Language
-</ref>
-<url>
-http://www.archive.org/stream/diccionariodali00diasgoog/diccionariodali00diasgoog_djvu.txt
-</url>
-<meaning>
-To be born.
-</meaning>
-</twitter>
diff -Nru tupi-0.2+git04/src/shell/data/es/crashhandler.xml tupi-0.2+git05/src/shell/data/es/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/es/crashhandler.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/es/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<CrashHandler>
-	<Title text="Fatal error" />
-	<Message text="Querido Animador:" color="red" />
-	<Button text="Cerrar" />
-	<Default text="Tupí se ha cerrado inesperadamente debido a una infame falla de programación! Estamos terriblemente apenados contigo :(&lt;br&gt;&lt;br&gt;Pero, no todo está perdido! Puedes potencialmente ayudarnos a mejorar el programa.&lt;br&gt;Por favor, realiza un reporte del error en &lt;a href=http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug &gt;http://maefloresta.com/&lt;/a&gt; para que nosotros podamos repararlo pronto. &lt;br&gt;&lt;br&gt;Muchas gracias,&lt;br&gt;&lt;br&gt;--El &lt;i&gt;apenado&lt;/i&gt; equipo de desarrollo :S" image="crash.png" />
-</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/es/credits.xml tupi-0.2+git05/src/shell/data/es/credits.xml
--- tupi-0.2+git04/src/shell/data/es/credits.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/es/credits.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-<xml>
-<credits>
-Tupí - Magia 2D Libre 
-Versión 0.2 git04 [ Código: Argentum ]
-
-http://www.maefloresta.com
-
-Desarrolladores 
-   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
-
-KTooN - Versión &#60; 0.9 
-
-Desarrolladores 
-   David A. Cuadrado 
-   Jorge H. Cuadrado 
-
-Versión &#60;= 0.7 
-
-Desarrolladores
-   Simena Dinas 
-   Fernando Jose Roldán Correa 
-
----------------------------- 
-Traductores 
-
-Alemán:
-   Alexander Greye
-
-Catalán: 
-   José Ángel Gallegos Gómez
-   Edelweiss Garcia i Fuentes 
-
-Checo:
-   Pavel Fric
-
-Español: 
-   Gustav Gonzalez 
-   David A. Cuadrado 
-
-Inglés:
-   Tim Wootton
-
-Portugués: 
-   Alyne Castro 
-
-Ruso: 
-   Sergey Garkusha
-
----------------------------- 
-Diseño Iconográfico 
-   Gustav Gonzalez
-
-----------------------------
-Port para MacOSX
-   Cristian Cepeda
-
----------------------------- 
-Agradecimientos especiales a: 
-   Markus Bongard por su colaboración 
-   incondicional en este proyecto 
-
-----------------------------
-Mae Floresta 
-www.maefloresta.com 
-2010
-
-"Sueña como si fueras a vivir por siempre, 
- vive como si fueras a morir hoy" 
-                                James Dean 
-</credits>
-</xml>
diff -Nru tupi-0.2+git04/src/shell/data/es/license.html tupi-0.2+git05/src/shell/data/es/license.html
--- tupi-0.2+git04/src/shell/data/es/license.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/es/license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="gpl.css" />
-</head>
-<body>
-<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
-<center><b>Version 2, June 1991</b></center>
-<p align="justify">
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</p>
-<center><b>Preamble</b></center>
-<p align="justify">
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</p><p align="justify">
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p><p align="justify">
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p><p align="justify">
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p><p align="justify">
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p><p align="justify">
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p><p align="justify">
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p><p align="justify">
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p><p align="justify">
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-</p><p align="justify">
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p><p align="justify">
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p><p align="justify">
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p><p align="justify">
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p><p align="justify">
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p><p align="justify">
-<ul>
-<li>
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</li><li>
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</li><li>
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</li>
-</ul>
-</p><p align="justify">
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p><p align="justify">
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p><p align="justify">
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p><p align="justify">
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p><p align="justify">
-<ul>
-<li>
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</li><li>
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</li><li>
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</li>
-</ul>
-</p><p align="justify">
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p><p align="justify">
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p><p align="justify">
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p><p align="justify">
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p><p align="justify">
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p><p align="justify">
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p><p align="justify">
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p><p align="justify">
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p><p align="justify">
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p><p align="justify">
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p><p align="justify">
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p><p align="justify">
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p><p align="justify">
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p><p align="justify">
-			    NO WARRANTY
-</p><p align="justify">
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p><p align="justify">
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p><p align="justify">
-		     END OF TERMS AND CONDITIONS
-</p><p align="justify">
-	    How to Apply These Terms to Your New Programs
-</p><p align="justify">
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</p><p align="justify">
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</p><p align="justify">
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-</p><p align="justify">
-Also add information on how to contact you by electronic and paper mail.
-</p><p align="justify">
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</p><p align="justify">
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</p><p align="justify">
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</p><p align="justify">
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</p><p align="justify">
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</p><p align="justify">
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-</p><p align="justify">
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</p>
-</body>
diff -Nru tupi-0.2+git04/src/shell/data/es/tips.xml tupi-0.2+git05/src/shell/data/es/tips.xml
--- tupi-0.2+git04/src/shell/data/es/tips.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/es/tips.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<TipOfDay>
-        <tip>Una vez abierto un proyecto, usando el atajo de teclado &lt;b&gt;F11&lt;/b&gt;, se puede visualizar el entorno de trabajo en &lt;b&gt;Pantalla Completa&lt;/b&gt;. Para retornar a la interfaz habitual, volver a presionar &lt;b&gt;F11&lt;/b&gt;.</tip>
-        <tip>Es posible acercar o alejar (zoom in / zoom out) el área de trabajo girando la rueda del ratón.</tip>
-        <tip>Eligiendo un color para el relleno desde el panel &lt;b&gt;Paleta de Colores&lt;/b&gt;, se pueden dibujar formas opacas con el color elegido. Para volver a obtener trazos sin relleno, hacer clic sobre el ícono que se encuentra junto a los cuadros de color de borde y relleno en el mismo panel.</tip> 
-        <tip>Seleccionando un marco y usando el atajo de teclado &lt;b&gt;Ctrl + Avpag&lt;/b&gt;, se obtiene una copia exacta de dicho marco en la posición siguiente. Es muy útil cuando se anima con la técnica de recorte (cutout) para desplazar un objeto paso a paso.</tip>
-        <tip>Con el atajo &lt;b&gt;Alt + R&lt;/b&gt; se activa la rotación del elemento seleccionado. Para restringir su giro, presionar la tecla &lt;b&gt;Shift&lt;/b&gt; durante la acción.</tip>
-        <tip>Clic derecho sobre el panel de la &lt;b&gt;Biblioteca&lt;/b&gt;, permite crear imágenes raster (mapa de bits) y svg desde programas externos como Gimp, Krita, MyPaint e Inkscape.</tip>
-</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/es/twitter.xml tupi-0.2+git05/src/shell/data/es/twitter.xml
--- tupi-0.2+git04/src/shell/data/es/twitter.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/es/twitter.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<twitter>
-<word>
-Gemo
-</word>
-<ref>
-Diccionario de la Lengua Tupí
-</ref>
-<url>
-http://www.archive.org/stream/diccionariodali00diasgoog/diccionariodali00diasgoog_djvu.txt
-</url>
-<meaning>
-Nacer.
-</meaning>
-</twitter>
diff -Nru tupi-0.2+git04/src/shell/data/gl/crashhandler.xml tupi-0.2+git05/src/shell/data/gl/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/gl/crashhandler.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/gl/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<CrashHandler>
-	<Title text="Produciuse un erro fatal" />
-	<Message text="Querido animador:" color="red" />
-	<Button text="Pechar" />
-	<Default text="Tupí quebrou debido a una infame falla de programación! Estamos moi doidos por elo :(&lt;br&gt;&lt;br&gt;Mais non se perdeu todo! Podería axudarnos a mellorar o programa.&lt;br&gt;Envíenos un informe do erro empregando a páxina &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; para que poidamos arranxalo canto antes. &lt;br&gt;&lt;br&gt;Moitas grazas,&lt;br&gt;&lt;br&gt;--O &lt;i&gt;avergonzado&lt;/i&gt; equipo de desenvolvemento." image="crash.png" />
-</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/gl/credits.xml tupi-0.2+git05/src/shell/data/gl/credits.xml
--- tupi-0.2+git04/src/shell/data/gl/credits.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/gl/credits.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-<xml>
-<credits>
-Tupí - Maxia 2D Libre 
-Versión 0.2 git04 [ Código: Argentum ]
-http://www.maefloresta.com
-
-Desenvolvedores 
-   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
-
-KTooN - Versión &#60; 0.9 
-
-Desenvolvedores 
-   David A. Cuadrado 
-   Jorge H. Cuadrado 
-
-Versión &#60;= 0.7 
-
-Desenvolvedores
-   Simena Dinas 
-   Fernando Jose Roldán Correa 
-
----------------------------- 
-Tradutores
-
-Alemán:
-   Alexander Greye
-
-Catalán:
-   José Ángel Gallegos Gómez
-   Edelweiss Garcia i Fuentes
-
-Checo:
-   Pavel Fric
-
-Galego:
-   Miguel Anxo Bouzada
-   Proxecto Trasno (trasno.net)
-
-Español:
-   Gustav Gonzalez
-   David A. Cuadrado
-
-Portugués:
-   Alyne Castro
-
-Ruso:
-   Sergey Garkusha
-
----------------------------- 
-Deseño de iconas 
-   Gustav Gonzalez
-
-----------------------------
-Port para MacOSX
-   Cristian Cepeda
-
----------------------------- 
-Agradecementos especiais a: 
-   Markus Bongard pola súa colaboración 
-   incondicional neste proyecto 
-
-----------------------------
-Mae Floresta 
-www.maefloresta.com 
-2010
-
-"Soña como se foses a vivir para sempre, 
- vive como se foses a morrer hoxe" 
-                                James Dean 
-</credits>
-</xml>
diff -Nru tupi-0.2+git04/src/shell/data/gl/gpl.css tupi-0.2+git05/src/shell/data/gl/gpl.css
--- tupi-0.2+git04/src/shell/data/gl/gpl.css	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/gl/gpl.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-body {
-     background-color:#00ff00;
-}
-
-.title {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:underline;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:16px;
-     font-weight:bold;
-}
-
-.paragraph {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:none;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:14px;
-     font-weight:normal;
-}
diff -Nru tupi-0.2+git04/src/shell/data/gl/license.html tupi-0.2+git05/src/shell/data/gl/license.html
--- tupi-0.2+git04/src/shell/data/gl/license.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/gl/license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="gpl.css" />
-</head>
-<body>
-<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
-<center><b>Version 2, June 1991</b></center>
-<p align="justify">
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</p>
-<center><b>Preamble</b></center>
-<p align="justify">
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</p><p align="justify">
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p><p align="justify">
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p><p align="justify">
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p><p align="justify">
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p><p align="justify">
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p><p align="justify">
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p><p align="justify">
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p><p align="justify">
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-</p><p align="justify">
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p><p align="justify">
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p><p align="justify">
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p><p align="justify">
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p><p align="justify">
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p><p align="justify">
-<ul>
-<li>
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</li><li>
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</li><li>
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</li>
-</ul>
-</p><p align="justify">
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p><p align="justify">
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p><p align="justify">
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p><p align="justify">
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p><p align="justify">
-<ul>
-<li>
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</li><li>
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</li><li>
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</li>
-</ul>
-</p><p align="justify">
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p><p align="justify">
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p><p align="justify">
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p><p align="justify">
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p><p align="justify">
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p><p align="justify">
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p><p align="justify">
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p><p align="justify">
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p><p align="justify">
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p><p align="justify">
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p><p align="justify">
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p><p align="justify">
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p><p align="justify">
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p><p align="justify">
-			    NO WARRANTY
-</p><p align="justify">
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p><p align="justify">
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p><p align="justify">
-		     END OF TERMS AND CONDITIONS
-</p><p align="justify">
-	    How to Apply These Terms to Your New Programs
-</p><p align="justify">
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</p><p align="justify">
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</p><p align="justify">
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-</p><p align="justify">
-Also add information on how to contact you by electronic and paper mail.
-</p><p align="justify">
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</p><p align="justify">
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</p><p align="justify">
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</p><p align="justify">
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</p><p align="justify">
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</p><p align="justify">
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-</p><p align="justify">
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</p>
-</body>
diff -Nru tupi-0.2+git04/src/shell/data/gl/tips.xml tupi-0.2+git05/src/shell/data/gl/tips.xml
--- tupi-0.2+git04/src/shell/data/gl/tips.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/gl/tips.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<TipOfDay>
-	<tip>Pode crear pinceis personalizados escollendo a opción &laquo;Ferramentas -> Pinceis -> Patrón&raquo;</tip>
-	<tip>Se atopa erros neste aplicativo, ou ten algunha suxestión sobre &lt;b&gt;Tupí&lt;/b&gt;, fáganolo saber en &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>Se descobre un novo truco e desexa compartilo coa comunidade de usuarios. Cóntenolo en &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>Pode escoller o comportamento da interface gráfica de &lt;b&gt;Tupí&lt;/b&gt;. Se preme dúas veces no título dunha xanela de ferramentas, a xanela incrustada converterase nun diálogo flotante</tip>
-</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/gl/twitter.xml tupi-0.2+git05/src/shell/data/gl/twitter.xml
--- tupi-0.2+git04/src/shell/data/gl/twitter.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/gl/twitter.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<twitter>
-<word>
-Gemo
-</word>
-<ref>
-Dicionario do idioma Tupí
-</ref>
-<url>
-http://www.archive.org/stream/diccionariodali00diasgoog/diccionariodali00diasgoog_djvu.txt
-</url>
-<meaning>
-Nacer.
-</meaning>
-</twitter>
diff -Nru tupi-0.2+git04/src/shell/data/pt/crashhandler.xml tupi-0.2+git05/src/shell/data/pt/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/pt/crashhandler.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/pt/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<CrashHandler>
-	<Title text="Fatal error" />
-	<Message text="Dear Animator:" color="red" />
-	<Button text="Close" />
-	<Default text="Tupi crashed due an infamous software bug! We're terribly sorry about this :(&lt;br&gt;&lt;br&gt;But, everything's not lost! You could potentially help us to fix the crash.&lt;br&gt;Please, make a bug report on &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; and help us to make a better software.&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;&lt;br&gt;--The &lt;i&gt;ashamed&lt;/i&gt; development team" image="crash.png" />
-</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/pt/credits.xml tupi-0.2+git05/src/shell/data/pt/credits.xml
--- tupi-0.2+git04/src/shell/data/pt/credits.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/pt/credits.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-<xml>
-<credits>
-Tupí - Magia 2D Livre
-Versão  0.2 git04 [ Nome Código: Argentum ]
-http://www.maefloresta.com
-
-Desenvolvedores
-   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
-
-KTooN - Versão &#60; 0.9 
-
-Desenvolvedores
-   David A. Cuadrado 
-   Jorge H. Cuadrado 
-
-Versão &#60;= 0.7 
-
-Desenvolvedores
-   Simena Dinas 
-   Fernando Jose Roldan Correa 
-
----------------------------- 
-Tradutores
-
-Alemão:
-   Alexander Greye
-
-Catalão: 
-   José Ángel Gallegos Gómez
-   Edelweiss Garcia i Fuentes 
-
-Espanhol: 
-   Gustav Gonzalez 
-   David A. Cuadrado 
-
-Inglês
-   Tim Wootton
-
-Português: 
-   Alyne Castro 
-
-Russo: 
-   Sergey Garkusha
-
-Tcheco:
-   Pavel Fric
-
----------------------------- 
-Iconografia
-   Gustav Gonzalez
-
-----------------------------
-Port para MacOSX
-   Cristian Cepeda
-
----------------------------- 
-Agradecimientos especiais a: 
-   Markus Bongard por seu apoio 
-   incondicional a este projeto
-
-----------------------------
-Mae Floresta 
-www.maefloresta.com 
-2010
-
-"Sonhar como se fosse viver para sempre,
- viver como se fosse morrer hoje"
-                                James Dean 
-</credits>
-</xml>
diff -Nru tupi-0.2+git04/src/shell/data/pt/gpl.css tupi-0.2+git05/src/shell/data/pt/gpl.css
--- tupi-0.2+git04/src/shell/data/pt/gpl.css	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/pt/gpl.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-body {
-     background-color:#00ff00;
-}
-
-.title {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:underline;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:16px;
-     font-weight:bold;
-}
-
-.paragraph {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:none;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:14px;
-     font-weight:normal;
-}
diff -Nru tupi-0.2+git04/src/shell/data/pt/license.html tupi-0.2+git05/src/shell/data/pt/license.html
--- tupi-0.2+git04/src/shell/data/pt/license.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/pt/license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="gpl.css" />
-</head>
-<body>
-<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
-<center><b>Version 2, June 1991</b></center>
-<p align="justify">
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</p>
-<center><b>Preamble</b></center>
-<p align="justify">
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</p><p align="justify">
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p><p align="justify">
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p><p align="justify">
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p><p align="justify">
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p><p align="justify">
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p><p align="justify">
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p><p align="justify">
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p><p align="justify">
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-</p><p align="justify">
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p><p align="justify">
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p><p align="justify">
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p><p align="justify">
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p><p align="justify">
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p><p align="justify">
-<ul>
-<li>
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</li><li>
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</li><li>
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</li>
-</ul>
-</p><p align="justify">
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p><p align="justify">
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p><p align="justify">
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p><p align="justify">
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p><p align="justify">
-<ul>
-<li>
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</li><li>
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</li><li>
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</li>
-</ul>
-</p><p align="justify">
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p><p align="justify">
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p><p align="justify">
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p><p align="justify">
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p><p align="justify">
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p><p align="justify">
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p><p align="justify">
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p><p align="justify">
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p><p align="justify">
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p><p align="justify">
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p><p align="justify">
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p><p align="justify">
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p><p align="justify">
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p><p align="justify">
-			    NO WARRANTY
-</p><p align="justify">
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p><p align="justify">
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p><p align="justify">
-		     END OF TERMS AND CONDITIONS
-</p><p align="justify">
-	    How to Apply These Terms to Your New Programs
-</p><p align="justify">
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</p><p align="justify">
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</p><p align="justify">
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-</p><p align="justify">
-Also add information on how to contact you by electronic and paper mail.
-</p><p align="justify">
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</p><p align="justify">
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</p><p align="justify">
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</p><p align="justify">
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</p><p align="justify">
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</p><p align="justify">
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-</p><p align="justify">
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</p>
-</body>
diff -Nru tupi-0.2+git04/src/shell/data/pt/tips.xml tupi-0.2+git05/src/shell/data/pt/tips.xml
--- tupi-0.2+git04/src/shell/data/pt/tips.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/pt/tips.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<TipOfDay>
-	<tip>You can customise the brush by choosing &quot;Pen Properties in the left sidebar&quot;.</tip>
-	<tip>If you find bugs in this application, or you have suggestions about Tupi, we'd really like you to file them at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; to help us make Tupi better for everyone.</tip>
-	<tip>If you discover a new tip and you want to share it. Please, let us know at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>You can choose the behavior of the Tupi interface. If you double click on any tool window title, the docked window will change to a floating window.</tip>
-</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/pt/twitter.xml tupi-0.2+git05/src/shell/data/pt/twitter.xml
--- tupi-0.2+git04/src/shell/data/pt/twitter.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/pt/twitter.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<twitter>
-<word>
-Gemo
-</word>
-<ref>
-Diccionario da lingua Tupy
-</ref>
-<url>
-http://www.archive.org/stream/diccionariodali00diasgoog/diccionariodali00diasgoog_djvu.txt
-</url>
-<meaning>
-Nascer.
-</meaning>
-</twitter>
diff -Nru tupi-0.2+git04/src/shell/data/ru/crashhandler.xml tupi-0.2+git05/src/shell/data/ru/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/ru/crashhandler.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ru/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<CrashHandler>
-	<Title text="Fatal error" />
-	<Message text="Dear Animator:" color="red" />
-	<Button text="Close" />
-	<Default text="Tupi crashed due an infamous software bug! We're terribly sorry about this :(&lt;br&gt;&lt;br&gt;But, everything's not lost! You could potentially help us to fix the crash.&lt;br&gt;Please, make a bug report on &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; and help us to make a better software.&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;&lt;br&gt;--The &lt;i&gt;ashamed&lt;/i&gt; development team" image="crash.png" />
-</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/ru/credits.xml tupi-0.2+git05/src/shell/data/ru/credits.xml
--- tupi-0.2+git04/src/shell/data/ru/credits.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ru/credits.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-<xml>
-<credits>
-Tupi - Open 2D Magic
-Version 0.2 git04 [ Code Name: Argentum ]
-http://www.maefloresta.com
-
-Developers
-   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
-
-KTooN - Version &#60; 0.9 
-
-Developers
-   David A. Cuadrado 
-   Jorge H. Cuadrado 
-
-Version &#60;= 0.7 
-
-Developers
-   Simena Dinas 
-   Fernando Jose Roldan Correa 
-
----------------------------- 
-Translators
-
-Catalan: 
-   José Ángel Gallegos Gómez
-   Edelweiss Garcia i Fuentes 
-
-Spanish: 
-   Gustav Gonzalez 
-   David A. Cuadrado 
-
-Portuguese: 
-   Alyne Castro 
-
-Russian: 
-   Sergey Garkusha
-
-Czech:
-   Pavel Fric
-
-German:  
-   Alexander Greye
-
----------------------------- 
-Iconography
-   Gustav Gonzalez
-
-----------------------------
-MacOSX support
-   Cristian Cepeda
-
----------------------------- 
-Special thanks to: 
-   Markus Bongard for his unconditional 
-   support to this project 
-
-----------------------------
-Mae Floresta 
-www.maefloresta.com 
-2010
-
-"Dream as if you'll live forever, 
- live as if you'll die today"
-                                James Dean 
-</credits>
-</xml>
diff -Nru tupi-0.2+git04/src/shell/data/ru/gpl.css tupi-0.2+git05/src/shell/data/ru/gpl.css
--- tupi-0.2+git04/src/shell/data/ru/gpl.css	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ru/gpl.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-body {
-     background-color:#00ff00;
-}
-
-.title {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:underline;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:16px;
-     font-weight:bold;
-}
-
-.paragraph {
-     margin-left:10px;
-     color:#000000;
-     text-align:left;
-     text-decoration:none;
-     font-family:"Times New Roman", Times, serif;
-     font-style:normal;
-     font-size:14px;
-     font-weight:normal;
-}
diff -Nru tupi-0.2+git04/src/shell/data/ru/license.html tupi-0.2+git05/src/shell/data/ru/license.html
--- tupi-0.2+git04/src/shell/data/ru/license.html	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ru/license.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="gpl.css" />
-</head>
-<body>
-<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
-<center><b>Version 2, June 1991</b></center>
-<p align="justify">
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</p>
-<center><b>Preamble</b></center>
-<p align="justify">
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</p><p align="justify">
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p><p align="justify">
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p><p align="justify">
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p><p align="justify">
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p><p align="justify">
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p><p align="justify">
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p><p align="justify">
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p><p align="justify">
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-</p><p align="justify">
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p><p align="justify">
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p><p align="justify">
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p><p align="justify">
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p><p align="justify">
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p><p align="justify">
-<ul>
-<li>
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</li><li>
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</li><li>
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</li>
-</ul>
-</p><p align="justify">
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p><p align="justify">
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p><p align="justify">
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p><p align="justify">
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p><p align="justify">
-<ul>
-<li>
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</li><li>
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</li><li>
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</li>
-</ul>
-</p><p align="justify">
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p><p align="justify">
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p><p align="justify">
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p><p align="justify">
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p><p align="justify">
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p><p align="justify">
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p><p align="justify">
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p><p align="justify">
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p><p align="justify">
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p><p align="justify">
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p><p align="justify">
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p><p align="justify">
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p><p align="justify">
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p><p align="justify">
-			    NO WARRANTY
-</p><p align="justify">
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p><p align="justify">
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p><p align="justify">
-		     END OF TERMS AND CONDITIONS
-</p><p align="justify">
-	    How to Apply These Terms to Your New Programs
-</p><p align="justify">
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</p><p align="justify">
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</p><p align="justify">
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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
-</p><p align="justify">
-Also add information on how to contact you by electronic and paper mail.
-</p><p align="justify">
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</p><p align="justify">
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</p><p align="justify">
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</p><p align="justify">
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</p><p align="justify">
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</p><p align="justify">
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-</p><p align="justify">
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</p>
-</body>
diff -Nru tupi-0.2+git04/src/shell/data/ru/tips.xml tupi-0.2+git05/src/shell/data/ru/tips.xml
--- tupi-0.2+git04/src/shell/data/ru/tips.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ru/tips.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<TipOfDay>
-	<tip>You can customise the brush by choosing &quot;Pen Properties in the left sidebar&quot;.</tip>
-	<tip>If you find bugs in this application, or you have suggestions about Tupi, we'd really like you to file them at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; to help us make Tupi better for everyone.</tip>
-	<tip>If you discover a new tip and you want to share it. Please, let us know at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
-	<tip>You can choose the behavior of the Tupi interface. If you double click on any tool window title, the docked window will change to a floating window.</tip>
-</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/ru/twitter.xml tupi-0.2+git05/src/shell/data/ru/twitter.xml
--- tupi-0.2+git04/src/shell/data/ru/twitter.xml	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/ru/twitter.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<twitter>
-<word>
-Gemo
-</word>
-<ref>
-Dictionary of Tupi Language
-</ref>
-<url>
-http://www.archive.org/stream/diccionariodali00diasgoog/diccionariodali00diasgoog_djvu.txt
-</url>
-<meaning>
-To be born.
-</meaning>
-</twitter>
diff -Nru tupi-0.2+git04/src/shell/data/storyboard/tupi.css tupi-0.2+git05/src/shell/data/storyboard/tupi.css
--- tupi-0.2+git04/src/shell/data/storyboard/tupi.css	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/storyboard/tupi.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-body {
-    color: #0e0e0e;
-    background: #ffffff;
-    font-family: arial, verdana, tahoma, times new roman, serif; 
-    font-style: normal;
-    font-weight: normal;
-}
-
-#header {
-    width: 535px;
-    text-align: center;
-    background: #eeeeee;
-    border: 1px solid #bbbbbb;
-    color: black;
-    font-size: 14px;
-    padding: 5px 5px;
-    margin: 10px 10px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-#title {
-    text-align: center;
-    color: black;
-    font-weight: bold;
-    font-size: 15px;
-    margin-top: 2px;
-    margin-bottom: 2px;
-}
-
-#item {
-    text-align: justify;
-    border: 1px solid #cccccc;
-    color: black;
-    font-size: 14px;
-    margin-top: 2px;
-    margin-bottom: 2px;
-}
-
-#item-header {
-    text-align: justify;
-    color: black;
-    font-weight: bold;
-    font-size: 14px;
-    padding: 2px 5px;
-    margin-top: 2px;
-    margin-bottom: 2px;
-}
-
-#item-data {
-    text-align: justify;
-    background: #ffffff;
-    color: black;
-    font-size: 14px;
-    padding: 2px 5px;
-    margin-top: 2px;
-    margin-bottom: 2px;
-}
-
-img {
-    border: 1px solid #cccccc;
-    margin-bottom: 10px;
-}
-
-#paragraph {
-    width: 512px;
-    text-align: justify;
-    background: #eeeeee;
-    border: 1px solid #bbbbbb;
-    color: black;
-    font-size: 13px;
-    padding: 5px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-#scene {
-    width: 535px;
-    text-align: center;
-    border: 1px solid #bbbbbb;
-    color: black;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    padding-left: 0px;
-    padding-right: 0px;
-    font-size: 13px;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-#scene-item {
-    text-align: justify;
-    border: 1px solid #cccccc;
-    color: black;
-    font-size: 13px;
-    margin-top: 2px;
-    margin-bottom: 2px;
-}
-
-#scene-header {
-    text-align: justify;
-    color: black;
-    font-weight: bold;
-    font-size: 13px;
-    padding: 2px 5px;
-    margin-top: 2px;
-    margin-bottom: 2px;
-}
-
-#scene-data {
-    text-align: justify;
-    background: #ffffff;
-    color: black;
-    font-size: 13px;
-    padding: 2px 5px;
-    margin-top: 2px;
-    margin-bottom: 2px;
-}
diff -Nru tupi-0.2+git04/src/shell/data/storyboard/tupi.html.css tupi-0.2+git05/src/shell/data/storyboard/tupi.html.css
--- tupi-0.2+git04/src/shell/data/storyboard/tupi.html.css	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/storyboard/tupi.html.css	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,120 @@
+body {
+    color: #0e0e0e;
+    background: #ffffff;
+    font-family: arial, verdana, tahoma, times new roman, serif; 
+    font-style: normal;
+    font-weight: normal;
+}
+
+#header {
+    width: 535px;
+    text-align: center;
+    background: #eeeeee;
+    border: 1px solid #bbbbbb;
+    color: black;
+    font-size: 14px;
+    padding: 5px 5px;
+    margin: 10px 10px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#title {
+    text-align: center;
+    color: black;
+    font-weight: bold;
+    font-size: 15px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#item {
+    text-align: justify;
+    border: 1px solid #cccccc;
+    color: black;
+    font-size: 14px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#item-header {
+    text-align: justify;
+    color: black;
+    font-weight: bold;
+    font-size: 14px;
+    padding: 2px 5px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#item-data {
+    text-align: justify;
+    background: #ffffff;
+    color: black;
+    font-size: 14px;
+    padding: 2px 5px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+img {
+    border: 1px solid #cccccc;
+    margin-bottom: 10px;
+}
+
+#paragraph {
+    width: 512px;
+    text-align: justify;
+    background: #eeeeee;
+    border: 1px solid #bbbbbb;
+    color: black;
+    font-size: 13px;
+    padding: 5px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#scene {
+    width: 535px;
+    text-align: center;
+    border: 1px solid #bbbbbb;
+    color: black;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 0px;
+    padding-right: 0px;
+    font-size: 13px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#scene-item {
+    text-align: justify;
+    border: 1px solid #cccccc;
+    color: black;
+    font-size: 13px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#scene-header {
+    text-align: justify;
+    color: black;
+    font-weight: bold;
+    font-size: 13px;
+    padding: 2px 5px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#scene-data {
+    text-align: justify;
+    background: #ffffff;
+    color: black;
+    font-size: 13px;
+    padding: 2px 5px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
diff -Nru tupi-0.2+git04/src/shell/data/storyboard/tupi.pdf.css tupi-0.2+git05/src/shell/data/storyboard/tupi.pdf.css
--- tupi-0.2+git04/src/shell/data/storyboard/tupi.pdf.css	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/storyboard/tupi.pdf.css	2014-12-15 14:21:33.000000000 +0000
@@ -0,0 +1,128 @@
+@page {
+    size: 8.5in 11in;  /* width height */
+}
+
+body {
+    color: #0e0e0e;
+    background: #ffffff;
+    font-family: arial, verdana, tahoma, times new roman, serif; 
+    font-style: normal;
+    font-weight: normal;
+}
+
+#header {
+    width: 535px;
+    text-align: center;
+    background: #eeeeee;
+    border: 1px solid #bbbbbb;
+    color: black;
+    font-size: 14px;
+    padding: 5px 5px;
+    margin: 10px 10px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#page-break {
+    page-break-after: always;
+}
+
+#title {
+    text-align: center;
+    color: black;
+    font-weight: bold;
+    font-size: 15px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#item {
+    text-align: justify;
+    border: 1px solid #cccccc;
+    color: black;
+    font-size: 14px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#item-header {
+    text-align: justify;
+    color: black;
+    font-weight: bold;
+    font-size: 14px;
+    padding: 2px 5px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#item-data {
+    text-align: justify;
+    background: #ffffff;
+    color: black;
+    font-size: 14px;
+    padding: 2px 5px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+img {
+    border: 1px solid #cccccc;
+    margin-bottom: 10px;
+}
+
+#paragraph {
+    width: 512px;
+    text-align: justify;
+    background: #eeeeee;
+    border: 1px solid #bbbbbb;
+    color: black;
+    font-size: 13px;
+    padding: 5px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#scene {
+    width: 535px;
+    text-align: center;
+    border: 1px solid #bbbbbb;
+    color: black;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 0px;
+    padding-right: 0px;
+    font-size: 13px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#scene-item {
+    text-align: justify;
+    border: 1px solid #cccccc;
+    color: black;
+    font-size: 13px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#scene-header {
+    text-align: justify;
+    color: black;
+    font-weight: bold;
+    font-size: 13px;
+    padding: 2px 5px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+#scene-data {
+    text-align: justify;
+    background: #ffffff;
+    color: black;
+    font-size: 13px;
+    padding: 2px 5px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_ca.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_ca.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_ca.ts tupi-0.2+git05/src/shell/data/translations/tupi_ca.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_ca.ts	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_ca.ts	2014-12-15 14:21:34.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ca" sourcelanguage="en_US">
+<TS version="2.1" language="ca" sourcelanguage="en_US">
 <context>
     <name>ButtonsPanel</name>
     <message>
@@ -84,17 +84,6 @@
     </message>
 </context>
 <context>
-    <name>ContourSelection</name>
-    <message>
-        <source>Line Selection</source>
-        <translation>Selecció de línia</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-</context>
-<context>
     <name>EraserTool</name>
     <message>
         <source>Eraser</source>
@@ -204,13 +193,6 @@
     </message>
 </context>
 <context>
-    <name>GenericExportPlugin</name>
-    <message>
-        <source>Image Array</source>
-        <translation>Matriu d&apos;imatge</translation>
-    </message>
-</context>
-<context>
     <name>GeometricTool</name>
     <message>
         <source>Rectangle</source>
@@ -238,16 +220,19 @@
     </message>
 </context>
 <context>
+    <name>ImagePlugin</name>
+    <message>
+        <source>Image Array</source>
+        <translation type="unfinished">Contenidor d&apos;imatges</translation>
+    </message>
+</context>
+<context>
     <name>InfoPanel</name>
     <message>
         <source>Tips</source>
         <translation>Consells</translation>
     </message>
     <message>
-        <source>Mouse Double Click</source>
-        <translation>Doble clic del ratolí</translation>
-    </message>
-    <message>
         <source>Close the line path</source>
         <translation>Tanca la trajectòria de línia</translation>
     </message>
@@ -275,6 +260,10 @@
         <source>X key or Right mouse button</source>
         <translation>Tecla X o botó dret del ratolí</translation>
     </message>
+    <message>
+        <source>Mouse Right Click</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InkTool</name>
@@ -295,6 +284,48 @@
     </message>
 </context>
 <context>
+    <name>NodesTool</name>
+    <message>
+        <source>Nodes Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N</source>
+        <translation type="unfinished">N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift+R</source>
+        <translation type="unfinished">Maj+R</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <source>Tween name is missing!</source>
+        <translation type="unfinished">No es troba aquest nom d&apos;interpolació!</translation>
+    </message>
+    <message>
+        <source>Frame %1</source>
+        <translation type="unfinished">Fotograma %1</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished">Informació</translation>
+    </message>
+    <message>
+        <source>Tween %1 applied!</source>
+        <translation type="unfinished">Interpolació %1 aplicada!</translation>
+    </message>
+</context>
+<context>
     <name>PencilTool</name>
     <message>
         <source>Pencil</source>
@@ -306,14 +337,14 @@
     </message>
 </context>
 <context>
-    <name>PolyLine</name>
+    <name>PolyLineTool</name>
     <message>
         <source>PolyLine</source>
-        <translation>Polilínia</translation>
+        <translation type="unfinished">Polilínia</translation>
     </message>
     <message>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished">S</translation>
     </message>
 </context>
 <context>
@@ -524,18 +555,18 @@
     </message>
 </context>
 <context>
-    <name>SelectTool</name>
+    <name>SelectionTool</name>
     <message>
-        <source>Select</source>
-        <translation>Selecciona</translation>
+        <source>Selection</source>
+        <translation type="unfinished">Selecció</translation>
     </message>
     <message>
         <source>Object Selection</source>
-        <translation>Selecciona objectes</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O</source>
-        <translation>O</translation>
+        <translation type="unfinished">O</translation>
     </message>
 </context>
 <context>
@@ -1076,6 +1107,10 @@
         <source>Can&apos;t create pictures directory</source>
         <translation>No s&apos;ha pogut crear el directori imatges</translation>
     </message>
+    <message>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupCameraBar</name>
@@ -1205,6 +1240,10 @@
         <source>Can&apos;t create pictures directory</source>
         <translation>No s&apos;ha pogut crear el directori imatges</translation>
     </message>
+    <message>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupCameraStatus</name>
@@ -1253,6 +1292,25 @@
     </message>
 </context>
 <context>
+    <name>TupCameraWindow</name>
+    <message>
+        <source>General Camera error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera invalid request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera service missing error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera not supported error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupCanvas</name>
     <message>
         <source>Tupi: Open 2D Magic</source>
@@ -1291,7 +1349,7 @@
         <translation>Redueix</translation>
     </message>
     <message>
-        <source>Hand</source>
+        <source>Shift</source>
         <translation>Mà</translation>
     </message>
     <message>
@@ -1363,7 +1421,7 @@
         <translation>Selecció d&apos;objectes</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selecció de línies</translation>
     </message>
     <message>
@@ -1575,10 +1633,6 @@
         <translation>Emplena</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Visualitza</translation>
-    </message>
-    <message>
         <source>Tweening</source>
         <translation>Interpola</translation>
     </message>
@@ -1663,7 +1717,7 @@
         <translation>Redueix</translation>
     </message>
     <message>
-        <source>Hand</source>
+        <source>Shift</source>
         <translation>Mà</translation>
     </message>
     <message>
@@ -1770,6 +1824,18 @@
         <source>Frame %1</source>
         <translation>Fotograma %1</translation>
     </message>
+    <message>
+        <source>Nodes Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo file has been imported successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupExportWidget</name>
@@ -2200,6 +2266,10 @@
         <source>Compound Tween</source>
         <translation>Composició de la interpolació</translation>
     </message>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupLayer</name>
@@ -2842,6 +2912,30 @@
         <source>Shift+G</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Papagayo lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Papagayo project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo project is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupNetProjectManagerHandler</name>
@@ -3147,7 +3241,7 @@
         <translation>Llapis</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selecció de línia</translation>
     </message>
     <message>
@@ -3234,10 +3328,6 @@
 <context>
     <name>TupPaintAreaBase</name>
     <message>
-        <source>OpenGL isn&apos;t supported</source>
-        <translation>Sense suport per OpenGL</translation>
-    </message>
-    <message>
         <source>Locked!</source>
         <translation>Bloquejat!</translation>
     </message>
@@ -3947,7 +4037,7 @@
         <translation>Selecció d&apos;objectes</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selecció de línia</translation>
     </message>
     <message>
@@ -3964,6 +4054,29 @@
     </message>
 </context>
 <context>
+    <name>TupTwitter</name>
+    <message>
+        <source>Latest version</source>
+        <translation type="unfinished">Última versió</translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished">Revisió</translation>
+    </message>
+    <message>
+        <source>Code Name</source>
+        <translation type="unfinished">Nom en clau</translation>
+    </message>
+    <message>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupTwitterWidget</name>
     <message>
         <source>News!</source>
@@ -4005,45 +4118,6 @@
     </message>
 </context>
 <context>
-    <name>Tupwitter</name>
-    <message>
-        <source>Latest version</source>
-        <translation>Última versió</translation>
-    </message>
-    <message>
-        <source>Revision</source>
-        <translation>Revisió</translation>
-    </message>
-    <message>
-        <source>Code Name</source>
-        <translation>Nom en clau</translation>
-    </message>
-    <message>
-        <source>Update here!</source>
-        <translation>Actualitza aquí!</translation>
-    </message>
-    <message>
-        <source>This is what&apos;s happening</source>
-        <translation>Això és el que està passant</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation>Descripció</translation>
-    </message>
-    <message>
-        <source>Website</source>
-        <translation>Lloc web</translation>
-    </message>
-    <message>
-        <source>Followers</source>
-        <translation>Seguidors</translation>
-    </message>
-</context>
-<context>
     <name>TweenManager</name>
     <message>
         <source>Create a new Tween</source>
@@ -4297,7 +4371,7 @@
 <context>
     <name>ViewTool</name>
     <message>
-        <source>Hand</source>
+        <source>Shift</source>
         <translation>Mà</translation>
     </message>
     <message>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_cs.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_cs.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_cs.ts tupi-0.2+git05/src/shell/data/translations/tupi_cs.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_cs.ts	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_cs.ts	2014-12-15 14:21:34.000000000 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="cs_CZ">
+<TS version="2.1" language="cs_CZ">
 <context>
     <name>ButtonsPanel</name>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="47"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="41"/>
         <source>Edit Tween</source>
         <translation>Upravit výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="51"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="45"/>
         <source>Remove Tween</source>
         <translation>Odstranit výsledný sled snímků</translation>
     </message>
@@ -17,122 +17,108 @@
 <context>
     <name>Configurator</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/color/configurator.cpp" line="66"/>
         <source>Coloring Tween</source>
         <translation>Zbarvení výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/configurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/compound/configurator.cpp" line="71"/>
         <source>Compound Tween</source>
         <translation>Složený výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="59"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="57"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="58"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="52"/>
         <source>Parameters</source>
         <translation>Parametry</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="81"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="77"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="80"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="72"/>
         <source>Dot Spacing</source>
         <translation>Odstupy teček</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="97"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="93"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="96"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="88"/>
         <source>Size Tolerance</source>
         <translation>Tolerance velikosti</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="122"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="117"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="121"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="112"/>
         <source>Smoothness</source>
         <translation>Hladkost</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/opacity/configurator.cpp" line="70"/>
         <source>Opacity Tween</source>
         <translation>Neprůhlednost výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/configurator.cpp" line="91"/>
+        <location filename="../src/plugins/tools/position/configurator.cpp" line="80"/>
         <source>Position Tween</source>
         <translation>Poloha výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/papagayo/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/rotation/configurator.cpp" line="70"/>
         <source>Rotation Tween</source>
         <translation>Otočení výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/scale/configurator.cpp" line="70"/>
         <source>Scale Tween</source>
         <translation>Měřítko výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="53"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="48"/>
         <source>This tool is just a &lt;b&gt;proof-of-concept&lt;/b&gt; of the basic algorithm for the Tupi&apos;s free-tracing vectorial brushes</source>
         <translation>Tento nástroj je pouze &lt;b&gt;dokladem pojetí&lt;/b&gt; základního algoritmu pro vektorové štětce Tupí</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="63"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="58"/>
         <source>Structure</source>
         <translation>Stavba</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="68"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="63"/>
         <source>Basic</source>
         <translation>Základní</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="64"/>
         <source>Axial</source>
         <translation>Osová</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="65"/>
         <source>Organic</source>
         <translation>Organická</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="109"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="104"/>
         <source>Run simulation</source>
         <translation>Spustit simulaci</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/shear/configurator.cpp" line="70"/>
         <source>Shear Tween</source>
         <translation>Deformace výsledného sledu snímků bočním tlakem</translation>
     </message>
 </context>
 <context>
-    <name>ContourSelection</name>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="107"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="306"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="309"/>
-        <source>Line Selection</source>
-        <translation>Výběr čáry</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="307"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-</context>
-<context>
     <name>EraserTool</name>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="67"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="72"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="76"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="49"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="54"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="58"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="79"/>
         <source>Eraser</source>
         <translation>Guma</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="73"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="55"/>
         <source>E</source>
         <translation>V</translation>
     </message>
@@ -140,17 +126,17 @@
 <context>
     <name>ExportTo</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="468"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="469"/>
         <source>Image name prefix: </source>
         <translation>Předpona názvu obrázku: </translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="473"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="474"/>
         <source>Directory: </source>
         <translation>Adresář: </translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="476"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="477"/>
         <source>File: </source>
         <translation>Soubor: </translation>
     </message>
@@ -175,67 +161,67 @@
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="644"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="649"/>
         <source>Choose a file name...</source>
         <translation>Vybrat název souboru...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="657"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="663"/>
         <source>Choose a directory...</source>
         <translation>Vybrat adresář...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="726"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="741"/>
         <source>Warning!</source>
         <translation>Varování!</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="727"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="742"/>
         <source>File exists. Overwrite it?</source>
         <translation>Soubor existuje. Přepsat jej?</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="689"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="703"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="738"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="748"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="789"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <location filename="../src/components/export/tupexportwidget.cpp" line="459"/>
         <source>Enable background transparency</source>
-        <translation type="unfinished"></translation>
+        <translation>Povolit průhlednost pozadí</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="689"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
         <source>Images name prefix can&apos;t be empty! Please, type a prefix.</source>
         <translation>Předpona názvu obrázku nemůže být prázdná! Zadejte, prosím, předponu.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="703"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="738"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
         <source>Directory doesn&apos;t exist! Please, choose another path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresář neexistuje! Vyberte, prosím, jinou cestu.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="748"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation>Nemáte žádné oprávnění pro vytvoření tohoto souboru. Vyberte, prosím, jinou cestu.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="789"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Format problem. Tupi Internal error.</source>
-        <translation>Potíže s formátem. Vnitřní chyba Tupi.</translation>
+        <translation>Potíže s formátem. Vnitřní chyba Tupí.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="796"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="825"/>
         <source>Information</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="800"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="829"/>
         <source>ERROR!</source>
         <translation>Chyba!</translation>
     </message>
@@ -243,145 +229,145 @@
 <context>
     <name>FillTool</name>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="98"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="102"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="169"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="80"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="84"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="177"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="278"/>
         <source>Internal fill</source>
         <translation>Vnitřní výplň</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="104"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="108"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="171"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="267"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="86"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="90"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="179"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="280"/>
         <source>Line fill</source>
         <translation>Výplň čáry</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="99"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="81"/>
         <source>I</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="105"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="87"/>
         <source>B</source>
         <translation>B</translation>
     </message>
 </context>
 <context>
-    <name>GenericExportPlugin</name>
-    <message>
-        <location filename="../src/plugins/export/genericexportplugin/genericexportplugin.cpp" line="55"/>
-        <source>Image Array</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>GeometricTool</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="124"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="151"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="207"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="220"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="283"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="302"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="333"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="380"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="113"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="118"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="149"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="209"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="222"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="285"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="308"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="339"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="386"/>
         <source>Rectangle</source>
         <translation>Obdélník</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="126"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="131"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="158"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="305"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="335"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="382"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="125"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="311"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="341"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="388"/>
         <source>Ellipse</source>
         <translation>Elipsa</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="133"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="138"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="165"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="309"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="384"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="448"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="455"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="462"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="132"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="163"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="315"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="390"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="460"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="467"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="474"/>
         <source>Line</source>
         <translation>Čára</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="114"/>
         <source>R</source>
         <translation>L</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="121"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="128"/>
         <source>L</source>
         <translation>L</translation>
     </message>
 </context>
 <context>
+    <name>ImagePlugin</name>
+    <message>
+        <location filename="../src/plugins/export/imageplugin/imageplugin.cpp" line="48"/>
+        <source>Image Array</source>
+        <translation>Řada obrázků</translation>
+    </message>
+</context>
+<context>
     <name>InfoPanel</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="48"/>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="52"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="43"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="51"/>
         <source>Tips</source>
         <translation>Rady</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
-        <source>Mouse Double Click</source>
-        <translation>Dvojité klepnutí myši</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
         <source>Close the line path</source>
         <translation>Zavřít do cesty čáry</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Mouse Right Click</source>
+        <translation>Klepnutí pravým tlačítkem myši</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Align line to horizontal/vertical axis</source>
         <translation>Zarovnat čáru k vodorovné/svislé ose</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Shift + Left Mouse Button</source>
         <translation>Shift + levé tlačítko myši</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Set width/height proportional dimensions</source>
         <translation>Nastavit proporční rozměry pro šířku/výšku</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>Close line</source>
         <translation>Zavřít čáru</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>X key or Right mouse button</source>
         <translation>Klávesa X nebo pravé tlačítko myši</translation>
     </message>
@@ -389,14 +375,14 @@
 <context>
     <name>InkTool</name>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="139"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="558"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="562"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="605"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="609"/>
         <source>Ink</source>
         <translation>Inkoust</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="559"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="606"/>
         <source>K</source>
         <translation>K</translation>
     </message>
@@ -404,89 +390,145 @@
 <context>
     <name>KinasWidget</name>
     <message>
-        <location filename="../src/components/kinas/kinaswidget.cpp" line="43"/>
+        <location filename="../src/components/kinas/kinaswidget.cpp" line="42"/>
         <source>Tupi Script</source>
-        <translation>Skript Tupi</translation>
+        <translation>Skript Tupí</translation>
+    </message>
+</context>
+<context>
+    <name>NodesTool</name>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="88"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="351"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="354"/>
+        <source>Nodes Selection</source>
+        <translation>Výběr čáry</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="352"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="257"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="261"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="555"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="259"/>
+        <source>Shift+R</source>
+        <translation type="unfinished">Shift+R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Error</source>
+        <translation type="unfinished">Chyba</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Tween name is missing!</source>
+        <translation type="unfinished">Název výsledného sledu snímků chybí!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="533"/>
+        <source>Frame %1</source>
+        <translation type="unfinished">Snímek %1</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Info</source>
+        <translation type="unfinished">Informace</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Tween %1 applied!</source>
+        <translation type="unfinished">Výsledný sled snímků %1 použit!</translation>
     </message>
 </context>
 <context>
     <name>PencilTool</name>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="88"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="135"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="78"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="83"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="129"/>
         <source>Pencil</source>
         <translation>Tužka</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="89"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="79"/>
         <source>P</source>
         <translation>P</translation>
     </message>
 </context>
 <context>
-    <name>PolyLine</name>
+    <name>PolyLineTool</name>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="100"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="104"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="129"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="93"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="122"/>
         <source>PolyLine</source>
-        <translation>Vícečára</translation>
+        <translation>Lomená čára</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="101"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="94"/>
         <source>S</source>
-        <translation>J</translation>
+        <translation>S</translation>
     </message>
 </context>
 <context>
     <name>PositionSettings</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="78"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="68"/>
         <source>Component</source>
         <translation>Součást</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="71"/>
         <source>Position</source>
         <translation>Poloha</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="82"/>
         <source>Starting at frame</source>
         <translation>Začíná se na snímku</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="119"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="180"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="212"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="243"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="202"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="233"/>
         <source>Frames Total</source>
         <translation>Celkový počet snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="154"/>
         <source>Cancel Tween</source>
         <translation>Zrušit výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>Info</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>You must define a path for this Tween!</source>
         <translation>Musíte stanovit cestu pro tento výsledný sled snímků!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="235"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="225"/>
         <source>Position Tween is set!</source>
         <translation>Poloha výsledného sledu snímků je nastavena!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="260"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="250"/>
         <source>Close Tween properties</source>
         <translation>Zavřít vlastnosti výsledného sledu snímků</translation>
     </message>
@@ -494,117 +536,117 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="262"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="229"/>
         <source>Information</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="268"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="235"/>
         <source>Warning</source>
         <translation>Varování</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="274"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="241"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="280"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="247"/>
         <source>Critical</source>
         <translation>Zásadní</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="70"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="51"/>
         <source>Fatal Error</source>
         <translation>Vážná chyba</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="71"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="52"/>
         <source>Well, Tupi has crashed...</source>
-        <translation>Tak dobře, Tupi spadl...</translation>
+        <translation>Tak dobře, Tupí spadl...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="72"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="53"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="73"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="54"/>
         <source>Re-launch Tupi</source>
-        <translation>Spustit Tupi znovu</translation>
+        <translation>Spustit Tupí znovu</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="74"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="55"/>
         <source>This is a general failure</source>
         <translation>Toto je obecné selhání</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="137"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="159"/>
         <source>add</source>
         <translation>Přidat</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="142"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="164"/>
         <source>remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="147"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="169"/>
         <source>move</source>
         <translation>Přesunout</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="152"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="174"/>
         <source>lock</source>
         <translation>Zamknout</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="157"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="179"/>
         <source>rename</source>
         <translation>Přejmenovat</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="162"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="184"/>
         <source>select</source>
         <translation>Vybrat</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="167"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="189"/>
         <source>edit node</source>
         <translation>Upravit uzel</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="172"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="194"/>
         <source>view</source>
         <translation>Pohled</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="177"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="199"/>
         <source>transform</source>
         <translation>Proměnit</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="182"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="204"/>
         <source>convert</source>
         <translation>Převést</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="490"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="535"/>
         <source>Wall from</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeď od</translation>
     </message>
 </context>
 <context>
     <name>SchemeTool</name>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="144"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="697"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="701"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="682"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="686"/>
         <source>Scheme</source>
         <translation>Znázornění</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="698"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="683"/>
         <source>M</source>
         <translation>M</translation>
     </message>
@@ -612,93 +654,93 @@
 <context>
     <name>SelectPlugin</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="100"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="77"/>
         <source>Select plugin</source>
         <translation>Vybrat přídavný modul</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="165"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="231"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="142"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
         <source>WEBM Video</source>
         <translation>Video WEBM</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="170"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="234"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="147"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="211"/>
         <source>OGV Video</source>
         <translation>Video OGV</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="175"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="237"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="152"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="214"/>
         <source>MPEG Video</source>
         <translation>Video MPEG</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="180"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="240"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="217"/>
         <source>Macromedia flash</source>
         <translation>Macromedia flash</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="243"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="162"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="220"/>
         <source>AVI Video</source>
         <translation>Video AVI</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="218"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="264"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="241"/>
         <source>Animated PNG (APNG)</source>
-        <translation type="unfinished"></translation>
+        <translation>Animované PNG (APNG)</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="246"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="223"/>
         <source>RealMedia Video</source>
         <translation>Video RealMedia</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="282"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="259"/>
         <source>Animated Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Animovaný obrázek</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="284"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
         <source>Image Array</source>
-        <translation type="unfinished">Řady obrázků</translation>
+        <translation>Řada obrázků</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="249"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="167"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="226"/>
         <source>ASF Video</source>
         <translation>Video ASF</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="252"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="172"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="229"/>
         <source>QuickTime Video</source>
         <translation>Video QuickTime</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="255"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="232"/>
         <source>Gif Image</source>
         <translation>Obrázek GIF</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="258"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="235"/>
         <source>PNG Image Array</source>
         <translation>Řada obrázků PNG</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="213"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="238"/>
         <source>JPEG Image Array</source>
         <translation>Řada obrázků JPEG</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="224"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="267"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="201"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="244"/>
         <source>SMIL</source>
         <translation>SMIL</translation>
     </message>
@@ -706,26 +748,26 @@
 <context>
     <name>SelectScenes</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="327"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="304"/>
         <source>Select Scenes</source>
         <translation>Vybrat výjevy</translation>
     </message>
 </context>
 <context>
-    <name>SelectTool</name>
+    <name>SelectionTool</name>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="339"/>
-        <source>Select</source>
-        <translation>Vybrat</translation>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="161"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="369"/>
+        <source>Selection</source>
+        <translation>Výběr</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="336"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="366"/>
         <source>Object Selection</source>
         <translation>Výběr předmětu</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="337"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="367"/>
         <source>O</source>
         <translation>O</translation>
     </message>
@@ -733,464 +775,494 @@
 <context>
     <name>Settings</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="96"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="82"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="101"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="97"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="85"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="72"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="87"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="88"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="104"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="92"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="111"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="108"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="91"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="95"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="82"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="98"/>
         <source>Options</source>
         <translation>Volby</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="105"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="93"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="112"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="99"/>
         <source>Select object</source>
         <translation>Vybrat předmět</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="113"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="109"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="110"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="93"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="84"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="99"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="100"/>
         <source>Set Properties</source>
         <translation>Nastavit vlastnosti</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="148"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="146"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="134"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="133"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="137"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="124"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="140"/>
         <source>Starting at frame</source>
         <translation>Začíná se na snímku</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="155"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="156"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="141"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="145"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="147"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="148"/>
         <source>Ending at frame</source>
         <translation>Konec na snímku</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="177"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="573"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="175"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="524"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="185"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="210"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="184"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="670"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="178"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="546"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="179"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="552"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="565"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="168"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="516"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="200"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="538"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="171"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="544"/>
         <source>Frames Total</source>
         <translation>Celkový počet snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="203"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="190"/>
         <source>White</source>
         <translation>Bílá</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="192"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="179"/>
         <source>Initial Color</source>
         <translation>Počáteční barva</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="195"/>
         <source>Ending Color</source>
         <translation>Koncová barva</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="221"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="212"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="211"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="212"/>
         <source>Iterations</source>
         <translation>Opakování</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="230"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="337"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="217"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="221"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="221"/>
         <source>Loop</source>
         <translation>Smyčka</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="346"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="238"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="230"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="230"/>
         <source>Loop with Reverse</source>
         <translation>Smyčka se zpětným chodem</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="284"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="383"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="287"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="287"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="178"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="279"/>
         <source>Save Tween</source>
         <translation>Uložit výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="288"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="190"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="385"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="289"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="289"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="275"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="281"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="281"/>
         <source>Cancel Tween</source>
         <translation>Zrušit výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="350"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="343"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="459"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="359"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="343"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="333"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="347"/>
         <source>Update Tween</source>
         <translation>Obnovit výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="360"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="352"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="345"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="461"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="361"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="357"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="347"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="335"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="349"/>
         <source>Close Tween properties</source>
         <translation>Zavřít vlastnosti výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Info</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
         <source>You must select at least one object!</source>
         <translation>Musíte vybrat alespoň jeden předmět!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
         <source>You must set Tween properties first!</source>
         <translation>Nejprve musíte vybrat vlastnosti výsledného sledu snímků!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Select objects for Tweening first!</source>
         <translation>Nejprve vybrat předmět pro tvorbu výsledného sledu snímků!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="183"/>
         <source>Initial Opacity</source>
         <translation>Počáteční neprůhlednost</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="206"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="199"/>
         <source>Ending Opacity</source>
         <translation>Koncová neprůhlednost</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
         <source>You must define a path for this Tween!</source>
         <translation>Musíte stanovit cestu pro tento výsledný sled snímků!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="193"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="185"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="185"/>
         <source>Continuous</source>
         <translation>Nepřetržitý</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="194"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="186"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="186"/>
         <source>Partial</source>
         <translation>Částečný</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="190"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="199"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="199"/>
         <source>Speed (Degrees/Frame)</source>
         <translation>Rychlost (stupně/snimky)</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="265"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="265"/>
         <source>Direction</source>
         <translation>Směr</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="269"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="269"/>
         <source>Clockwise</source>
         <translation>Po směru hodinových ručiček</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="278"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="270"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="270"/>
         <source>Counterclockwise</source>
         <translation>Proti směru hodinových ručiček</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="302"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="294"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="294"/>
         <source>Degrees Range</source>
         <translation>Rozsah stupňů</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="305"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="297"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="297"/>
         <source>Start at</source>
         <translation>Začátek na</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="321"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="313"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="313"/>
         <source>Finish at</source>
         <translation>Skončit na</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="188"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="179"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="180"/>
         <source>Width &amp; Height</source>
         <translation>Šířka a výška</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="189"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="181"/>
         <source>Only Width</source>
         <translation>Jen šířka</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="189"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="181"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="182"/>
         <source>Only Height</source>
         <translation>Jen výška</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="182"/>
         <source>Scale in</source>
         <translation>Změna velikosti</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="206"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="199"/>
         <source>Scaling Factor</source>
         <translation>Násobek změny velikosti</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="191"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="183"/>
         <source>Shear in</source>
         <translation>Deformace bočním tlakem</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/settings.cpp" line="57"/>
+        <location filename="../src/plugins/tools/pencil/settings.cpp" line="53"/>
         <source>Smoothness</source>
-        <translation type="unfinished">Hladkost</translation>
+        <translation>Hladkost</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="66"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="59"/>
         <source>Flips</source>
-        <translation type="unfinished">Přetočení</translation>
+        <translation>Přetočení</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="77"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="70"/>
         <source>Horizontal Flip</source>
-        <translation type="unfinished">Vodorovné přetočení</translation>
+        <translation>Vodorovné přetočení</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="80"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="73"/>
         <source>Vertical Flip</source>
-        <translation type="unfinished">Svislé přetočení</translation>
+        <translation>Svislé přetočení</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="76"/>
         <source>Crossed Flip</source>
-        <translation type="unfinished">Křižné přetočení</translation>
+        <translation>Křižné přetočení</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="89"/>
         <source>Order</source>
-        <translation type="unfinished">Pořadí</translation>
+        <translation>Pořadí</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="106"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="99"/>
         <source>Send object to back</source>
-        <translation type="unfinished"></translation>
+        <translation>Poslat předmět do pozadí</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="102"/>
         <source>Send object to back one level</source>
-        <translation type="unfinished"></translation>
+        <translation>Poslat předmět o jednu úroveň do pozadí</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="112"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="105"/>
         <source>Send object to front</source>
-        <translation type="unfinished"></translation>
+        <translation>Poslat předmět do popředí</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="115"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="108"/>
         <source>Send object to front one level</source>
-        <translation type="unfinished"></translation>
+        <translation>Poslat předmět o jednu úroveň do popředí</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="131"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="124"/>
         <source>Position</source>
-        <translation type="unfinished">Poloha</translation>
+        <translation>Poloha</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="236"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="229"/>
         <source>Show Tips</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukázat rady</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="158"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="237"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="151"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="230"/>
         <source>A little help for the Selection tool</source>
-        <translation type="unfinished"></translation>
+        <translation>Malá nápověda k nástroji pro výběr</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Rotation mode</source>
-        <translation type="unfinished">Režim otáčení</translation>
+        <translation>Režim otáčení</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Double click on any node or shortcut Alt + R</source>
-        <translation type="unfinished">Dvojité klepnutí na jakýkoli uzel nebo klávesová zkratka Alt + R</translation>
+        <translation>Dvojité klepnutí na jakýkoli uzel nebo klávesová zkratka Alt + R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Arrows</source>
-        <translation type="unfinished">Šipky</translation>
+        <translation>Šipky</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Movement on selection</source>
-        <translation type="unfinished">Přesunutí se na výběr</translation>
+        <translation>Přesunutí se na výběr</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Shift + Arrows</source>
-        <translation type="unfinished">Shift + šipky</translation>
+        <translation>Shift + šipky</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Slow movement on selection</source>
-        <translation type="unfinished">Pomalé přesunutí se na výběr</translation>
+        <translation>Pomalé přesunutí se na výběr</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Ctrl + Arrows</source>
-        <translation type="unfinished">Ctrl + šipky</translation>
+        <translation>Ctrl + šipky</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Fast movement on selection</source>
-        <translation type="unfinished">Rychlé přesunutí se na výběr</translation>
+        <translation>Rychlé přesunutí se na výběr</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Shift + Left Mouse Button</source>
-        <translation type="unfinished">Shift + levé tlačítko myši</translation>
+        <translation>Shift + levé tlačítko myši</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Proportional scaling on selection</source>
-        <translation type="unfinished">Poměrná změna velikosti na výběr</translation>
+        <translation>Poměrná změna velikosti na výběr</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="231"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="224"/>
         <source>Show Tools</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukázat nástroje</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="232"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="225"/>
         <source>Options panel for the Selection tool</source>
-        <translation type="unfinished"></translation>
+        <translation>Panel s volbami pro nástroj pro výběr</translation>
     </message>
 </context>
 <context>
     <name>SpinControl</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="220"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="221"/>
         <source>Radius</source>
-        <translation type="unfinished"></translation>
+        <translation>Poloměr</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="229"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="230"/>
         <source>Angle</source>
-        <translation type="unfinished"></translation>
+        <translation>Úhel</translation>
     </message>
 </context>
 <context>
     <name>StepsViewer</name>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Interval</source>
         <translation>interval</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Frames</source>
         <translation>Snímky</translation>
     </message>
@@ -1198,42 +1270,42 @@
 <context>
     <name>TButtonBar</name>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="59"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="47"/>
         <source>Left button bar</source>
         <translation>Levý tlačítkový pruh</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="64"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="52"/>
         <source>Right button bar</source>
         <translation>Pravý tlačítkový pruh</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="69"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="57"/>
         <source>Bottom button bar</source>
         <translation>Dolní tlačítkový pruh</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="74"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="62"/>
         <source>Top button bar</source>
         <translation>Horní tlačítkový pruh</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="88"/>
         <source>Only icons</source>
         <translation>Pouze ikony</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="91"/>
         <source>Only texts</source>
         <translation>Pouze texty</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="108"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="96"/>
         <source>Exclusive space</source>
         <translation>Výhradní prostor</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="115"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
         <source>Auto hide</source>
         <translation>Automaticky skrýt</translation>
     </message>
@@ -1241,12 +1313,12 @@
 <context>
     <name>TCommandHistory</name>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="45"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="41"/>
         <source>Undo</source>
         <translation>Zpět</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="46"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="42"/>
         <source>Redo</source>
         <translation>Znovu</translation>
     </message>
@@ -1254,32 +1326,32 @@
 <context>
     <name>TFontChooser</name>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="52"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="45"/>
         <source>Family</source>
         <translation>Rodina písma</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="56"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="49"/>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="60"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="53"/>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="80"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="73"/>
         <source>Normal</source>
         <translation>Obvyklá</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="81"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="74"/>
         <source>Italic</source>
         <translation>Kurzíva</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="82"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="75"/>
         <source>Oblique</source>
         <translation>Nakloněné</translation>
     </message>
@@ -1287,17 +1359,17 @@
 <context>
     <name>TOptionalDialog</name>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="60"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="56"/>
         <source>Don&apos;t show again</source>
         <translation>Neukazovat znovu</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="59"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="67"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
         <source>Accept</source>
         <translation>Přijmout</translation>
     </message>
@@ -1305,12 +1377,12 @@
 <context>
     <name>TRulerBase</name>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="109"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="102"/>
         <source>Change scale to 5...</source>
         <translation>Změnit měřítko na 5...</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="110"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="103"/>
         <source>Change scale to 10...</source>
         <translation>Změnit měřítko na 10...</translation>
     </message>
@@ -1318,22 +1390,22 @@
 <context>
     <name>TViewButton</name>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="275"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="265"/>
         <source>Menu</source>
         <translation>Nabídka</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="276"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="266"/>
         <source>Only icon</source>
         <translation>Pouze ikona</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="277"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="267"/>
         <source>Only text</source>
         <translation>Pouze text</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="280"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="270"/>
         <source>Mouse sensibility</source>
         <translation>Citlivost myši</translation>
     </message>
@@ -1341,22 +1413,22 @@
 <context>
     <name>TWizard</name>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="48"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="40"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="49"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="41"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Zpět</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="50"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="42"/>
         <source>Next &gt;</source>
         <translation>Další &gt;</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="51"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="43"/>
         <source>&amp;Finish</source>
         <translation>&amp;Dokončit</translation>
     </message>
@@ -1364,22 +1436,22 @@
 <context>
     <name>TabDialog</name>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="93"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="89"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="96"/>
         <source>Apply</source>
         <translation>Použít</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="107"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="103"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="114"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="110"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -1387,7 +1459,7 @@
 <context>
     <name>TextConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/textconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/text/textconfigurator.cpp" line="49"/>
         <source>Html</source>
         <translation>HTML</translation>
     </message>
@@ -1395,14 +1467,14 @@
 <context>
     <name>TextTool</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="64"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="163"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="167"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="57"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="160"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="164"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="157"/>
         <source>T</source>
         <translation>T</translation>
     </message>
@@ -1410,18 +1482,18 @@
 <context>
     <name>TreeWidgetSearchLine</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="74"/>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="89"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="63"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="78"/>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="277"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="266"/>
         <source>Search Columns</source>
         <translation>Sloupce k prohledání</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="279"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="268"/>
         <source>All Visible Columns</source>
         <translation>Všechny viditelné sloupce</translation>
     </message>
@@ -1429,7 +1501,7 @@
 <context>
     <name>TreeWidgetSearchLineWidget</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="575"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="564"/>
         <source>Clear</source>
         <translation>Vyprázdnit</translation>
     </message>
@@ -1437,32 +1509,32 @@
 <context>
     <name>TupAbout</name>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="136"/>
+        <location filename="../src/libui/tupabout.cpp" line="152"/>
         <source>About</source>
-        <translation>O</translation>
+        <translation>Program</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="111"/>
+        <location filename="../src/libui/tupabout.cpp" line="115"/>
         <source>Credits</source>
         <translation>Zásluhy</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="58"/>
+        <location filename="../src/libui/tupabout.cpp" line="48"/>
         <source>About Tupi</source>
-        <translation type="unfinished">O Tupi</translation>
+        <translation>O programu Tupí</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="126"/>
+        <location filename="../src/libui/tupabout.cpp" line="136"/>
         <source>Thanks</source>
         <translation>Poděkování</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="146"/>
+        <location filename="../src/libui/tupabout.cpp" line="167"/>
         <source>License Agreement</source>
         <translation>Povolení</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="147"/>
+        <location filename="../src/libui/tupabout.cpp" line="168"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
@@ -1470,65 +1542,70 @@
 <context>
     <name>TupBasicCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Tupi Camera Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Správce kamery Tupí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Current resolution:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nynější rozlišení:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="122"/>
         <source>Cameras</source>
-        <translation type="unfinished"></translation>
+        <translation>Kamery</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="124"/>
         <source>Camera</source>
-        <translation type="unfinished"></translation>
+        <translation>Kamera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="138"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
         <source>Take picture</source>
-        <translation type="unfinished"></translation>
+        <translation>Udělat obrázek</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="147"/>
+        <source>Close manager</source>
+        <translation>Zavřít správce</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Error</source>
-        <translation type="unfinished">Chyba</translation>
+        <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Can&apos;t create pictures directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze vytvořit adresář pro obrázky</translation>
     </message>
 </context>
 <context>
     <name>TupCameraBar</name>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="61"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="59"/>
         <source>Rewind</source>
         <translation>Přetočit zpět</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="66"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="64"/>
         <source>Play in reverse</source>
         <translation>Přehrát obráceně</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="71"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="69"/>
         <source>Play</source>
         <translation>Přehrát</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="76"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="74"/>
         <source>Stop</source>
         <translation>Zastavit</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="81"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="79"/>
         <source>Forward</source>
         <translation>Vpřed</translation>
     </message>
@@ -1536,168 +1613,173 @@
 <context>
     <name>TupCameraDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="56"/>
         <source>Camera Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastavení kamery</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="72"/>
         <source>Available Camera Devices:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostupná kamerová zařízení:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="77"/>
         <source>Camera Detected:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zjištěna kamera:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="89"/>
         <source>Available Camera Resolutions:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostupná rozlišení kamery:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="101"/>
         <source>Resize my project to fit camera resolution</source>
-        <translation type="unfinished"></translation>
+        <translation>Změnit velikost projektu, aby odpovídala rozlišení kamery</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="104"/>
         <source>Use the basic camera interface (low resources)</source>
-        <translation type="unfinished"></translation>
+        <translation>Použít základní rozhraní kamery (nízké zdroje)</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="110"/>
         <source>Cancel</source>
-        <translation type="unfinished">Zrušit</translation>
+        <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="127"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>TupCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Tupi Camera Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Správce kamery Tupí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Current resolution:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nynější rozlišení:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="125"/>
         <source>Cameras</source>
-        <translation type="unfinished"></translation>
+        <translation>Kamery</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="127"/>
         <source>Camera</source>
-        <translation type="unfinished"></translation>
+        <translation>Kamera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="133"/>
         <source>Take picture</source>
-        <translation type="unfinished"></translation>
+        <translation>Udělat obrázek</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="138"/>
         <source>Show safe area</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukázat bezpečnou oblast</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="139"/>
         <source>+</source>
-        <translation type="unfinished"></translation>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
         <source>Show grid</source>
-        <translation type="unfinished">Ukázat mřížku</translation>
+        <translation>Ukázat mřížku</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="156"/>
         <source>Grid spacing</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozestupy v mřížce</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="174"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="167"/>
         <source>Grid color</source>
-        <translation type="unfinished">Barva mřížky</translation>
+        <translation>Barva mřížky</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="190"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="183"/>
         <source>Show previous images</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukázat předchozí obrázky</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="191"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="184"/>
         <source>P</source>
-        <translation type="unfinished">P</translation>
+        <translation>P</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="194"/>
         <source>Image opacity level</source>
-        <translation type="unfinished"></translation>
+        <translation>Úroveň neprůhlednosti obrázku</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="204"/>
         <source>Amount of images to show</source>
-        <translation type="unfinished"></translation>
+        <translation>Množství obrázků k ukázání</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="231"/>
+        <source>Close manager</source>
+        <translation>Zavřít správce</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Error</source>
-        <translation type="unfinished">Chyba</translation>
+        <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Can&apos;t create pictures directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze vytvořit adresář pro obrázky</translation>
     </message>
 </context>
 <context>
     <name>TupCameraStatus</name>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="79"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="71"/>
         <source>Scene name</source>
         <translation>Název výjevu</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="92"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="84"/>
         <source>Frames total</source>
         <translation>Celkový počet snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="103"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="95"/>
         <source>FPS</source>
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="120"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="112"/>
         <source>Loop</source>
         <translation>Smyčka</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="124"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="116"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="137"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="129"/>
         <source>Export</source>
         <translation>Vyvést do souboru</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="147"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="139"/>
         <source>Post</source>
         <translation>Poslat</translation>
     </message>
@@ -1705,207 +1787,230 @@
 <context>
     <name>TupCameraWidget</name>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="98"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="91"/>
         <source>Scene Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Náhled výjevu</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="162"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="159"/>
         <source>Scale</source>
-        <translation type="unfinished">Velikost</translation>
+        <translation>Měřítko</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="185"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="182"/>
         <source>Size</source>
-        <translation type="unfinished">Velikost</translation>
+        <translation>Velikost</translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraWindow</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="95"/>
+        <source>General Camera error</source>
+        <translation>Obecná chyba kamery</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="100"/>
+        <source>Camera invalid request error</source>
+        <translation>Chyba: Neplatný požadavek kamery</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="105"/>
+        <source>Camera service missing error</source>
+        <translation>Chyba: Chybí služba kamery</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="110"/>
+        <source>Camera not supported error</source>
+        <translation>Chyba: Kamera nepodporována</translation>
     </message>
 </context>
 <context>
     <name>TupCanvas</name>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="101"/>
         <source>Sketch Tools</source>
         <translation>Nástroje na črtání</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="128"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="119"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="119"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="105"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="118"/>
         <source>Images</source>
         <translation>Obrázek</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="94"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="80"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="71"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="78"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="79"/>
         <source>Tupi: Open 2D Magic</source>
-        <translation type="unfinished">Tupi: Otevřené dvojrozměrné kouzlo</translation>
+        <translation>Tupí: Otevřené dvojrozměrné kouzlo</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="109"/>
         <source>Selection Tools</source>
-        <translation type="unfinished"></translation>
+        <translation>Nástroje výběru</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="136"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="147"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="146"/>
         <source>Undo</source>
         <translation>Zpět</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="140"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="151"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="151"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="149"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="150"/>
         <source>Redo</source>
         <translation>Znovu</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="144"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="131"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="130"/>
         <source>Delete Selection</source>
         <translation>Smazat výběr</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="135"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="135"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="134"/>
         <source>Zoom In</source>
         <translation>Přiblížit</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="139"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="137"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="138"/>
         <source>Zoom Out</source>
         <translation>Oddálit</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="156"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="143"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="143"/>
-        <source>Hand</source>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="142"/>
+        <source>Shift</source>
         <translation>Ruční</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="160"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="137"/>
         <source>Pen Properties</source>
         <translation>Vlastnosti pera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="164"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="163"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="162"/>
         <source>Exposure Sheet</source>
         <translation>List vystavení</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="447"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="295"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="425"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="293"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="295"/>
         <source>Import a SVG file...</source>
         <translation>Zavést soubor SVG...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="448"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="296"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="297"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="426"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="294"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
         <source>Vector</source>
-        <translation type="unfinished"></translation>
+        <translation>Vektor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="485"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="463"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="331"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="333"/>
         <source>Information</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="487"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="335"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="465"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="335"/>
         <source>Image is bigger than workspace.</source>
         <translation>Obrázek je větší než pracovní prostor.</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="488"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="336"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="337"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="466"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
         <source>Do you want to resize it?</source>
         <translation>Chcete změnit jeho velikost?</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="634"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="609"/>
         <source>Scene %1</source>
         <translation>Výjev %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="637"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="612"/>
         <source>Layer 1</source>
         <translation>Vrstva 1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="640"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="615"/>
         <source>Frame 1</source>
         <translation>Snímek 1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="653"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="628"/>
         <source>Layer %1</source>
         <translation>Vrstva %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="660"/>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="672"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="635"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="647"/>
         <source>Frame %1</source>
         <translation>Snímek %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="97"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="97"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="96"/>
         <source>Pencil</source>
         <translation>Tužka</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="101"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="101"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="99"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="100"/>
         <source>Ink</source>
         <translation>Inkoust</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="111"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="109"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="110"/>
         <source>Ellipse</source>
         <translation>Elipsa</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="115"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="114"/>
         <source>Rectangle</source>
         <translation>Obdélník</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="122"/>
         <source>Object Selection</source>
         <translation>Výběr předmětu</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="127"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="127"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="126"/>
+        <source>Nodes Selection</source>
         <translation>Výběr čáry</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="155"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="155"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="154"/>
         <source>Color Palette</source>
         <translation>Paleta barev</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="159"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="158"/>
         <source>Pen Size</source>
         <translation>Velikost tužky</translation>
     </message>
@@ -1913,17 +2018,17 @@
 <context>
     <name>TupChat</name>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="85"/>
+        <location filename="../src/net/tupchat.cpp" line="75"/>
         <source>Send</source>
         <translation>Poslat</translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="174"/>
+        <location filename="../src/net/tupchat.cpp" line="164"/>
         <source>Error:</source>
         <translation>Chyba:</translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="175"/>
+        <location filename="../src/net/tupchat.cpp" line="165"/>
         <source>Invalid Message. It won&apos;t be sent. Please, don&apos;t use HTML tags</source>
         <translation>Neplatná zpráva. Nebude poslána. Nepoužívejte, prosím, značky HTML</translation>
     </message>
@@ -1931,27 +2036,27 @@
 <context>
     <name>TupColorPalette</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="95"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="77"/>
         <source>Color Palette</source>
         <translation>Paleta barev</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="141"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="127"/>
         <source>Contour</source>
         <translation>Obrys</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="142"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="128"/>
         <source>Fill</source>
         <translation>Vyplnit</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="221"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="207"/>
         <source>Color Mixer</source>
         <translation>Mísič barev</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="229"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="215"/>
         <source>Gradients</source>
         <translation>Přechody</translation>
     </message>
@@ -1959,7 +2064,7 @@
 <context>
     <name>TupColorValue</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="184"/>
+        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="180"/>
         <source>Percent</source>
         <translation>Procent</translation>
     </message>
@@ -1967,12 +2072,12 @@
 <context>
     <name>TupConfigurationArea</name>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="286"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="296"/>
         <source>Cursor here for expand</source>
         <translation>Ukazovátko sem pro rozbalení</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="329"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="339"/>
         <source>Properties</source>
         <translation>Vlastnosti</translation>
     </message>
@@ -1980,42 +2085,42 @@
 <context>
     <name>TupConnectDialog</name>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="60"/>
         <source>Connection Dialog</source>
         <translation>Připojení</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Login</source>
         <translation>Přihlášení</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Port</source>
         <translation>Přípojka</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="84"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
         <source>Store password</source>
         <translation>Uložit heslo</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Please, fill in your password</source>
         <translation>Vyplňte, prosím, své heslo</translation>
     </message>
@@ -2023,18 +2128,18 @@
 <context>
     <name>TupCrashWidget</name>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="129"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="112"/>
         <source>What&apos;s happening?</source>
         <translation>Co se děje?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="159"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="140"/>
         <source>Executable information</source>
         <translation>Informace o spustitelném souboru</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="165"/>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="172"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="146"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="153"/>
         <source>Backtrace</source>
         <translation>Zpětná stopa</translation>
     </message>
@@ -2042,7 +2147,7 @@
 <context>
     <name>TupDebugWidget</name>
     <message>
-        <location filename="../src/components/debug/tupdebugwidget.cpp" line="48"/>
+        <location filename="../src/components/debug/tupdebugwidget.cpp" line="44"/>
         <source>Debug Console</source>
         <translation>Ladicí konzole</translation>
     </message>
@@ -2050,468 +2155,488 @@
 <context>
     <name>TupDocumentView</name>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="341"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="587"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="836"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="874"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1126"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="617"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="931"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
         <source>Object Selection</source>
-        <translation type="unfinished">Výběr předmětu</translation>
+        <translation>Výběr předmětu</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Výběr čáry</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Copy</source>
-        <translation type="unfinished">Kopírovat</translation>
+        <translation>Kopírovat</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Ctrl+C</source>
-        <translation type="unfinished">Ctrl+C</translation>
+        <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Paste</source>
-        <translation type="unfinished">Vložit</translation>
+        <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Ctrl+V</source>
-        <translation type="unfinished">Ctrl+V</translation>
+        <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Cut</source>
-        <translation type="unfinished">Vyjmout</translation>
+        <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Ctrl+X</source>
-        <translation type="unfinished">Ctrl+X</translation>
+        <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
         <source>Delete</source>
-        <translation type="unfinished">Smazat</translation>
+        <translation>Smazat</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>&amp;Group</source>
-        <translation type="unfinished">&amp;Skupina</translation>
+        <translation>&amp;Skupina</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished">Ctrl+G</translation>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="375"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="378"/>
         <source>&amp;Ungroup</source>
-        <translation type="unfinished">&amp;Zrušit seskupení</translation>
+        <translation>&amp;Zrušit seskupení</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="376"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="379"/>
         <source>Ctrl+Shift+G</source>
-        <translation type="unfinished">Ctrl+Shift+G</translation>
+        <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Onion Skin</source>
-        <translation type="unfinished">Vzhled Onion</translation>
+        <translation>Cibulový vzhled</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Ctrl+Shift+O</source>
-        <translation type="unfinished">Ctrl+Shift+O</translation>
+        <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1016"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1123"/>
         <source>Onion Skin Factor</source>
-        <translation type="unfinished">Násobek cibulového vzhledu</translation>
+        <translation>Násobek cibulového vzhledu</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished">Ctrl+Shift+S</translation>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>@</source>
-        <translation type="unfinished">@</translation>
+        <translation>@</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
         <source>Export Current Frame As Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyvést nynější snímek jako obrázek</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>Export Current Frame To Gallery</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyvést nynější snímek do galerie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Storyboard Settings</source>
-        <translation type="unfinished">Nastavení obrázkového scénáře</translation>
+        <translation>Nastavení obrázkového scénáře</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Camera</source>
-        <translation type="unfinished"></translation>
+        <translation>Kamera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Ctrl+Shift+C</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="406"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="409"/>
         <source>Draw tools</source>
-        <translation type="unfinished">Nástroje na kreslení</translation>
+        <translation>Nástroje na kreslení</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="416"/>
         <source>Brushes</source>
-        <translation type="unfinished">Štětce</translation>
+        <translation>Štětce</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="420"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="423"/>
         <source>Selection</source>
-        <translation type="unfinished">Výběr</translation>
+        <translation>Výběr</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="427"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="430"/>
         <source>Fill</source>
-        <translation type="unfinished">Vyplnit</translation>
+        <translation>Výplň</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="434"/>
-        <source>View</source>
-        <translation type="unfinished">Pohled</translation>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
+        <source>Papagayo file has been imported successfully</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="444"/>
         <source>Tweening</source>
-        <translation type="unfinished">Tvorba výsledného sledu snímků</translation>
+        <translation>Tvorba výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="455"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="467"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="478"/>
         <source>Image Array</source>
-        <translation type="unfinished">Řady obrázků</translation>
+        <translation>Řada obrázků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="510"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="800"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="896"/>
         <source>Pencil</source>
-        <translation type="unfinished">Tužka</translation>
+        <translation>Tužka</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="516"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
         <source>Ink</source>
-        <translation type="unfinished">Inkoust</translation>
+        <translation>Inkoust</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="520"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="542"/>
         <source>Eraser</source>
-        <translation type="unfinished">Guma</translation>
+        <translation>Guma</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="525"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="804"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1537"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="547"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1648"/>
         <source>PolyLine</source>
-        <translation type="unfinished"></translation>
+        <translation>Lomená čára</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1651"/>
         <source>Line</source>
-        <translation type="unfinished">Čára</translation>
+        <translation>Čára</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="535"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="805"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="561"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
         <source>Rectangle</source>
-        <translation type="unfinished">Obdélník</translation>
+        <translation>Obdélník</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="806"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="564"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
         <source>Ellipse</source>
-        <translation type="unfinished">Elipsa</translation>
+        <translation>Elipsa</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="541"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="802"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="567"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="898"/>
         <source>Text</source>
-        <translation type="unfinished">Text</translation>
+        <translation>Text</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="549"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="575"/>
         <source>Position Tween</source>
-        <translation type="unfinished">Poloha výsledného sledu snímků</translation>
+        <translation>Poloha výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="580"/>
         <source>Rotation Tween</source>
-        <translation type="unfinished">Otočení výsledného sledu snímků</translation>
+        <translation>Otočení výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="558"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="584"/>
         <source>Scale Tween</source>
-        <translation type="unfinished">Měřítko výsledného sledu snímků</translation>
+        <translation>Měřítko výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="563"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="589"/>
         <source>Shear Tween</source>
-        <translation type="unfinished">Deformace výsledného sledu snímků bočním tlakem</translation>
+        <translation>Deformace výsledného sledu snímků bočním tlakem</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="568"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
         <source>Opacity Tween</source>
-        <translation type="unfinished">Neprůhlednost výsledného sledu snímků</translation>
+        <translation>Neprůhlednost výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="573"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="599"/>
         <source>Coloring Tween</source>
-        <translation type="unfinished">Zbarvení výsledného sledu snímků</translation>
+        <translation>Zbarvení výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="578"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="604"/>
         <source>Compound Tween</source>
-        <translation type="unfinished">Složený výsledný sled snímků</translation>
+        <translation>Složený výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="624"/>
         <source>Internal fill</source>
-        <translation type="unfinished">Vnitřní výplň</translation>
+        <translation>Vnitřní výplň</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="601"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom In</source>
-        <translation type="unfinished">Přiblížit</translation>
+        <translation>Přiblížit</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="743"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="775"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="816"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="871"/>
         <source>%1</source>
-        <translation type="unfinished">%1</translation>
+        <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom Out</source>
-        <translation type="unfinished">Oddálit</translation>
+        <translation>Oddálit</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="851"/>
-        <source>Hand</source>
-        <translation type="unfinished">Ruční</translation>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="437"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="631"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="946"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1496"/>
+        <source>Shift</source>
+        <translation>Ruční</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="609"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="953"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1060"/>
         <source>Paint area actions</source>
-        <translation type="unfinished">Činnosti pro oblast malování</translation>
+        <translation>Činnosti pro oblast malování</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="956"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1063"/>
         <source>Dynamic Background Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Dynamické vlastnosti pozadí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="961"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1068"/>
         <source>Frames Mode</source>
-        <translation type="unfinished">Režim snímků</translation>
+        <translation>Režim snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="962"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1069"/>
         <source>Static BG Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Statický režim pozadí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="963"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1070"/>
         <source>Dynamic BG Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Dynamický režim pozadí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="988"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1095"/>
         <source>Previous Frames</source>
-        <translation type="unfinished">Předchozí snímky</translation>
+        <translation>Předchozí snímky</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1000"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1107"/>
         <source>Next Frames</source>
-        <translation type="unfinished">Další snímky</translation>
+        <translation>Další snímky</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1035"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1142"/>
         <source>Direction</source>
-        <translation type="unfinished">Směr</translation>
+        <translation>Směr</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1038"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1145"/>
         <source>Left to Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Zleva doprava</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1146"/>
         <source>Right to Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Zprava do leva</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1040"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1147"/>
         <source>Top to Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Shora dolů</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1041"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1148"/>
         <source>Bottom to Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdola nahoru</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1044"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1151"/>
         <source>Shift Length</source>
-        <translation type="unfinished"></translation>
+        <translation>Délka posunu</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1519"/>
         <source>Export Frame As</source>
-        <translation type="unfinished">Vyvést snímek jako</translation>
+        <translation>Vyvést snímek jako</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1414"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1520"/>
         <source>Images</source>
-        <translation type="unfinished">Obrázek</translation>
+        <translation>Obrázky</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
         <source>Information</source>
-        <translation type="unfinished">Informace</translation>
+        <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
         <source>Frame has been exported successfully</source>
-        <translation type="unfinished">Snímek byl uložen úspěšně</translation>
+        <translation>Snímek byl uložen úspěšně</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>Error</source>
-        <translation type="unfinished">Chyba</translation>
+        <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
         <source>Can&apos;t export frame as image</source>
-        <translation type="unfinished">Nelze vyvést snímek jako obrázek</translation>
+        <translation>Nelze vyvést snímek jako obrázek</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>No cameras detected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nezjištěna žádná kamera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1668"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1797"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1870"/>
         <source>Frame %1</source>
-        <translation type="unfinished">Snímek %1</translation>
+        <translation>Snímek %1</translation>
     </message>
 </context>
 <context>
     <name>TupExportWidget</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="997"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1030"/>
         <source>Export to Video</source>
         <translation>Vyvést jako video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1007"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1041"/>
         <source>Export to Video File</source>
         <translation>Vyvést jako videosoubor</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1010"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1044"/>
         <source>Export to Images Array</source>
         <translation>Vyvést jako řadu obrázků</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1013"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1047"/>
         <source>Export to Animated Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyvést do animovaného souboru</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1029"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1063"/>
         <source>Post Animation in Tupitube</source>
-        <translation type="unfinished"></translation>
+        <translation>Poslat kreslený film do Tupí bedny</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1058"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1097"/>
         <source>Video Formats</source>
-        <translation type="unfinished"></translation>
+        <translation>Formáty videa</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1060"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1099"/>
         <source>Open Video Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Otevřený formát videa</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1062"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1101"/>
         <source>Image Array</source>
-        <translation type="unfinished">Řady obrázků</translation>
+        <translation>Řada obrázků</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1064"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1103"/>
         <source>Animated Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Animovaný obrázek</translation>
     </message>
 </context>
 <context>
     <name>TupExportWizard</name>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="62"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="54"/>
         <source>Cancel</source>
-        <translation type="unfinished">Zrušit</translation>
+        <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="63"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="55"/>
         <source>Back</source>
-        <translation type="unfinished">Praskliny</translation>
+        <translation>Zpět</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="64"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="56"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="149"/>
         <source>Next</source>
-        <translation type="unfinished">Další</translation>
+        <translation>Další</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="187"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="214"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="179"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="206"/>
         <source>Export</source>
-        <translation type="unfinished">Vyvést do souboru</translation>
+        <translation>Vyvést</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="216"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="208"/>
         <source>Post</source>
-        <translation type="unfinished">Poslat</translation>
+        <translation>Poslat</translation>
     </message>
 </context>
 <context>
     <name>TupExposureDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="57"/>
         <source>Exposure Sheet</source>
         <translation>List vystavení</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="132"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="149"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="273"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="288"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="264"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="279"/>
         <source>Scene</source>
         <translation>Výjev</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="144"/>
         <source>Work Team</source>
         <translation>Pracovní skupina</translation>
     </message>
@@ -2519,15 +2644,15 @@
 <context>
     <name>TupExposureScene</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="70"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="65"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="110"/>
         <source>Layer</source>
         <translation>Vrstva</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="77"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="72"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="154"/>
         <source>Frame</source>
         <translation>Snímek</translation>
     </message>
@@ -2535,123 +2660,123 @@
 <context>
     <name>TupExposureSheet</name>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="71"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="60"/>
         <source>Exposure Sheet</source>
         <translation>List vystavení</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="96"/>
         <source>actions</source>
         <translation>Činnosti</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="106"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="100"/>
         <source>Insert</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="108"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="166"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
         <source>1 frame</source>
         <translation>1 snímek</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="113"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="167"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="107"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="161"/>
         <source>5 frames</source>
         <translation>5 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="118"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="112"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="162"/>
         <source>10 frames</source>
         <translation>10 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="123"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="117"/>
         <source>20 frames</source>
-        <translation type="unfinished">10 snímků {20 ?}</translation>
+        <translation>20 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="128"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="122"/>
         <source>50 frames</source>
-        <translation type="unfinished">10 snímků {50 ?}</translation>
+        <translation>50 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="133"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="127"/>
         <source>100 frames</source>
-        <translation type="unfinished">10 snímků {100 ?}</translation>
+        <translation>100 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="140"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="134"/>
         <source>Remove frame</source>
         <translation>Odstranit snímek</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="145"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="139"/>
         <source>Clear frame</source>
         <translation>Smazat snímek</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="150"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="144"/>
         <source>Lock/Unlock frame</source>
         <translation>Zamknout/Odemknout snímek</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="155"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="149"/>
         <source>Copy frame</source>
         <translation>Kopírovat snímek</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="154"/>
         <source>Paste in frame</source>
         <translation>Vložit do snímku</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="165"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="159"/>
         <source>Expand</source>
         <translation>Rozšířit</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
         <source>Copy TL forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopírovat časovou přímku dopředu</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="174"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="169"/>
         <source>1 time</source>
-        <translation type="unfinished"></translation>
+        <translation>1 krát</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="175"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="170"/>
         <source>2 times</source>
-        <translation type="unfinished"></translation>
+        <translation>2 krát</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="176"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="171"/>
         <source>3 times</source>
-        <translation type="unfinished"></translation>
+        <translation>3 krát</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="177"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="172"/>
         <source>4 times</source>
-        <translation type="unfinished"></translation>
+        <translation>4 krát</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="178"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
         <source>5 times</source>
-        <translation type="unfinished"></translation>
+        <translation>5 krát</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="239"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="632"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="247"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="671"/>
         <source>Layer %1</source>
         <translation>Vrstva %1</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="246"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="474"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="635"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="254"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="501"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="674"/>
         <source>Frame %1</source>
         <translation>Snímek %1</translation>
     </message>
@@ -2659,32 +2784,32 @@
 <context>
     <name>TupGradientCreator</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Linear</source>
         <translation>Přímočarý</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Radial</source>
         <translation>Kruhové</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Conical</source>
         <translation>Kuželovité</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Pad</source>
         <translation>Napouštět</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Reflect</source>
         <translation>Odrážet</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Repeat</source>
         <translation>Opakovat</translation>
     </message>
@@ -2692,34 +2817,34 @@
 <context>
     <name>TupGraphicsScene</name>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="154"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="155"/>
         <source>PolyLine</source>
-        <translation>Řetěz čar</translation>
+        <translation>Lomená čára</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="533"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="727"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="583"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="771"/>
         <source>/Step: 0</source>
         <translation>/Krok: 0</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="610"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="759"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="653"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="803"/>
         <source>/Step: </source>
         <translation>/Krok: </translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1108"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1212"/>
         <source>Line</source>
         <translation>Čára</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom In</source>
         <translation>Přiblížit</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom Out</source>
         <translation>Oddálit</translation>
     </message>
@@ -2727,7 +2852,7 @@
 <context>
     <name>TupHelpBrowser</name>
     <message>
-        <location filename="../src/components/help/tuphelpbrowser.cpp" line="50"/>
+        <location filename="../src/components/help/tuphelpbrowser.cpp" line="42"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
@@ -2735,7 +2860,7 @@
 <context>
     <name>TupHelpWidget</name>
     <message>
-        <location filename="../src/components/help/tuphelpwidget.cpp" line="48"/>
+        <location filename="../src/components/help/tuphelpwidget.cpp" line="40"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
@@ -2743,59 +2868,59 @@
 <context>
     <name>TupImageDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="48"/>
         <source>Image Properties</source>
         <translation>Vlastnosti obrázku</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="53"/>
         <source>Title</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="67"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="54"/>
         <source>My Picture</source>
         <translation>Můj obrázek</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="73"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="60"/>
         <source>Topics</source>
         <translation>Náměty</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation>#námět1 #námět2 #námět3</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="79"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="72"/>
         <source>Just a little taste of my style :)</source>
         <translation>Jen malá ochutnávka mého stylu :-)</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="89"/>
         <source>Post Image</source>
         <translation>Poslat obrázek</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="124"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="130"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="128"/>
         <source>Set a title for the picture here!</source>
         <translation>Zde nastavte název obrázku!</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="139"/>
         <source>Set some topic tags for the picture here!</source>
         <translation>Zde nastavte nějaké značky týkající se námětu obrázku!</translation>
     </message>
@@ -2803,55 +2928,55 @@
 <context>
     <name>TupInfoWidget</name>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="124"/>
         <source>Currency Converter</source>
         <translation>Převodník měny</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="128"/>
         <source>Currency</source>
         <translation>Měna</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="227"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="244"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="228"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="143"/>
         <source>Source</source>
         <translation>Zdroj</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="168"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="152"/>
         <source>Update data every</source>
         <translation>Aktualizovat data každých</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>minute</source>
         <translation>minut</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
         <source>minutes</source>
         <translation>Minuty</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="262"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="246"/>
         <source>Link file to Object</source>
         <translation>Propojit soubor s předmětem</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="263"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="247"/>
         <source>All files (*.*)</source>
         <translation>Všechny soubory (*.*)</translation>
     </message>
@@ -2859,73 +2984,75 @@
 <context>
     <name>TupItemManager</name>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="74"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="70"/>
         <source>New folder %1</source>
-        <translation type="unfinished">Nová složka %1</translation>
+        <translation>Nová složka %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="231"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="343"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="229"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="350"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Volby</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="234"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="242"/>
         <source>Edit with Inkscape</source>
-        <translation type="unfinished">Upravit s Inkscape</translation>
+        <translation>Upravit s Inkscape</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="244"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="252"/>
         <source>Edit with Gimp</source>
-        <translation type="unfinished">Upravit s Gimp</translation>
+        <translation>Upravit s Gimp</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="254"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="262"/>
         <source>Edit with Krita</source>
-        <translation type="unfinished"></translation>
+        <translation>Upravit s Krita</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="264"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="272"/>
         <source>Edit with MyPaint</source>
-        <translation type="unfinished"></translation>
+        <translation>Upravit s MyPaint</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="275"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="283"/>
         <source>Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Klonovat</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="278"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="286"/>
         <source>Export</source>
-        <translation type="unfinished">Vyvést do souboru</translation>
+        <translation>Vyvést</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="281"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="232"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="289"/>
         <source>Rename</source>
-        <translation type="unfinished">Přejmenovat</translation>
+        <translation>Přejmenovat</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="284"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="235"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="292"/>
         <source>Delete</source>
-        <translation type="unfinished">Smazat</translation>
+        <translation>Smazat</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="295"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="347"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="354"/>
         <source>Create new raster item</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit novou rastrovou položku</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="355"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="309"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="359"/>
         <source>Create new svg item</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit novou vektorovou položku</translation>
     </message>
 </context>
 <context>
     <name>TupItemPreview</name>
     <message>
-        <location filename="../src/libtupi/tupitempreview.cpp" line="64"/>
+        <location filename="../src/libtupi/tupitempreview.cpp" line="56"/>
         <source>Library is empty :(</source>
         <translation>Knihovna je prázdná :-(</translation>
     </message>
@@ -2933,40 +3060,45 @@
 <context>
     <name>TupItemTweener</name>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="551"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="610"/>
         <source>Position Tween</source>
         <translation>Poloha výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="554"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="613"/>
         <source>Rotation Tween</source>
         <translation>Otočení výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="557"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="616"/>
         <source>Scale Tween</source>
         <translation>Měřítko výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="560"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="619"/>
         <source>Shear Tween</source>
         <translation>Deformace výsledného sledu snímků bočním tlakem</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="563"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="622"/>
         <source>Opacity Tween</source>
         <translation>Neprůhlednost výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="566"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="625"/>
         <source>Coloring Tween</source>
         <translation>Zbarvení výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="569"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="628"/>
         <source>Compound Tween</source>
         <translation>Složený výsledný sled snímků</translation>
     </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="631"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupLayer</name>
@@ -2979,7 +3111,7 @@
 <context>
     <name>TupLayerIndex</name>
     <message>
-        <location filename="../src/components/timeline/tuplayerindex.cpp" line="178"/>
+        <location filename="../src/components/timeline/tuplayerindex.cpp" line="169"/>
         <source>Layers</source>
         <translation>Vrstvy</translation>
     </message>
@@ -2987,17 +3119,17 @@
 <context>
     <name>TupLibraryDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="58"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="47"/>
         <source>Library Object</source>
         <translation>Knihovní předmět</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="92"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="81"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="84"/>
         <source>Item %1</source>
         <translation>Položka %1</translation>
     </message>
@@ -3005,238 +3137,238 @@
 <context>
     <name>TupLibraryWidget</name>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="125"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="95"/>
         <source>Library</source>
         <translation>Knihovna</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="189"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1327"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="162"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1445"/>
         <source>Image</source>
         <translation>Obrázek</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="191"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1332"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="164"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1450"/>
         <source>Image Array</source>
         <translation>Řada obrázků</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="190"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="163"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1455"/>
         <source>Svg File</source>
         <translation>Soubor SVG</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="192"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1342"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="165"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1460"/>
         <source>Svg Array</source>
         <translation>Řada SVG</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="198"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="171"/>
         <source>Add an object to library</source>
         <translation>Přidat předmět do knihovny</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="206"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="179"/>
         <source>Adds a folder to the object&apos;s list</source>
         <translation>Přidá složku do seznamu předmětů</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="213"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="186"/>
         <source>Inserts the selected object into the drawing area</source>
         <translation>Vloží vybraný předmět do kreslící oblasti</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="278"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1374"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="269"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1493"/>
         <source>Directory</source>
         <translation>Adresář</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="289"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="286"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="339"/>
         <source>No preview available</source>
         <translation>Není dostupný žádný náhled</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="518"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="550"/>
         <source>Export object...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyvést předmět...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Info</source>
-        <translation type="unfinished">Informace</translation>
+        <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Item exported successfully!</source>
-        <translation type="unfinished"></translation>
+        <translation>Položka vyvedena úspěšně!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
         <source>Couldn&apos;t create images directory!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze vytvořit adresář pro obrázky!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
         <source>Couldn&apos;t create vector directory!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze vytvořit adresář pro vektory!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="708"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="781"/>
         <source>Tupi library item</source>
-        <translation type="unfinished"></translation>
+        <translation>Položka knihovny Tupí</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="505"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="753"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="836"/>
         <source>Images</source>
-        <translation>Obrázek</translation>
+        <translation>Obrázky</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="752"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="835"/>
         <source>Import images...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zavést obrázky...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="787"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="928"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1062"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="876"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1026"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1159"/>
         <source>Information</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="789"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="878"/>
         <source>Image is bigger than workspace.</source>
         <translation>Obrázek je větší než pracovní prostor.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="790"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="879"/>
         <source>Do you want to resize it?</source>
         <translation>Chcete změnit jeho velikost?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Cannot open file: %1</source>
         <translation>Nelze otevřít soubor: %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="839"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="929"/>
         <source>Import SVG files...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zavést soubory SVG...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="840"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="930"/>
         <source>Vector</source>
-        <translation type="unfinished"></translation>
+        <translation>Vektor</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="887"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="986"/>
         <source>Choose the images directory...</source>
         <translation>Vybrat adresář s obrázky...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="911"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
         <source>Image files found: %1.</source>
         <translation>Nalezené soubory s obrázky: %1.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="921"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1019"/>
         <source>Files are too big, so they will be resized.</source>
         <translation>Soubory jsou moc veliké, proto bude změněna jejich velikost.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="922"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1020"/>
         <source>Note: This task can take a while.</source>
         <translation>Poznámka: Tato úloha může chvíli trvat.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="931"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1065"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1029"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1162"/>
         <source>Do you want to continue?</source>
         <translation>Chcete pokračovat?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="953"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1051"/>
         <source>Loading images...</source>
         <translation>Nahrávají se obrázky...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1001"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1118"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1099"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1213"/>
         <source>Frame %1</source>
         <translation>Snímek %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1107"/>
         <source>Loading image #%1</source>
         <translation>Nahrává se obrázkek #%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR!</source>
         <translation>Chyba!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR: Can&apos;t open file %1. Please, check file permissions and try again.</source>
         <translation>Chyba: Nelze otevřít soubor %1. Prověřte, prosím, oprávnění k souboru a zkuste to znovu.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
         <source>No image files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Nebyly nalezeny žádné obrázkové soubory.&lt;br/&gt;Vyzkoušejte, prosím, jiný adresář</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1033"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
         <source>Choose the SVG files directory...</source>
         <translation>Vybrat adresář se soubory SVG...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1059"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1156"/>
         <source>%1 SVG files will be loaded.</source>
         <translation>Bude nahráno %1 souborů SVG.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1086"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1182"/>
         <source>Loading SVG files...</source>
         <translation>Nahrávají se soubory SVG...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1126"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1221"/>
         <source>Loading SVG file #%1</source>
         <translation>Nahrává se soubor SVG #%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
         <source>No SVG files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Nebyly nalezeny žádné soubory SVG.&lt;br/&gt;Vyzkoušejte, prosím, jiný adresář</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1149"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1244"/>
         <source>Import audio file...</source>
         <translation>Zavést zvukový soubor...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1150"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1245"/>
         <source>Sound file</source>
         <translation>Soubor se zvukem</translation>
     </message>
@@ -3244,630 +3376,665 @@
 <context>
     <name>TupListProjectDialog</name>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="64"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="54"/>
         <source>Projects List from Server</source>
         <translation>Seznam projektů ze serveru</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="89"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="79"/>
         <source>My works:</source>
         <translation>Moje práce:</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="90"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="80"/>
         <source>My contributions:</source>
         <translation>Moji přispěvatelé:</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="126"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="116"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Author</source>
-        <translation></translation>
+        <translation>Autor</translation>
     </message>
 </context>
 <context>
     <name>TupMainWindow</name>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="108"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="581"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="111"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="635"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>Tupi: Open 2D Magic</source>
-        <translation>Tupi: Otevřené dvojrozměrné kouzlo</translation>
+        <translation>Tupí: Otevřené dvojrozměrné kouzlo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
         <source>[ by %1 | net mode ]</source>
         <translation>[ od %1 | síťový režim ]</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Information</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
         <source>Opening a new document...</source>
         <translation>Otevírá se nový dokument...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="263"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1135"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="306"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="273"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1218"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="277"/>
         <source>Animation</source>
         <translation>Kreslený film</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="317"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="327"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="285"/>
         <source>Player</source>
         <translation>Přehrávač</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; opened!</source>
         <translation>Projekt &lt;b&gt;%1&lt;/b&gt; otevřen!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="434"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="484"/>
         <source>Question</source>
         <translation>Otázka</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="436"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="486"/>
         <source>The document has been modified.</source>
         <translation>Dokument byl změněn.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="487"/>
         <source>Do you want to save the project?</source>
         <translation>Chcete projekt uložit?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="489"/>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="440"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="490"/>
         <source>Discard</source>
         <translation>Vyhodit</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="441"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="491"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>by</source>
         <translation>Od</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="746"/>
         <source>Open Tupi project</source>
-        <translation>Otevřít projekt Tupi</translation>
+        <translation>Otevřít projekt Tupí</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="689"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1014"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1341"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="747"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1093"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1429"/>
         <source>Tupi Project Package (*.tup)</source>
-        <translation>Balíček s projektem Tupi (*.tup)</translation>
+        <translation>Balíček s projektem Tupí (*.tup)</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
         <source>Cannot open project!</source>
         <translation>Projekt nelze otevřít!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Import Gimp palettes</source>
-        <translation type="unfinished"></translation>
+        <translation>Zavést palety z Gimpu</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Gimp Palette (*.gpl *.txt *.css)</source>
-        <translation type="unfinished"></translation>
+        <translation>Paleta z Gimpu (*.gpl *.txt *.css)</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
         <source>Gimp palette import was successful</source>
-        <translation type="unfinished"></translation>
+        <translation>Zavedení palety z Gimpu proběhlo úspěšně</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
         <source>Gimp palette import was unsuccessful</source>
-        <translation type="unfinished"></translation>
+        <translation>Zavedení palety z Gimpu neproběhlo úspěšně</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Tip of the day</source>
         <translation>Rada na tento den</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Show on start</source>
         <translation>Ukázat při spuštění</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Previous tip</source>
         <translation>Předchozí rada</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Next tip</source>
         <translation>Další rada</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1374"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1462"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1013"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1092"/>
         <source>Save Project As</source>
         <translation>Uložit projekt jako</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
         <source>Directory does not exist! Please, choose another path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresář neexistuje! Vyberte, prosím, jinou cestu.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation>Nemáte žádné oprávnění pro vytvoření tohoto souboru. Vyberte, prosím, jinou cestu.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; saved</source>
         <translation>Projekt &lt;b&gt;%1&lt;/b&gt; uložen</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
         <source>Cannot save the project!</source>
         <translation>Projekt nelze uložit!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1136"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1219"/>
         <source>New camera</source>
         <translation>Nová kamera</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1340"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1428"/>
         <source>Import project package</source>
         <translation>Zavést balíček s projektem</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
         <source>Can&apos;t import project. File is empty!</source>
         <translation>Nelze zavést projekt. Soubor je prázdný!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
         <source>Can&apos;t save the project. File doesn&apos;t exist!</source>
         <translation>Nelze uložit projekt. Soubor neexistuje!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1369"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1457"/>
         <source>Fatal Error</source>
         <translation>Vážná chyba</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1371"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1459"/>
         <source>The connection to the server has been lost.</source>
         <translation>Spojení se serverem bylo ztraceno.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1372"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1460"/>
         <source>Please, try to connect again in a while</source>
         <translation>Pokuste se, prosím, připojit za chvíli</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="70"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="64"/>
         <source>Shift+P</source>
         <translation>Shift+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="81"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="75"/>
         <source>Shift+B</source>
         <translation>Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="92"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="86"/>
         <source>Shift+L</source>
         <translation>Shift+L</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Bitmap</source>
         <translation>Bitově mapovaný obrázek</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Alt+B</source>
         <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Bitmap Array</source>
         <translation>Řada bitově mapovaných obrázků</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Alt+Shift+B</source>
         <translation>Alt+Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>SVG File</source>
         <translation>Soubor SVG</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>SVG Array</source>
         <translation>Řada souborů SVG</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>Alt+Shift+S</source>
         <translation>Alt+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="121"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="115"/>
         <source>Shift+C</source>
         <translation>Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="130"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="124"/>
         <source>Shift+E</source>
         <translation>Shift+E</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="140"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="139"/>
         <source>Shift+H</source>
         <translation>Shift+H</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="155"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="154"/>
         <source>Shift+T</source>
         <translation>Shift+T</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="165"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="164"/>
         <source>Shift+D</source>
         <translation>Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="196"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="195"/>
         <source>&amp;File</source>
         <translation>&amp;Soubor</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="204"/>
         <source>Recents</source>
         <translation>Naposledy otevřené projekty</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="243"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="225"/>
         <source>&amp;Edit</source>
         <translation>Ú&amp;pravy</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="257"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="235"/>
         <source>&amp;Import</source>
         <translation>&amp;Zavést</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="280"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="252"/>
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="272"/>
         <source>Modules</source>
         <translation>Moduly</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="322"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="293"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="330"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
         <source>News</source>
         <translation>Zprávy</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="343"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
         <source>&amp;Help</source>
         <translation>Nápo&amp;věda</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>New project</source>
         <translation>Nový projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="392"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="363"/>
         <source>Open new project</source>
         <translation>Otevřít nový projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Open project</source>
         <translation>Otevřít projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="398"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="369"/>
         <source>Load existent project</source>
         <translation>Nahrát stávající projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="411"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="382"/>
         <source>Save project</source>
         <translation>Uložit projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="412"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="383"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="385"/>
         <source>Save current project in current location</source>
         <translation>Uložit nynější projekt v současném umístění</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="416"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
         <source>Save project &amp;As...</source>
         <translation>Uložit projekt &amp;jako...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="417"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="391"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="420"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="394"/>
         <source>Open dialog box to save current project in any location</source>
         <translation>Otevřít dialogové okno pro uložení nynějšího projektu do jakéhokoli umístění</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="423"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Cl&amp;ose project</source>
         <translation>Za&amp;vřít projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="424"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="426"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="403"/>
         <source>Close active project</source>
         <translation>Zavřít činný projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="431"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="408"/>
         <source>&amp;Import GIMP palettes</source>
         <translation>&amp;Zavést palety z Gimpu</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="432"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="409"/>
         <source>Shift+G</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+G</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="433"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="410"/>
         <source>Import palettes</source>
         <translation>Zavést barevné palety</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="413"/>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="415"/>
+        <source>Import Papagayo lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>&amp;Export Project</source>
         <translation>&amp;Vyvést projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="421"/>
         <source>Export project to several video formats</source>
         <translation>Vyvést projekt do několika formátů videa</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>E&amp;xit</source>
         <translation>&amp;Ukončit</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="445"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="427"/>
         <source>Close application</source>
         <translation>Zavřít program</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="469"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="451"/>
         <source>Pr&amp;eferences...</source>
         <translation>Nastav&amp;ení...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="452"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="472"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="454"/>
         <source>Opens the preferences dialog box</source>
         <translation>Otevře dialogové okno s nastavením</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>About Tupi</source>
-        <translation>O Tupi</translation>
+        <translation>O programu Tupí</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>Ctrl+K</source>
         <translation>Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="544"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="526"/>
         <source>Actions Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pruh s činnostmi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="685"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="666"/>
         <source>Undo</source>
         <translation>Zpět</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="669"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="672"/>
         <source>Redo</source>
         <translation>Znovu</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="694"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="675"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Import Papagayo project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
+        <source>Papagayo project is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupNetProjectManagerHandler</name>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="111"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="80"/>
         <source>Communications</source>
         <translation>Dorozumívání se</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="115"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="84"/>
         <source>Chat</source>
         <translation>Rozhovor</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="120"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="89"/>
         <source>Notices</source>
         <translation>Zprávy</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="462"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="507"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
         <source>Unable to connect to server</source>
         <translation>Nepodařilo se navázat spojení se serverem</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="310"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="319"/>
         <source>Fatal Error</source>
         <translation>Vážná chyba</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="312"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="321"/>
         <source>User &quot;%1&quot; is disabled.
 Please, contact the animation server admin to get access.</source>
         <translation>Uživatel &quot;%1&quot; je zakázán.
-Spojte se, prosím, se správcem serveru s animacemi pro získání přístupu.</translation>
+Spojte se, prosím, se správcem serveru s kreslenými filmy pro získání přístupu.</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="491"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="536"/>
         <source>Information</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
         <source>User has no available projects in the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Uživatel nemá na serveru žádné dostupné projekty</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="460"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="505"/>
         <source>Warning</source>
         <translation>Varování</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="484"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="529"/>
         <source>Notice</source>
         <translation>Upozornění</translation>
     </message>
@@ -3875,237 +4042,237 @@
 <context>
     <name>TupNewItemDialog</name>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="76"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="66"/>
         <source>Create new raster item</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit novou rastrovou položku</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="83"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="192"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="196"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="215"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="219"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="73"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="182"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="186"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="205"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="209"/>
         <source>Transparent</source>
-        <translation type="unfinished"></translation>
+        <translation>Průhledná</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="84"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="74"/>
         <source>White</source>
-        <translation type="unfinished">Bílá</translation>
+        <translation>Bílá</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="85"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="75"/>
         <source>Black</source>
-        <translation type="unfinished"></translation>
+        <translation>Černá</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="97"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="87"/>
         <source>Create new vector item</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit novou vektorovou položku</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="123"/>
         <source>&amp;Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Název:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="134"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="124"/>
         <source>&amp;Extension:</source>
-        <translation type="unfinished"></translation>
+        <translation>Příp&amp;ona souboru:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="135"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="125"/>
         <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>Šíř&amp;ka:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="136"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="126"/>
         <source>&amp;Height:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Výška:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="139"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="129"/>
         <source>&amp;Background:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pozadí:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="143"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
         <source>&amp;Open it with:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Otevřít s:</translation>
     </message>
 </context>
 <context>
     <name>TupNewProject</name>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="84"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="75"/>
         <source>Create a new project</source>
         <translation>Vytvořit nový projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="90"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="81"/>
         <source>Project Name</source>
         <translation>Název projektu</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="94"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="85"/>
         <source>my_project</source>
         <translation>Můj projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="97"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="88"/>
         <source>Author</source>
-        <translation></translation>
+        <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="101"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="92"/>
         <source>Your name</source>
         <translation>Pavel Fric</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="104"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="95"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="99"/>
         <source>Just for fun!</source>
         <translation>Jen pro radost!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="103"/>
         <source>Presets</source>
         <translation>Přednastavení</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="115"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="106"/>
         <source>Free format</source>
         <translation>Svobodný formát</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="116"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="107"/>
         <source>520x380 - 24</source>
-        <translation type="unfinished"></translation>
+        <translation>520 x 380 - 24</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="117"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
         <source>640x480 - 24</source>
-        <translation type="unfinished"></translation>
+        <translation>640 x 480 - 24</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="118"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="109"/>
         <source>480p (PAL DV/DVD) - 25</source>
         <translation>480p (PAL DV/DVD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="110"/>
         <source>576p (PAL DV/DVD) - 25</source>
         <translation>576p (PAL DV/DVD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="120"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="111"/>
         <source>720p (HD) - 25</source>
         <translation>720p (HD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="121"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
         <source>1280p (Full HD) - 25</source>
         <translation>1280p (Full HD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="128"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="126"/>
         <source>Background</source>
         <translation>Pozadí</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="136"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="127"/>
         <source>Click here to change background color</source>
         <translation>Klepněte sem pro změnu barvy pozadí</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="144"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
         <source>FPS</source>
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="154"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="145"/>
         <source>Dimension</source>
         <translation>Rozměry</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="170"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="161"/>
         <source>Tupitube project</source>
         <translation>Projekt Tupitube</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="176"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="167"/>
         <source>Project info</source>
         <translation>Informace k projektu</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="235"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="226"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Port</source>
         <translation>Přípojka</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="242"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="233"/>
         <source>Store password</source>
         <translation>Uložit heslo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
         <source>Please, set a name for the project</source>
         <translation>Nastavte, prosím, název projektu</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
         <source>Please, fill in your username</source>
         <translation>Vyplňte, prosím, své uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
         <source>Please, fill in your password</source>
         <translation>Vyplňte, prosím, své heslo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Please, fill in the server name or IP</source>
         <translation>Nastavte, prosím, název serveru nebo IP</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="334"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="325"/>
         <source>White</source>
         <translation>Bílá</translation>
     </message>
@@ -4113,7 +4280,7 @@
 <context>
     <name>TupNotice</name>
     <message>
-        <location filename="../src/net/tupnotice.cpp" line="65"/>
+        <location filename="../src/net/tupnotice.cpp" line="58"/>
         <source>Notices</source>
         <translation>Zprávy</translation>
     </message>
@@ -4121,27 +4288,27 @@
 <context>
     <name>TupOnionOpacityDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="50"/>
         <source>Onion Paper</source>
         <translation>Cibulový papír</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="103"/>
         <source>-0.05</source>
         <translation>-0.05</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="107"/>
         <source>-0.01</source>
         <translation>-0.01</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="119"/>
         <source>+0.01</source>
         <translation>+0.01</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="123"/>
         <source>+0.05</source>
         <translation>+0.05</translation>
     </message>
@@ -4149,162 +4316,163 @@
 <context>
     <name>TupPaintArea</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="109"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1159"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1378"/>
         <source>Pencil</source>
         <translation>Tužka</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="166"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <source>Nodes Selection</source>
         <translation>Výběr čáry</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="181"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="564"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1160"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="182"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="644"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1379"/>
         <source>Object Selection</source>
         <translation>Výběr předmětu</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="196"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="199"/>
         <source>Drawing area</source>
         <translation>Oblast kreslení</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Cut</source>
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
         <source>Paste in...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vložit...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
         <source>next 5 frames</source>
-        <translation type="unfinished"></translation>
+        <translation>dalších 5 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="207"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
         <source>next 10 frames</source>
-        <translation type="unfinished"></translation>
+        <translation>dalších 10 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="211"/>
         <source>next 20 frames</source>
-        <translation type="unfinished"></translation>
+        <translation>dalších 20 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="212"/>
         <source>next 50 frames</source>
-        <translation type="unfinished"></translation>
+        <translation>dalších 50 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="213"/>
         <source>next 100 frames</source>
-        <translation type="unfinished"></translation>
+        <translation>dalších 100 snímků</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="220"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="235"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="238"/>
         <source>Add to library...</source>
         <translation>Přidat do knihovny...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="174"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="521"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1145"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="591"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1364"/>
         <source>PolyLine</source>
-        <translation>Vícečára</translation>
+        <translation>Lomená čára</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
         <source>Send</source>
-        <translation type="unfinished">Poslat</translation>
+        <translation>Poslat</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
         <source>To back</source>
-        <translation type="unfinished"></translation>
+        <translation>Do pozadí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="227"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="230"/>
         <source>To front</source>
-        <translation type="unfinished"></translation>
+        <translation>Do popředí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="228"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="231"/>
         <source>One level to back</source>
-        <translation type="unfinished"></translation>
+        <translation>O jednu úroveň do pozadí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="232"/>
         <source>One level to front</source>
-        <translation type="unfinished"></translation>
+        <translation>O jednu úroveň do popředí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>No items selected</source>
         <translation>Nevybrány žádné položky</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1151"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1370"/>
         <source>Rectangle</source>
         <translation>Obdélník</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1152"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1371"/>
         <source>Ellipse</source>
         <translation>Elipsa</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1153"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1372"/>
         <source>Line</source>
         <translation>Čára</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="922"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1211"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1085"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1430"/>
         <source>Frame %1</source>
         <translation>Snímek %1</translation>
     </message>
@@ -4312,27 +4480,22 @@
 <context>
     <name>TupPaintAreaBase</name>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="201"/>
-        <source>OpenGL isn&apos;t supported</source>
-        <translation>OpenGL není podporováno</translation>
-    </message>
-    <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="372"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="393"/>
         <source>No Scene!</source>
         <translation>Žádný výjev!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="379"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="400"/>
         <source>Locked!</source>
         <translation>Uzamčeno!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="448"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="469"/>
         <source>No Frames!</source>
         <translation>Žádné snímky!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="451"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="472"/>
         <source>No Layers!</source>
         <translation>Žádné vrstvy!</translation>
     </message>
@@ -4340,27 +4503,27 @@
 <context>
     <name>TupPaintAreaConfig</name>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="67"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="59"/>
         <source>Grid color</source>
         <translation>Barva mřížky</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="73"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="65"/>
         <source>Grid separation</source>
         <translation>Rozdělení mřížky</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="82"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="74"/>
         <source>Background color</source>
         <translation>Barva pozadí</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="88"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="80"/>
         <source>Onion skin color</source>
         <translation>Průhledná barva vzhledu Onion</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="94"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="86"/>
         <source>Onion skin background </source>
         <translation>Pozadí vzhledu Onion</translation>
     </message>
@@ -4368,82 +4531,82 @@
 <context>
     <name>TupPaintAreaStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="93"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="76"/>
         <source>Action Safe Area</source>
-        <translation type="unfinished"></translation>
+        <translation>Bezpečná oblast pro činnost</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="77"/>
         <source>+</source>
-        <translation type="unfinished"></translation>
+        <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="85"/>
         <source>Show grid</source>
-        <translation type="unfinished">Ukázat mřížku</translation>
+        <translation>Ukázat mřížku</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="103"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="86"/>
         <source>#</source>
-        <translation type="unfinished">#</translation>
+        <translation>#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
         <source>Full screen</source>
-        <translation type="unfinished">Celá obrazovka</translation>
+        <translation>Celá obrazovka</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="95"/>
         <source>F11</source>
-        <translation type="unfinished">F11</translation>
+        <translation>F11</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="106"/>
         <source>Current Frame</source>
         <translation>Nynější snímek</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="113"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="127"/>
         <source>Zoom</source>
         <translation>Zvětšení</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="164"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="147"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="159"/>
         <source>Rotate Workspace</source>
         <translation>Otočit pracovní prostor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="182"/>
         <source>Antialiasing</source>
         <translation>Vyhlazování</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="191"/>
         <source>Background Color</source>
         <translation>Barva pozadí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="192"/>
         <source>Click here to change background color</source>
         <translation>Klepněte sem pro změnu barvy pozadí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="215"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="198"/>
         <source>Brush Color</source>
         <translation>Barva štětce</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="216"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
         <source>Click here to change brush color</source>
         <translation>Klepněte sem pro změnu barvy štětce</translation>
     </message>
@@ -4451,27 +4614,27 @@
 <context>
     <name>TupPenDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="60"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="50"/>
         <source>Pen Size</source>
         <translation>Velikost tužky</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="102"/>
         <source>-5</source>
         <translation>-5</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="116"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="106"/>
         <source>-1</source>
         <translation>-1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="114"/>
         <source>+1</source>
         <translation>+1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="128"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="118"/>
         <source>+5</source>
         <translation>+5</translation>
     </message>
@@ -4479,83 +4642,83 @@
 <context>
     <name>TupPenWidget</name>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="60"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="52"/>
         <source>Pen Properties</source>
         <translation>Vlastnosti pera</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="71"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="63"/>
         <source>Thickness</source>
         <translation>Tloušťka</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="84"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="76"/>
         <source>Dashes</source>
         <translation>Čárky</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="90"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="83"/>
         <source>Solid</source>
         <translation>Plný</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="85"/>
         <source>Dash</source>
         <translation>Čárka</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="92"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="87"/>
         <source>Dot</source>
         <translation>Tečka</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="93"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="89"/>
         <source>Dash dot</source>
         <translation>Čárka tečka</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="94"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
         <source>Dash dot dot</source>
         <translation>Čárka tečka tečka</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="103"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="108"/>
         <source>Cap</source>
         <translation>Čepice</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="109"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="114"/>
         <source>Flat</source>
         <translation>Rovný</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="110"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="115"/>
         <source>Square</source>
         <translation>Čtverec</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="111"/>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="127"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="116"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="132"/>
         <source>Round</source>
         <translation>Kulatý</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="120"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
         <source>Join</source>
         <translation>Spojnice</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="130"/>
         <source>Miter</source>
         <translation>Pokos</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="126"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="131"/>
         <source>Bevel</source>
         <translation>Zkosení</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="136"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="141"/>
         <source>Brush</source>
         <translation>Štětec</translation>
     </message>
@@ -4563,27 +4726,27 @@
 <context>
     <name>TupPreferences</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="202"/>
         <source>Application TupPreferences</source>
         <translation>Nastavení programu</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
         <source>Theme</source>
         <translation>Vzhled</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
         <source>Font</source>
         <translation>Písmo</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="217"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
         <source>Workspace</source>
         <translation>Pracovní prostor</translation>
     </message>
@@ -4591,27 +4754,27 @@
 <context>
     <name>TupPreferences::GeneralPage</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Tupi Home</source>
-        <translation>Instalační adresář s Tupi</translation>
+        <translation>Instalační adresář s Tupí</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Cache</source>
         <translation>Vyrovnávací paměť</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Browser</source>
         <translation>Prohlížeč</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Open last project</source>
         <translation>Otevřít poslední projekt</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Auto save (minutes)</source>
         <translation>Automaticky uložit (minuty)</translation>
     </message>
@@ -4619,126 +4782,126 @@
 <context>
     <name>TupProjectActionBar</name>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="108"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="97"/>
         <source>Insert a layer</source>
         <translation>Vložit vrstvu</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="98"/>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="120"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
         <source>Remove the layer</source>
         <translation>Odstranit vrstvu</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="110"/>
         <source>F6</source>
         <translation>F6</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
         <source>Move layer up</source>
         <translation>Přesunout vrstvu nahoru</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="122"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="197"/>
         <source>F9</source>
         <translation>F9</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="143"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
         <source>Move layer down</source>
         <translation>Přesunout vrstvu dolů</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="144"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="219"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
         <source>F10</source>
         <translation>F10</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="148"/>
         <source>Insert frame</source>
         <translation>Vložit snímek</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="170"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
         <source>Remove the frame</source>
         <translation>Odstranit snímek</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="188"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="177"/>
         <source>Move frame up</source>
         <translation>Přesunout snímek nahoru</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="189"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="178"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="196"/>
         <source>Move frame down</source>
         <translation>Přesunout snímek dolů</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
         <source>Lock frame</source>
         <translation>Uzamknout snímek</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="229"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
         <source>Lock layer</source>
         <translation>Zamknout vrstvu</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="239"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="228"/>
         <source>Insert a scene</source>
         <translation>Vložit výjev</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="249"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="238"/>
         <source>Remove the scene</source>
         <translation>Odstranit výjev</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="259"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="248"/>
         <source>Move scene up</source>
         <translation>Přesunout výjev nahoru</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="269"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="258"/>
         <source>Move scene down</source>
         <translation>Přesunout výjev dolů</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="279"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="268"/>
         <source>Lock scene</source>
         <translation>Uzamknout výjev</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
         <source>Do you want to remove this frame?</source>
         <translation>Chcete odstranit tento snímek?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Remove?</source>
         <translation>Odstranit?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
         <source>Do you want to remove this layer?</source>
         <translation>Chcete odstranit tuto vrstvu?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Do you want to remove this scene?</source>
         <translation>Chcete odstranit tento výjev?</translation>
     </message>
@@ -4746,17 +4909,17 @@
 <context>
     <name>TupProjectManager</name>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="190"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="207"/>
         <source>Scene %1</source>
         <translation>Výjev %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="193"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="210"/>
         <source>Layer %1</source>
         <translation>Vrstva %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="196"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="213"/>
         <source>Frame %1</source>
         <translation>Snímek %1</translation>
     </message>
@@ -4764,17 +4927,17 @@
 <context>
     <name>TupScene</name>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="185"/>
+        <location filename="../src/store/tupscene.cpp" line="190"/>
         <source>Sound layer %1</source>
         <translation>Zvuková vrstva %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="634"/>
+        <location filename="../src/store/tupscene.cpp" line="648"/>
         <source>Layer %1</source>
         <translation>Vrstva %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="635"/>
+        <location filename="../src/store/tupscene.cpp" line="649"/>
         <source>Frame %1</source>
         <translation>Snímek %1</translation>
     </message>
@@ -4782,7 +4945,7 @@
 <context>
     <name>TupSceneTabWidget</name>
     <message>
-        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="84"/>
+        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="77"/>
         <source>Layers</source>
         <translation>Vrstvy</translation>
     </message>
@@ -4790,29 +4953,29 @@
 <context>
     <name>TupScenesWidget</name>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="69"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="57"/>
         <source>Scenes Manager</source>
         <translation>Správce výjevů</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="101"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="94"/>
         <source>Filter here...</source>
         <translation>Filtr sem...</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="154"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="158"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="185"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="155"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="159"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="190"/>
         <source>Scene %1</source>
         <translation>Výjev %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="164"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="165"/>
         <source>Layer %1</source>
         <translation>Vrstva %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="167"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="168"/>
         <source>Frame %1</source>
         <translation>Snímek %1</translation>
     </message>
@@ -4820,15 +4983,15 @@
 <context>
     <name>TupScreen</name>
     <message>
-        <location filename="../src/components/animation/tupscreen.cpp" line="421"/>
+        <location filename="../src/components/animation/tupscreen.cpp" line="482"/>
         <source>Rendering...</source>
-        <translation type="unfinished">Dělá se...</translation>
+        <translation>Dělá se...</translation>
     </message>
 </context>
 <context>
     <name>TupSplash</name>
     <message>
-        <location filename="../src/shell/tupsplash.cpp" line="55"/>
+        <location filename="../src/shell/tupsplash.cpp" line="53"/>
         <source>Version </source>
         <translation>Verze </translation>
     </message>
@@ -4836,165 +4999,165 @@
 <context>
     <name>TupStoryBoardDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="117"/>
         <source>Storyboard Settings</source>
         <translation>Nastavení obrázkového scénáře</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="158"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="128"/>
         <source>&amp;PDF</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;PDF</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="129"/>
         <source>Export as PDF</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyvést jako PDF</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="132"/>
         <source>&amp;HTML</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;HTML</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="133"/>
         <source>Export as HTML</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyvést jako HTML</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="167"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="137"/>
         <source>Close</source>
-        <translation type="unfinished">Zavřít</translation>
+        <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="146"/>
         <source>&amp;Post</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Poslat</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="232"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="202"/>
         <source>Storyboard General Information</source>
         <translation>Obecné informace o obrázkovém scénáři</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="299"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="269"/>
         <source>Title</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="242"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="212"/>
         <source>Author</source>
-        <translation></translation>
+        <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="247"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="217"/>
         <source>Summary</source>
         <translation>Shrnutí</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="266"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
         <source>Topics</source>
-        <translation type="unfinished">Náměty</translation>
+        <translation>Náměty</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="295"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="265"/>
         <source>Scene Information</source>
         <translation>Informace o výjevu</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="304"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="274"/>
         <source>Duration</source>
         <translation>Doba trvání</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="309"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="279"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="344"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="364"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="314"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="334"/>
         <source>Cover</source>
         <translation>Obal</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="358"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="328"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="411"/>
         <source>Storyboard</source>
         <translation>Obrázkový scénář</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="390"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="360"/>
         <source>Scene</source>
-        <translation type="unfinished">Výjev</translation>
+        <translation>Výjev</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="404"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="374"/>
         <source>Scene No %1 - Information</source>
         <translation>Výjev číslo %1 - Informace</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="559"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="570"/>
         <source>Choose a directory...</source>
-        <translation type="unfinished">Vybrat adresář...</translation>
+        <translation>Vybrat adresář...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Info</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Storyboard exported successfully!</source>
         <translation>Obrázkový scénář uložen úspěšně!</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>Save PDF file</source>
-        <translation type="unfinished"></translation>
+        <translation>Uložit soubor PDF</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>PDF file (*.pdf)</source>
-        <translation type="unfinished"></translation>
+        <translation>Soubor PDF (*.pdf)</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="684"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="700"/>
         <source>PDF</source>
-        <translation type="unfinished"></translation>
+        <translation>PDF</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="686"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="702"/>
         <source>Html</source>
-        <translation type="unfinished">HTML</translation>
+        <translation>HTML</translation>
     </message>
 </context>
 <context>
     <name>TupSymbolEditor</name>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="85"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="74"/>
         <source>Symbol editor</source>
         <translation>Editor symbolů</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="95"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="84"/>
         <source>Brushes</source>
         <translation>Štětce</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="98"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="87"/>
         <source>Selection</source>
         <translation>Výběr</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="101"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="90"/>
         <source>Fill</source>
         <translation>Vyplnit</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="104"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="93"/>
         <source>View</source>
         <translation>Pohled</translation>
     </message>
@@ -5002,138 +5165,138 @@
 <context>
     <name>TupThemeSelector</name>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="75"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="73"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Base</source>
         <translation>Základ</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Foreground</source>
         <translation>Popředí</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Background</source>
         <translation>Pozadí</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button</source>
         <translation>Tlačítko</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button Text</source>
         <translation>Text na tlačítku</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="103"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="101"/>
         <source>Effects</source>
         <translation>Účinky</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Light</source>
         <translation>Světlo</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Midlight</source>
         <translation>Středové osvětlení</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Dark</source>
         <translation>Tmavý</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Mid</source>
         <translation>Středový</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="129"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="127"/>
         <source>Selections</source>
         <translation>Výběry</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlight</source>
         <translation>Zvýraznění</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlighted Text</source>
         <translation>Zvýrazněný text</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="150"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="148"/>
         <source>Text effects</source>
         <translation>Textové účinky</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Bright Text</source>
         <translation>Jasný text</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link</source>
         <translation>Odkaz</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link Visited</source>
         <translation>Navštívený odkaz</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="171"/>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="169"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Schema</source>
         <translation>Znázornění</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Owner</source>
         <translation>Vlastník</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="183"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="182"/>
         <source>Save schema</source>
         <translation>Uložit schéma</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="190"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="189"/>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="194"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="193"/>
         <source>Use this colors</source>
         <translation>Použít tyto barvy</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Please choose a theme name</source>
         <translation>Vyberte, prosím, název motivu</translation>
     </message>
@@ -5141,25 +5304,25 @@
 <context>
     <name>TupTimeLine</name>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="75"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="60"/>
         <source>Time Line</source>
         <translation>Časová přímka</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="461"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="471"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="543"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="549"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="476"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="486"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="558"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="564"/>
         <source>Frame %1</source>
         <translation>Snímek %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="538"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="553"/>
         <source>Layer %1</source>
         <translation>Vrstva %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="598"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="613"/>
         <source>Scene %1</source>
         <translation>Výjev %1</translation>
     </message>
@@ -5167,8 +5330,8 @@
 <context>
     <name>TupToolStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="52"/>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="55"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="46"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="49"/>
         <source>Current Tool</source>
         <translation>Nynější nástroj</translation>
     </message>
@@ -5176,60 +5339,88 @@
 <context>
     <name>TupToolsDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="59"/>
         <source>Pencil</source>
         <translation>Tužka</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="67"/>
         <source>Ink</source>
         <translation>Inkoust</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="82"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="75"/>
         <source>Polyline</source>
-        <translation>Řetěz čar</translation>
+        <translation>Lomená čára</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="83"/>
         <source>Ellipse</source>
         <translation>Elipsa</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="91"/>
         <source>Rectangle</source>
         <translation>Obdélník</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="106"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="99"/>
         <source>Object Selection</source>
         <translation>Výběr předmětu</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="115"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="108"/>
+        <source>Nodes Selection</source>
         <translation>Výběr čáry</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="116"/>
         <source>Color Palette</source>
         <translation>Paleta barev</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="124"/>
         <source>Pen Size</source>
         <translation>Velikost tužky</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="132"/>
         <source>Opacity Value</source>
         <translation>Hodnota neprůhlednosti</translation>
     </message>
 </context>
 <context>
+    <name>TupTwitter</name>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="270"/>
+        <source>Latest version</source>
+        <translation>Poslední verze</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="271"/>
+        <source>Revision</source>
+        <translation>Změna</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="272"/>
+        <source>Code Name</source>
+        <translation>Kódový název</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="275"/>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation>Je čas na povýšení! Klepněte sem!</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="279"/>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupTwitterWidget</name>
     <message>
-        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="52"/>
+        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="47"/>
         <source>News!</source>
         <translation>Zprávy!</translation>
     </message>
@@ -5237,32 +5428,32 @@
 <context>
     <name>TupViewColorCells</name>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="109"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="111"/>
         <source>Default Palette</source>
         <translation>Výchozí paleta</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="118"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="120"/>
         <source>Named Colors</source>
         <translation>Pojmenované barvy</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="125"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="127"/>
         <source>Custom Color Palette</source>
         <translation>Vlastní barevná paleta</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="130"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="132"/>
         <source>Custom Gradient Palette</source>
         <translation>Vlastní paleta přechodů</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="342"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="373"/>
         <source>Add Color</source>
         <translation>Přidat barvu</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="349"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="380"/>
         <source>Remove Color</source>
         <translation>Odstranit barvu</translation>
     </message>
@@ -5270,88 +5461,40 @@
 <context>
     <name>TupWebHunter</name>
     <message>
-        <location filename="../src/libbase/tupwebhunter.cpp" line="108"/>
+        <location filename="../src/libbase/tupwebhunter.cpp" line="101"/>
         <source>Information Temporarily Unavailable</source>
         <translation>Informace dočasně nedostupné</translation>
     </message>
 </context>
 <context>
-    <name>Tupwitter</name>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Latest version</source>
-        <translation>Poslední verze</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Revision</source>
-        <translation>Změna</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Code Name</source>
-        <translation>Název kódu</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="333"/>
-        <source>Update here!</source>
-        <translation>Zaktualizovat zde!</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="341"/>
-        <source>This is what&apos;s happening</source>
-        <translation>Toto je to, co se děje</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="356"/>
-        <source>Name</source>
-        <translation>Název</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="357"/>
-        <source>Description</source>
-        <translation>Popis</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="358"/>
-        <source>Website</source>
-        <translation>Stránky</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="359"/>
-        <source>Followers</source>
-        <translation>Stoupenci</translation>
-    </message>
-</context>
-<context>
     <name>TweenManager</name>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="66"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="56"/>
         <source>Create a new Tween</source>
         <translation>Vytvořit nový výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Tween name already exists!</source>
         <translation>Název výsledného sledu snímků již existuje!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="189"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="179"/>
         <source>Edit</source>
         <translation>Úpravy</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="191"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="181"/>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="194"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="184"/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
@@ -5359,161 +5502,161 @@
 <context>
     <name>Tweener</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="130"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="260"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="264"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="101"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="239"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="243"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="527"/>
         <source>Coloring Tween</source>
         <translation>Zbarvení výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
         <source>Coloring Tween can&apos;t be applied to raster images</source>
         <translation>Zbarvení výsledného sledu snímků nelze použít na rastrové obrázky</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
         <source>Coloring Tween can&apos;t be applied to SVG files</source>
-        <translation type="unfinished"></translation>
+        <translation>Zbarvení výsledného sledu snímků nelze použít na soubory SVG</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="262"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="241"/>
         <source>Shift+C</source>
         <translation>Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Tween name is missing!</source>
         <translation>Název výsledného sledu snímků chybí!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="528"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="614"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="481"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="647"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="525"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="505"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="619"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="480"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="654"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="523"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="540"/>
         <source>Frame %1</source>
         <translation>Snímek %1</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Info</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Tween %1 applied!</source>
         <translation>Výsledný sled snímků %1 použit!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="156"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="373"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="377"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="759"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="144"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="379"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="383"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="758"/>
         <source>Compound Tween</source>
         <translation>Složený výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="375"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="381"/>
         <source>Shift+X</source>
         <translation>Shift+X</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="126"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="227"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="231"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="503"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="117"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="230"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="502"/>
         <source>Opacity Tween</source>
         <translation>Neprůhlednost výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="229"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="228"/>
         <source>Shift+O</source>
         <translation>Shift+O</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="169"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="362"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="752"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="161"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="359"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="363"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="768"/>
         <source>Position Tween</source>
         <translation>Poloha výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="360"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="361"/>
         <source>Shift+W</source>
         <translation>Shift+W</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="140"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="253"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="257"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="134"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="257"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="261"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="555"/>
         <source>Rotation Tween</source>
         <translation>Otočení výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="255"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="259"/>
         <source>Shift+R</source>
         <translation>Shift+R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="250"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="546"/>
         <source>Scale Tween</source>
         <translation>Měřítko výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="252"/>
         <source>Shift+S</source>
         <translation>Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="555"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="133"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="256"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="260"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="562"/>
         <source>Shear Tween</source>
         <translation>Deformace výsledného sledu snímků bočním tlakem</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="258"/>
         <source>Shift+H</source>
         <translation>Shift+H</translation>
     </message>
@@ -5521,88 +5664,88 @@
 <context>
     <name>TweenerPanel</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="84"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="127"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="119"/>
         <source>Options</source>
         <translation>Volby</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="128"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="120"/>
         <source>Select object</source>
         <translation>Vybrat předmět</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="129"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="121"/>
         <source>Set Tweeners</source>
         <translation>Nastavit tvůrce výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="153"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="145"/>
         <source>Tweeners</source>
         <translation>Tvůrci výsledného sledu snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Position</source>
         <translation>Poloha</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Rotation</source>
         <translation>Otočení</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Scale</source>
         <translation>Velikost</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Shear</source>
         <translation>Deformace bočním tlakem</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Opacity</source>
         <translation>Neprůhlednost</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Coloring</source>
         <translation>Zbarvení</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="283"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="275"/>
         <source>Save Tween</source>
         <translation>Uložit výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="285"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="277"/>
         <source>Cancel Tween</source>
         <translation>Zrušit výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="377"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="369"/>
         <source>Info</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
         <source>Select objects for Tweening first!</source>
         <translation>Nejprve vybrat předmět pro tvorbu výsledného sledu snímků!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="429"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="421"/>
         <source>Update Tween</source>
         <translation>Obnovit výsledný sled snímků</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="431"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="423"/>
         <source>Close Tween properties</source>
         <translation>Zavřít vlastnosti výsledného sledu snímků</translation>
     </message>
@@ -5610,32 +5753,32 @@
 <context>
     <name>TweenerTable</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Position</source>
         <translation>Poloha</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Rotation</source>
         <translation>Otočení</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Scale</source>
         <translation>Velikost</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Shear</source>
         <translation>Deformace bočním tlakem</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Opacity</source>
         <translation>Neprůhlednost</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Coloring</source>
         <translation>Zbarvení</translation>
     </message>
@@ -5643,49 +5786,49 @@
 <context>
     <name>VideoProperties</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="848"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="877"/>
         <source>Set Animation Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastavit vlastnosti kresleného filmu</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="860"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="889"/>
         <source>Title</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="861"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="890"/>
         <source>My Video</source>
         <translation>Moje video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="866"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="895"/>
         <source>Topics</source>
         <translation>Náměty</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="867"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="896"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation>#námět1 #námět2 #námět3</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="872"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="901"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="878"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="907"/>
         <source>Just a little taste of my style :)</source>
         <translation>Jen malá ochutnávka mého stylu :-)</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="939"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="959"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="968"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="988"/>
         <source>Set a title for the picture here!</source>
         <translation>Zde nastavte název obrázku!</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="946"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="970"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="975"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="999"/>
         <source>Set some topic tags for the picture here!</source>
         <translation>Zde nastavte nějaké značky týkající se námětu obrázku!</translation>
     </message>
@@ -5693,53 +5836,52 @@
 <context>
     <name>ViewTool</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="100"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="105"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="149"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="250"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="271"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="340"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="103"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="145"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="241"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="263"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="336"/>
         <source>Zoom In</source>
         <translation>Přiblížit</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="107"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="112"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="254"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="273"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="342"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="110"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="245"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="338"/>
         <source>Zoom Out</source>
         <translation>Oddálit</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="114"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="147"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="189"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="308"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="338"/>
-        <source>Hand</source>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="96"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="143"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="184"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="288"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="304"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="334"/>
+        <source>Shift</source>
         <translation>Ruční</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="104"/>
         <source>Z</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="111"/>
         <source>Shift+Z</source>
         <translation>Shift+Z</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="97"/>
         <source>H</source>
         <translation>H</translation>
     </message>
@@ -5747,22 +5889,22 @@
 <context>
     <name>ZoomConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="54"/>
         <source>Scale Factor</source>
         <translation>Násobek změny velikosti</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="67"/>
         <source>Tips</source>
         <translation>Rady</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Zoom Square mode</source>
         <translation>Režim čtvercového zvětšení</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Press Ctrl key + Mouse left button</source>
         <translation>Stisknout klávesu Ctrl - levé tlačítko myši</translation>
     </message>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_da.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_da.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_da.ts tupi-0.2+git05/src/shell/data/translations/tupi_da.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_da.ts	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_da.ts	2014-12-15 14:21:34.000000000 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="da_DK">
+<TS version="2.1" language="da_DK">
 <context>
     <name>ButtonsPanel</name>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="47"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="41"/>
         <source>Edit Tween</source>
         <translation>Rediger Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="51"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="45"/>
         <source>Remove Tween</source>
         <translation>Fjern Tween</translation>
     </message>
@@ -17,122 +17,108 @@
 <context>
     <name>Configurator</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/color/configurator.cpp" line="66"/>
         <source>Coloring Tween</source>
         <translation>Farvelægger Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/configurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/compound/configurator.cpp" line="71"/>
         <source>Compound Tween</source>
         <translation>Sammensatte Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="122"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="117"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="121"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="112"/>
         <source>Smoothness</source>
         <translation>Glathed</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/opacity/configurator.cpp" line="70"/>
         <source>Opacity Tween</source>
         <translation>Gennemsigtighed Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/configurator.cpp" line="91"/>
+        <location filename="../src/plugins/tools/position/configurator.cpp" line="80"/>
         <source>Position Tween</source>
         <translation>Position Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/papagayo/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/rotation/configurator.cpp" line="70"/>
         <source>Rotation Tween</source>
         <translation>Roterende Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/scale/configurator.cpp" line="70"/>
         <source>Scale Tween</source>
         <translation>Skaler Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="53"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="48"/>
         <source>This tool is just a &lt;b&gt;proof-of-concept&lt;/b&gt; of the basic algorithm for the Tupi&apos;s free-tracing vectorial brushes</source>
         <translation>Dette redskab er blot et &lt;b&gt;bevis på konceptet&lt;/b&gt; på den grundlæggende algoritme for Tupi&apos;s gratis tegnende vektor pensler</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="59"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="57"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="58"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="52"/>
         <source>Parameters</source>
         <translation>Parametre</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="63"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="58"/>
         <source>Structure</source>
         <translation>Struktur</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="68"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="63"/>
         <source>Basic</source>
         <translation>Grundlæggende</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="64"/>
         <source>Axial</source>
         <translation>Aksial</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="65"/>
         <source>Organic</source>
         <translation>Organisk</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="81"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="77"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="80"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="72"/>
         <source>Dot Spacing</source>
         <translation>Dot Spacing</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="97"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="93"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="96"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="88"/>
         <source>Size Tolerance</source>
         <translation>Størrelse tolerance</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="109"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="104"/>
         <source>Run simulation</source>
         <translation>Kør simulering</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/shear/configurator.cpp" line="70"/>
         <source>Shear Tween</source>
         <translation>Forskyd Tween</translation>
     </message>
 </context>
 <context>
-    <name>ContourSelection</name>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="107"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="306"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="309"/>
-        <source>Line Selection</source>
-        <translation>Vælg Linie</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="307"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-</context>
-<context>
     <name>EraserTool</name>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="67"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="72"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="76"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="49"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="54"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="58"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="79"/>
         <source>Eraser</source>
         <translation>Eraser</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="73"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="55"/>
         <source>E</source>
         <translation>E</translation>
     </message>
@@ -140,17 +126,17 @@
 <context>
     <name>ExportTo</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="468"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="469"/>
         <source>Image name prefix: </source>
         <translation>Billednavn prefix: </translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="473"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="474"/>
         <source>Directory: </source>
         <translation>Mappe: </translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="476"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="477"/>
         <source>File: </source>
         <translation>Fil: </translation>
     </message>
@@ -175,31 +161,31 @@
         <translation>BPS</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="644"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="649"/>
         <source>Choose a file name...</source>
         <translation>Vælg et fil navn...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="657"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="663"/>
         <source>Choose a directory...</source>
         <translation>Vælg en mappe...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="726"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="741"/>
         <source>Warning!</source>
         <translation>Advarsel!</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="727"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="742"/>
         <source>File exists. Overwrite it?</source>
         <translation>Filen findes. Skal den overskrives?</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="689"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="703"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="738"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="748"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="789"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
@@ -209,33 +195,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="689"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
         <source>Images name prefix can&apos;t be empty! Please, type a prefix.</source>
         <translation>Billednavnets prefix kan ikke være tomt! Skriv venligst perfix.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="703"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="738"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
         <source>Directory doesn&apos;t exist! Please, choose another path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="748"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation>Du har ikke tilladelse til at oprette denne fil. Vælg venligst enanden sti.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="789"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Format problem. Tupi Internal error.</source>
         <translation>Format problem. Intern Tupi fejl.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="796"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="825"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="800"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="829"/>
         <source>ERROR!</source>
         <translation>FEJL!</translation>
     </message>
@@ -243,145 +229,145 @@
 <context>
     <name>FillTool</name>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="98"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="102"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="169"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="80"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="84"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="177"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="278"/>
         <source>Internal fill</source>
         <translation>Indvendig fill</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="104"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="108"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="171"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="267"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="86"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="90"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="179"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="280"/>
         <source>Line fill</source>
         <translation>Linie fill</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="99"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="81"/>
         <source>I</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="105"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="87"/>
         <source>B</source>
         <translation>B</translation>
     </message>
 </context>
 <context>
-    <name>GenericExportPlugin</name>
-    <message>
-        <location filename="../src/plugins/export/genericexportplugin/genericexportplugin.cpp" line="55"/>
-        <source>Image Array</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>GeometricTool</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="124"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="151"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="207"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="220"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="283"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="302"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="333"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="380"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="113"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="118"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="149"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="209"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="222"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="285"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="308"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="339"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="386"/>
         <source>Rectangle</source>
         <translation>Rektangel</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="126"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="131"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="158"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="305"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="335"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="382"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="125"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="311"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="341"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="388"/>
         <source>Ellipse</source>
         <translation>Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="133"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="138"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="165"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="309"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="384"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="448"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="455"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="462"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="132"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="163"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="315"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="390"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="460"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="467"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="474"/>
         <source>Line</source>
         <translation>Linie</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="114"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="121"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="128"/>
         <source>L</source>
         <translation>L</translation>
     </message>
 </context>
 <context>
+    <name>ImagePlugin</name>
+    <message>
+        <location filename="../src/plugins/export/imageplugin/imageplugin.cpp" line="48"/>
+        <source>Image Array</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InfoPanel</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="48"/>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="52"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="43"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="51"/>
         <source>Tips</source>
         <translation>Tips</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
-        <source>Mouse Double Click</source>
-        <translation>Mus dobbeltklik</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
         <source>Close the line path</source>
         <translation>Luk liniens sti</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Mouse Right Click</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Align line to horizontal/vertical axis</source>
         <translation>Tilpas linie til horisontal/vertikal akse</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Shift + Left Mouse Button</source>
         <translation>Shift + Venstre museknap</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Set width/height proportional dimensions</source>
         <translation>Sæt bredde/højde proportions størrelser</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>Close line</source>
         <translation>Luk linie</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>X key or Right mouse button</source>
         <translation>X tast eller Højre museknap</translation>
     </message>
@@ -389,14 +375,14 @@
 <context>
     <name>InkTool</name>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="139"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="558"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="562"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="605"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="609"/>
         <source>Ink</source>
         <translation>Ink</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="559"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="606"/>
         <source>K</source>
         <translation>K</translation>
     </message>
@@ -404,89 +390,145 @@
 <context>
     <name>KinasWidget</name>
     <message>
-        <location filename="../src/components/kinas/kinaswidget.cpp" line="43"/>
+        <location filename="../src/components/kinas/kinaswidget.cpp" line="42"/>
         <source>Tupi Script</source>
         <translation>Tupi Script</translation>
     </message>
 </context>
 <context>
+    <name>NodesTool</name>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="88"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="351"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="354"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Vælg Linie</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="352"/>
+        <source>N</source>
+        <translation type="unfinished">N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="257"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="261"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="555"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="259"/>
+        <source>Shift+R</source>
+        <translation type="unfinished">Shift+R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Error</source>
+        <translation type="unfinished">Fejl</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Tween name is missing!</source>
+        <translation type="unfinished">Tween navn mangler!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="533"/>
+        <source>Frame %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Info</source>
+        <translation type="unfinished">Info</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Tween %1 applied!</source>
+        <translation type="unfinished">Tween %1 anvendes!</translation>
+    </message>
+</context>
+<context>
     <name>PencilTool</name>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="88"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="135"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="78"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="83"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="129"/>
         <source>Pencil</source>
         <translation>Blyant</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="89"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="79"/>
         <source>P</source>
         <translation>P</translation>
     </message>
 </context>
 <context>
-    <name>PolyLine</name>
+    <name>PolyLineTool</name>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="100"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="104"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="129"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="93"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="122"/>
         <source>PolyLine</source>
-        <translation>PolyLine</translation>
+        <translation type="unfinished">PolyLine</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="101"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="94"/>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished">S</translation>
     </message>
 </context>
 <context>
     <name>PositionSettings</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="78"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="68"/>
         <source>Component</source>
         <translation>Komponent</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="71"/>
         <source>Position</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="82"/>
         <source>Starting at frame</source>
         <translation>Starter ved frame</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="119"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="180"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="212"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="243"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="202"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="233"/>
         <source>Frames Total</source>
         <translation>Frames i alt</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="154"/>
         <source>Cancel Tween</source>
         <translation>Annuler Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>You must define a path for this Tween!</source>
         <translation>Du må definere stien for denne Tween!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="235"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="225"/>
         <source>Position Tween is set!</source>
         <translation>Position Tween er sat!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="260"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="250"/>
         <source>Close Tween properties</source>
         <translation>Luk Tween egenskaber</translation>
     </message>
@@ -494,102 +536,102 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="262"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="229"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="268"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="235"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="274"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="241"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="280"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="247"/>
         <source>Critical</source>
         <translation>Kritisk</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="70"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="51"/>
         <source>Fatal Error</source>
         <translation>Alvorlig Fejl</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="71"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="52"/>
         <source>Well, Tupi has crashed...</source>
         <translation>Nåh - Tupi er gået ned...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="72"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="53"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="73"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="54"/>
         <source>Re-launch Tupi</source>
         <translation>Genstart Tupi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="74"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="55"/>
         <source>This is a general failure</source>
         <translation>Dette er en almindelig fejl</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="137"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="159"/>
         <source>add</source>
         <translation>tilføj</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="142"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="164"/>
         <source>remove</source>
         <translation>fjern</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="147"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="169"/>
         <source>move</source>
         <translation>flyt</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="152"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="174"/>
         <source>lock</source>
         <translation>lås</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="157"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="179"/>
         <source>rename</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="162"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="184"/>
         <source>select</source>
         <translation>vælg</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="167"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="189"/>
         <source>edit node</source>
         <translation>rediger knude</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="172"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="194"/>
         <source>view</source>
         <translation>se</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="177"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="199"/>
         <source>transform</source>
         <translation>transformer</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="182"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="204"/>
         <source>convert</source>
         <translation>konverter</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="490"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="535"/>
         <source>Wall from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -597,14 +639,14 @@
 <context>
     <name>SchemeTool</name>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="144"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="697"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="701"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="682"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="686"/>
         <source>Scheme</source>
         <translation>Skema</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="698"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="683"/>
         <source>M</source>
         <translation>M</translation>
     </message>
@@ -612,93 +654,93 @@
 <context>
     <name>SelectPlugin</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="100"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="77"/>
         <source>Select plugin</source>
         <translation>Vælg plugin</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="165"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="231"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="142"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
         <source>WEBM Video</source>
         <translation>WEBM Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="170"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="234"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="147"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="211"/>
         <source>OGV Video</source>
         <translation>OGV Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="175"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="237"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="152"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="214"/>
         <source>MPEG Video</source>
         <translation>MPEG Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="180"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="240"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="217"/>
         <source>Macromedia flash</source>
         <translation>Macromedia flash</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="243"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="162"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="220"/>
         <source>AVI Video</source>
         <translation>AVI Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="218"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="264"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="241"/>
         <source>Animated PNG (APNG)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="246"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="223"/>
         <source>RealMedia Video</source>
         <translation>RealMedia Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="282"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="259"/>
         <source>Animated Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="284"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
         <source>Image Array</source>
         <translation type="unfinished">Billed-rækker</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="249"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="167"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="226"/>
         <source>ASF Video</source>
         <translation>ASF Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="252"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="172"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="229"/>
         <source>QuickTime Video</source>
         <translation>QuickTime Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="255"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="232"/>
         <source>Gif Image</source>
         <translation>Gif billede</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="258"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="235"/>
         <source>PNG Image Array</source>
         <translation>PNG billed række</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="213"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="238"/>
         <source>JPEG Image Array</source>
         <translation>JPG billed række</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="224"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="267"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="201"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="244"/>
         <source>SMIL</source>
         <translation>SMIL</translation>
     </message>
@@ -706,465 +748,495 @@
 <context>
     <name>SelectScenes</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="327"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="304"/>
         <source>Select Scenes</source>
         <translation>Vælg Scener</translation>
     </message>
 </context>
 <context>
-    <name>SelectTool</name>
+    <name>SelectionTool</name>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="339"/>
-        <source>Select</source>
-        <translation>Vælg</translation>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="161"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="369"/>
+        <source>Selection</source>
+        <translation type="unfinished">Valgte</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="336"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="366"/>
         <source>Object Selection</source>
-        <translation>Vælg objekt</translation>
+        <translation type="unfinished">Vælg objekt</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="337"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="367"/>
         <source>O</source>
-        <translation>O</translation>
+        <translation type="unfinished">O</translation>
     </message>
 </context>
 <context>
     <name>Settings</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="96"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="82"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="101"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="97"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="85"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="72"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="87"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="88"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="104"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="92"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="111"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="108"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="91"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="95"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="82"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="98"/>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="105"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="93"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="112"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="99"/>
         <source>Select object</source>
         <translation>Vælg objekt</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="113"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="109"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="110"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="93"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="84"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="99"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="100"/>
         <source>Set Properties</source>
         <translation>Sæt egenskaber</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="148"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="146"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="134"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="133"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="137"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="124"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="140"/>
         <source>Starting at frame</source>
         <translation>Starter ved frame</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="155"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="156"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="141"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="145"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="147"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="148"/>
         <source>Ending at frame</source>
         <translation>Ender ved frame</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="177"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="573"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="175"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="524"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="185"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="210"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="184"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="670"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="178"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="546"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="179"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="552"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="565"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="168"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="516"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="200"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="538"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="171"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="544"/>
         <source>Frames Total</source>
         <translation>Frames i alt</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="203"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="190"/>
         <source>White</source>
         <translation>Hvid</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="192"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="179"/>
         <source>Initial Color</source>
         <translation>Første farve</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="195"/>
         <source>Ending Color</source>
         <translation>Sidste farve</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="221"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="212"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="211"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="212"/>
         <source>Iterations</source>
         <translation>Gentagelser</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="230"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="337"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="217"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="221"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="221"/>
         <source>Loop</source>
         <translation>Loop</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="346"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="238"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="230"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="230"/>
         <source>Loop with Reverse</source>
         <translation>Loop og baglæns</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="284"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="383"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="287"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="287"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="178"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="279"/>
         <source>Save Tween</source>
         <translation>Gem Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="288"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="190"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="385"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="289"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="289"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="275"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="281"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="281"/>
         <source>Cancel Tween</source>
         <translation>Annuler Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="350"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="343"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="459"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="359"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="343"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="333"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="347"/>
         <source>Update Tween</source>
         <translation>Opdater Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="360"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="352"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="345"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="461"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="361"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="357"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="347"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="335"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="349"/>
         <source>Close Tween properties</source>
         <translation>Luk Tween egenskaber</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
         <source>You must select at least one object!</source>
         <translation>Du skal vælge mindst et objekt!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
         <source>You must set Tween properties first!</source>
         <translation>Du må sætte Tween egenskaber først!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Select objects for Tweening first!</source>
         <translation>Vælg objektat Tweene først!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="183"/>
         <source>Initial Opacity</source>
         <translation>Første gennemsigtighed</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="206"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="199"/>
         <source>Ending Opacity</source>
         <translation>Slut gennemsigtighed</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
         <source>You must define a path for this Tween!</source>
         <translation>Du må definere en sti for denne Tween!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="193"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="185"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="185"/>
         <source>Continuous</source>
         <translation>Fortløbende</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="194"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="186"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="186"/>
         <source>Partial</source>
         <translation>Delvis</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="190"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="199"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="199"/>
         <source>Speed (Degrees/Frame)</source>
         <translation>Hastighed (Grader/Frame)</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="265"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="265"/>
         <source>Direction</source>
         <translation>Retning</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="269"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="269"/>
         <source>Clockwise</source>
         <translation>Med uret</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="278"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="270"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="270"/>
         <source>Counterclockwise</source>
         <translation>Mod uret</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="302"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="294"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="294"/>
         <source>Degrees Range</source>
         <translation>Grad interval</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="305"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="297"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="297"/>
         <source>Start at</source>
         <translation>Start ved</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="321"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="313"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="313"/>
         <source>Finish at</source>
         <translation>Slut ved</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="188"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="179"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="180"/>
         <source>Width &amp; Height</source>
         <translation>Bredde &amp; Højde</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="189"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="181"/>
         <source>Only Width</source>
         <translation>Kun bredde</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="189"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="181"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="182"/>
         <source>Only Height</source>
         <translation>Kun højde</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="182"/>
         <source>Scale in</source>
         <translation>Skaler ind</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="206"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="199"/>
         <source>Scaling Factor</source>
         <translation>Skalerings faktor</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="191"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="183"/>
         <source>Shear in</source>
         <translation>Forskyd ind</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/settings.cpp" line="57"/>
+        <location filename="../src/plugins/tools/pencil/settings.cpp" line="53"/>
         <source>Smoothness</source>
         <translation type="unfinished">Glathed</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="66"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="59"/>
         <source>Flips</source>
         <translation type="unfinished">Spejlvend</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="77"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="70"/>
         <source>Horizontal Flip</source>
         <translation type="unfinished">Horisontal Vending</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="80"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="73"/>
         <source>Vertical Flip</source>
         <translation type="unfinished">Vertikal Vending</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="76"/>
         <source>Crossed Flip</source>
         <translation type="unfinished">Krydset Vending</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="89"/>
         <source>Order</source>
         <translation type="unfinished">Rækkefølge</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="106"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="99"/>
         <source>Send object to back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="102"/>
         <source>Send object to back one level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="112"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="105"/>
         <source>Send object to front</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="115"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="108"/>
         <source>Send object to front one level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="131"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="124"/>
         <source>Position</source>
         <translation type="unfinished">Position</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="236"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="229"/>
         <source>Show Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="158"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="237"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="151"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="230"/>
         <source>A little help for the Selection tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Rotation mode</source>
         <translation type="unfinished">Rotation tilstand</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Double click on any node or shortcut Alt + R</source>
         <translation type="unfinished">Dobbeltklik på enhver knude eller genvej Alt + R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Arrows</source>
         <translation type="unfinished">Pile</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Movement on selection</source>
         <translation type="unfinished">Bevægelse ved valg</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Shift + Arrows</source>
         <translation type="unfinished">Shift + Pile</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Slow movement on selection</source>
         <translation type="unfinished">Langsom bevægelse ved valg</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Ctrl + Arrows</source>
         <translation type="unfinished">Ctrl + Pile</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Fast movement on selection</source>
         <translation type="unfinished">Hurtig bevægelse ved valg</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Shift + Left Mouse Button</source>
         <translation type="unfinished">Shift + Venstre museknap</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Proportional scaling on selection</source>
         <translation type="unfinished">Proportionel skalering ved valg</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="231"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="224"/>
         <source>Show Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="232"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="225"/>
         <source>Options panel for the Selection tool</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1172,12 +1244,12 @@
 <context>
     <name>SpinControl</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="220"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="221"/>
         <source>Radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="229"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="230"/>
         <source>Angle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1185,12 +1257,12 @@
 <context>
     <name>StepsViewer</name>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Frames</source>
         <translation>Frames</translation>
     </message>
@@ -1198,42 +1270,42 @@
 <context>
     <name>TButtonBar</name>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="59"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="47"/>
         <source>Left button bar</source>
         <translation>Venstre knap-bar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="64"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="52"/>
         <source>Right button bar</source>
         <translation>Højre knap-bar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="69"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="57"/>
         <source>Bottom button bar</source>
         <translation>Nedre knap-bar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="74"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="62"/>
         <source>Top button bar</source>
         <translation>Øvre knap-bar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="88"/>
         <source>Only icons</source>
         <translation>Kun ikoner</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="91"/>
         <source>Only texts</source>
         <translation>Kun tekst</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="108"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="96"/>
         <source>Exclusive space</source>
         <translation>Eksklusiv plads</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="115"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
         <source>Auto hide</source>
         <translation>Auto skjul</translation>
     </message>
@@ -1241,12 +1313,12 @@
 <context>
     <name>TCommandHistory</name>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="45"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="41"/>
         <source>Undo</source>
         <translation>Fortryd</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="46"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="42"/>
         <source>Redo</source>
         <translation>Gendan</translation>
     </message>
@@ -1254,32 +1326,32 @@
 <context>
     <name>TFontChooser</name>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="52"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="45"/>
         <source>Family</source>
         <translation>Familie</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="56"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="49"/>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="60"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="53"/>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="80"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="73"/>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="81"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="74"/>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="82"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="75"/>
         <source>Oblique</source>
         <translation>Skrå</translation>
     </message>
@@ -1287,17 +1359,17 @@
 <context>
     <name>TOptionalDialog</name>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="60"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="56"/>
         <source>Don&apos;t show again</source>
         <translation>Vis ikke igen</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="59"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="67"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
@@ -1305,12 +1377,12 @@
 <context>
     <name>TRulerBase</name>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="109"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="102"/>
         <source>Change scale to 5...</source>
         <translation>Ændr skalering til 5...</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="110"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="103"/>
         <source>Change scale to 10...</source>
         <translation>Ændr skalering til 10...</translation>
     </message>
@@ -1318,22 +1390,22 @@
 <context>
     <name>TViewButton</name>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="275"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="265"/>
         <source>Menu</source>
         <translation type="unfinished">Menu</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="276"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="266"/>
         <source>Only icon</source>
         <translation type="unfinished">Kun ikon</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="277"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="267"/>
         <source>Only text</source>
         <translation type="unfinished">Kun tekst</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="280"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="270"/>
         <source>Mouse sensibility</source>
         <translation type="unfinished">Muse følsomhed</translation>
     </message>
@@ -1341,22 +1413,22 @@
 <context>
     <name>TWizard</name>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="48"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="40"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="49"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="41"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Tilbage</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="50"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="42"/>
         <source>Next &gt;</source>
         <translation>Næste &gt;</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="51"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="43"/>
         <source>&amp;Finish</source>
         <translation>&amp;Afslut</translation>
     </message>
@@ -1364,22 +1436,22 @@
 <context>
     <name>TabDialog</name>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="93"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="89"/>
         <source>Help</source>
         <translation type="unfinished">Hjælp</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="96"/>
         <source>Apply</source>
         <translation type="unfinished">Anvend</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="107"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="103"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="114"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="110"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -1387,7 +1459,7 @@
 <context>
     <name>TextConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/textconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/text/textconfigurator.cpp" line="49"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
@@ -1395,14 +1467,14 @@
 <context>
     <name>TextTool</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="64"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="163"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="167"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="57"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="160"/>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="164"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="157"/>
         <source>T</source>
         <translation>T</translation>
     </message>
@@ -1410,18 +1482,18 @@
 <context>
     <name>TreeWidgetSearchLine</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="74"/>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="89"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="63"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="78"/>
         <source>Search</source>
         <translation type="unfinished">Søg</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="277"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="266"/>
         <source>Search Columns</source>
         <translation type="unfinished">Søg kolonner</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="279"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="268"/>
         <source>All Visible Columns</source>
         <translation type="unfinished">Alle synlige kolonner</translation>
     </message>
@@ -1429,7 +1501,7 @@
 <context>
     <name>TreeWidgetSearchLineWidget</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="575"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="564"/>
         <source>Clear</source>
         <translation type="unfinished">REns</translation>
     </message>
@@ -1437,32 +1509,32 @@
 <context>
     <name>TupAbout</name>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="136"/>
+        <location filename="../src/libui/tupabout.cpp" line="152"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="111"/>
+        <location filename="../src/libui/tupabout.cpp" line="115"/>
         <source>Credits</source>
         <translation>Akkreditering</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="58"/>
+        <location filename="../src/libui/tupabout.cpp" line="48"/>
         <source>About Tupi</source>
         <translation type="unfinished">Om Tupi</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="126"/>
+        <location filename="../src/libui/tupabout.cpp" line="136"/>
         <source>Thanks</source>
         <translation>Tak</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="146"/>
+        <location filename="../src/libui/tupabout.cpp" line="167"/>
         <source>License Agreement</source>
         <translation>Licens aftale</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="147"/>
+        <location filename="../src/libui/tupabout.cpp" line="168"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
@@ -1470,37 +1542,42 @@
 <context>
     <name>TupBasicCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Tupi Camera Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Current resolution:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="122"/>
         <source>Cameras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="124"/>
         <source>Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="138"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
         <source>Take picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="147"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Error</source>
         <translation type="unfinished">Fejl</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Can&apos;t create pictures directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1508,27 +1585,27 @@
 <context>
     <name>TupCameraBar</name>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="61"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="59"/>
         <source>Rewind</source>
         <translation>Spol tilbage</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="66"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="64"/>
         <source>Play in reverse</source>
         <translation>Afspil baglæns</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="71"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="69"/>
         <source>Play</source>
         <translation>Afspil</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="76"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="74"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="81"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="79"/>
         <source>Forward</source>
         <translation>Fremad</translation>
     </message>
@@ -1536,42 +1613,42 @@
 <context>
     <name>TupCameraDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="56"/>
         <source>Camera Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="72"/>
         <source>Available Camera Devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="77"/>
         <source>Camera Detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="89"/>
         <source>Available Camera Resolutions:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="101"/>
         <source>Resize my project to fit camera resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="104"/>
         <source>Use the basic camera interface (low resources)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="110"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="127"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1579,87 +1656,92 @@
 <context>
     <name>TupCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Tupi Camera Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Current resolution:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="125"/>
         <source>Cameras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="127"/>
         <source>Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="133"/>
         <source>Take picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="138"/>
         <source>Show safe area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="139"/>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
         <source>Show grid</source>
         <translation type="unfinished">Vis gitter</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="156"/>
         <source>Grid spacing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="174"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="167"/>
         <source>Grid color</source>
         <translation type="unfinished">Gitter farve</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="190"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="183"/>
         <source>Show previous images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="191"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="184"/>
         <source>P</source>
         <translation type="unfinished">P</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="194"/>
         <source>Image opacity level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="204"/>
         <source>Amount of images to show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="231"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Error</source>
         <translation type="unfinished">Fejl</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Can&apos;t create pictures directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1667,37 +1749,37 @@
 <context>
     <name>TupCameraStatus</name>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="79"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="71"/>
         <source>Scene name</source>
         <translation>Scene navn</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="92"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="84"/>
         <source>Frames total</source>
         <translation>Frames i alt</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="103"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="95"/>
         <source>FPS</source>
         <translation>BPS</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="120"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="112"/>
         <source>Loop</source>
         <translation>Loop</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="124"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="116"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="137"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="129"/>
         <source>Export</source>
         <translation>Eksporter</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="147"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="139"/>
         <source>Post</source>
         <translation>Send</translation>
     </message>
@@ -1705,207 +1787,230 @@
 <context>
     <name>TupCameraWidget</name>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="98"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="91"/>
         <source>Scene Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="162"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="159"/>
         <source>Scale</source>
         <translation type="unfinished">Skalering</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="185"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="182"/>
         <source>Size</source>
         <translation type="unfinished">Størrelse</translation>
     </message>
 </context>
 <context>
+    <name>TupCameraWindow</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="95"/>
+        <source>General Camera error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="100"/>
+        <source>Camera invalid request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="105"/>
+        <source>Camera service missing error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="110"/>
+        <source>Camera not supported error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupCanvas</name>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="94"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="80"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="71"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="78"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="79"/>
         <source>Tupi: Open 2D Magic</source>
         <translation>Tupi: Open 2D Magic</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="101"/>
         <source>Sketch Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="128"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="119"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="119"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="105"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="118"/>
         <source>Images</source>
         <translation type="unfinished">Billeder</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="109"/>
         <source>Selection Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="136"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="147"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="146"/>
         <source>Undo</source>
         <translation type="unfinished">Fortryd</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="140"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="151"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="151"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="149"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="150"/>
         <source>Redo</source>
         <translation type="unfinished">Gendan</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="144"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="131"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="130"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="135"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="135"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="134"/>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="139"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="137"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="138"/>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="156"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="143"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="143"/>
-        <source>Hand</source>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="142"/>
+        <source>Shift</source>
         <translation type="unfinished">Hånd</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="160"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="137"/>
         <source>Pen Properties</source>
         <translation type="unfinished">Pen egenskaber</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="164"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="163"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="162"/>
         <source>Exposure Sheet</source>
         <translation type="unfinished">X-sheet/Fotoliste</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="447"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="295"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="425"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="293"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="295"/>
         <source>Import a SVG file...</source>
         <translation type="unfinished">Importer en SVG fil...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="448"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="296"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="297"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="426"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="294"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
         <source>Vector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="485"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="463"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="331"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="333"/>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="487"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="335"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="465"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="335"/>
         <source>Image is bigger than workspace.</source>
         <translation type="unfinished">Billede er større end arbejdsområde.</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="488"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="336"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="337"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="466"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
         <source>Do you want to resize it?</source>
         <translation type="unfinished">Ønsker du at formindske det?</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="634"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="609"/>
         <source>Scene %1</source>
         <translation type="unfinished">Scene %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="637"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="612"/>
         <source>Layer 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="640"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="615"/>
         <source>Frame 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="653"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="628"/>
         <source>Layer %1</source>
         <translation type="unfinished">Lag %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="660"/>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="672"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="635"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="647"/>
         <source>Frame %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="97"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="97"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="96"/>
         <source>Pencil</source>
         <translation type="unfinished">Blyant</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="101"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="101"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="99"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="100"/>
         <source>Ink</source>
         <translation type="unfinished">Ink</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="111"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="109"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="110"/>
         <source>Ellipse</source>
         <translation type="unfinished">Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="115"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="114"/>
         <source>Rectangle</source>
         <translation type="unfinished">Rektangel</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="122"/>
         <source>Object Selection</source>
         <translation type="unfinished">Vælg objekt</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="127"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="127"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="126"/>
+        <source>Nodes Selection</source>
         <translation type="unfinished">Vælg Linie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="155"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="155"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="154"/>
         <source>Color Palette</source>
         <translation type="unfinished">Farve Palet</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="159"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="158"/>
         <source>Pen Size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1913,17 +2018,17 @@
 <context>
     <name>TupChat</name>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="85"/>
+        <location filename="../src/net/tupchat.cpp" line="75"/>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="174"/>
+        <location filename="../src/net/tupchat.cpp" line="164"/>
         <source>Error:</source>
         <translation>Fejl:</translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="175"/>
+        <location filename="../src/net/tupchat.cpp" line="165"/>
         <source>Invalid Message. It won&apos;t be sent. Please, don&apos;t use HTML tags</source>
         <translation>Ugyldig meddelelse. Vil ikke blive sendt. Brug venligst ikke HTML tags</translation>
     </message>
@@ -1931,27 +2036,27 @@
 <context>
     <name>TupColorPalette</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="95"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="77"/>
         <source>Color Palette</source>
         <translation>Farve Palet</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="141"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="127"/>
         <source>Contour</source>
         <translation>Kontur</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="142"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="128"/>
         <source>Fill</source>
         <translation>Fill</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="221"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="207"/>
         <source>Color Mixer</source>
         <translation>Farve blander</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="229"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="215"/>
         <source>Gradients</source>
         <translation>Gradueringer</translation>
     </message>
@@ -1959,7 +2064,7 @@
 <context>
     <name>TupColorValue</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="184"/>
+        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="180"/>
         <source>Percent</source>
         <translation>Procent</translation>
     </message>
@@ -1967,12 +2072,12 @@
 <context>
     <name>TupConfigurationArea</name>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="286"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="296"/>
         <source>Cursor here for expand</source>
         <translation>Cursor her for udvidelse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="329"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="339"/>
         <source>Properties</source>
         <translation>Egenskaber</translation>
     </message>
@@ -1980,42 +2085,42 @@
 <context>
     <name>TupConnectDialog</name>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="60"/>
         <source>Connection Dialog</source>
         <translation>Forbindelses dialog</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="84"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
         <source>Store password</source>
         <translation>Gem password</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Please, fill in your password</source>
         <translation>Skriv venligst password</translation>
     </message>
@@ -2023,18 +2128,18 @@
 <context>
     <name>TupCrashWidget</name>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="129"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="112"/>
         <source>What&apos;s happening?</source>
         <translation>Hvad sker der?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="159"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="140"/>
         <source>Executable information</source>
         <translation>Udførelses information</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="165"/>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="172"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="146"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="153"/>
         <source>Backtrace</source>
         <translation>Backtrace</translation>
     </message>
@@ -2042,7 +2147,7 @@
 <context>
     <name>TupDebugWidget</name>
     <message>
-        <location filename="../src/components/debug/tupdebugwidget.cpp" line="48"/>
+        <location filename="../src/components/debug/tupdebugwidget.cpp" line="44"/>
         <source>Debug Console</source>
         <translation>Debug Konsol</translation>
     </message>
@@ -2050,368 +2155,388 @@
 <context>
     <name>TupDocumentView</name>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="341"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="587"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="836"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="874"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1126"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="617"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="931"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
         <source>Object Selection</source>
         <translation type="unfinished">Vælg objekt</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Vælg Linie</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Copy</source>
         <translation type="unfinished">Kopier</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Ctrl+C</source>
         <translation type="unfinished">Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Paste</source>
         <translation type="unfinished">Indsæt</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Ctrl+V</source>
         <translation type="unfinished">Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Cut</source>
         <translation type="unfinished">Klip</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Ctrl+X</source>
         <translation type="unfinished">Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
         <source>Delete</source>
         <translation type="unfinished">Slet</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>&amp;Group</source>
         <translation type="unfinished">&amp;Grupper</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>Ctrl+G</source>
         <translation type="unfinished">Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="375"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="378"/>
         <source>&amp;Ungroup</source>
         <translation type="unfinished">&amp;Opløs gruppe</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="376"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="379"/>
         <source>Ctrl+Shift+G</source>
         <translation type="unfinished">Ctrl+Shift+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Onion Skin</source>
         <translation type="unfinished">Gennemslag/Onion skin</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished">Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1016"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1123"/>
         <source>Onion Skin Factor</source>
         <translation type="unfinished">Onion Skin Faktor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished">Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>@</source>
         <translation type="unfinished">@</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
         <source>Export Current Frame As Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>Export Current Frame To Gallery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Storyboard Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Ctrl+Shift+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="406"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="409"/>
         <source>Draw tools</source>
         <translation type="unfinished">Tegneredskaber</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="416"/>
         <source>Brushes</source>
         <translation type="unfinished">Pensler</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="420"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="423"/>
         <source>Selection</source>
         <translation type="unfinished">Valgte</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="427"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="430"/>
         <source>Fill</source>
         <translation type="unfinished">Fill</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="434"/>
-        <source>View</source>
-        <translation type="unfinished">Se</translation>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
+        <source>Papagayo file has been imported successfully</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="444"/>
         <source>Tweening</source>
         <translation type="unfinished">Tweening</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="455"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="467"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="478"/>
         <source>Image Array</source>
         <translation type="unfinished">Billed-rækker</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="510"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="800"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="896"/>
         <source>Pencil</source>
         <translation type="unfinished">Blyant</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="516"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
         <source>Ink</source>
         <translation type="unfinished">Ink</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="520"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="542"/>
         <source>Eraser</source>
         <translation type="unfinished">Eraser</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="525"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="804"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1537"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="547"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1648"/>
         <source>PolyLine</source>
         <translation type="unfinished">PolyLine</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1651"/>
         <source>Line</source>
         <translation type="unfinished">Linie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="535"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="805"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="561"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
         <source>Rectangle</source>
         <translation type="unfinished">Rektangel</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="806"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="564"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
         <source>Ellipse</source>
         <translation type="unfinished">Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="541"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="802"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="567"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="898"/>
         <source>Text</source>
         <translation type="unfinished">Tekst</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="549"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="575"/>
         <source>Position Tween</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="580"/>
         <source>Rotation Tween</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="558"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="584"/>
         <source>Scale Tween</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="563"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="589"/>
         <source>Shear Tween</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="568"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
         <source>Opacity Tween</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="573"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="599"/>
         <source>Coloring Tween</source>
         <translation type="unfinished">Farvelægger Tween</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="578"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="604"/>
         <source>Compound Tween</source>
         <translation type="unfinished">Sammensatte Tween</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="624"/>
         <source>Internal fill</source>
         <translation type="unfinished">Indvendig fill</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="601"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="743"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="775"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="816"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="871"/>
         <source>%1</source>
         <translation type="unfinished">%1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="851"/>
-        <source>Hand</source>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="437"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="631"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="946"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1496"/>
+        <source>Shift</source>
         <translation type="unfinished">Hånd</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="953"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="609"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1060"/>
         <source>Paint area actions</source>
         <translation type="unfinished">Tegne område handlinger</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="956"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1063"/>
         <source>Dynamic Background Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="961"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1068"/>
         <source>Frames Mode</source>
         <translation type="unfinished">Frame tilstand</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="962"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1069"/>
         <source>Static BG Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="963"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1070"/>
         <source>Dynamic BG Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="988"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1095"/>
         <source>Previous Frames</source>
         <translation type="unfinished">Forrige billeder</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1000"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1107"/>
         <source>Next Frames</source>
         <translation type="unfinished">Næste billeder</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1035"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1142"/>
         <source>Direction</source>
         <translation type="unfinished">Retning</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1038"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1145"/>
         <source>Left to Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1146"/>
         <source>Right to Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1040"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1147"/>
         <source>Top to Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1041"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1148"/>
         <source>Bottom to Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1044"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1151"/>
         <source>Shift Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1519"/>
         <source>Export Frame As</source>
         <translation type="unfinished">Eksporter frame som</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1414"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1520"/>
         <source>Images</source>
         <translation type="unfinished">Billeder</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
         <source>Frame has been exported successfully</source>
         <translation type="unfinished">Frame er eksporteret</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>Error</source>
         <translation type="unfinished">Fejl</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
         <source>Can&apos;t export frame as image</source>
         <translation type="unfinished">Kan ikke eksportere frame som billede</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>No cameras detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1668"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1797"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1870"/>
         <source>Frame %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2419,47 +2544,47 @@
 <context>
     <name>TupExportWidget</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="997"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1030"/>
         <source>Export to Video</source>
         <translation>Eksporter til video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1007"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1041"/>
         <source>Export to Video File</source>
         <translation>Eksporter til video fil</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1010"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1044"/>
         <source>Export to Images Array</source>
         <translation>Eksporter til Billed Array</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1013"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1047"/>
         <source>Export to Animated Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1029"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1063"/>
         <source>Post Animation in Tupitube</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1058"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1097"/>
         <source>Video Formats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1060"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1099"/>
         <source>Open Video Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1062"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1101"/>
         <source>Image Array</source>
         <translation type="unfinished">Billed-rækker</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1064"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1103"/>
         <source>Animated Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2467,29 +2592,29 @@
 <context>
     <name>TupExportWizard</name>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="62"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="54"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="63"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="55"/>
         <source>Back</source>
         <translation type="unfinished">Tilbage</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="64"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="56"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="149"/>
         <source>Next</source>
         <translation type="unfinished">Næste</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="187"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="214"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="179"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="206"/>
         <source>Export</source>
         <translation type="unfinished">Eksporter</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="216"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="208"/>
         <source>Post</source>
         <translation type="unfinished">Send</translation>
     </message>
@@ -2497,21 +2622,21 @@
 <context>
     <name>TupExposureDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="57"/>
         <source>Exposure Sheet</source>
         <translation type="unfinished">X-sheet/Fotoliste</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="132"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="149"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="273"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="288"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="264"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="279"/>
         <source>Scene</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="144"/>
         <source>Work Team</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2519,15 +2644,15 @@
 <context>
     <name>TupExposureScene</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="70"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="65"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="110"/>
         <source>Layer</source>
         <translation type="unfinished">Lag</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="77"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="72"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="154"/>
         <source>Frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2535,123 +2660,123 @@
 <context>
     <name>TupExposureSheet</name>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="71"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="60"/>
         <source>Exposure Sheet</source>
         <translation>X-sheet/Fotoliste</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="96"/>
         <source>actions</source>
         <translation>handlinger</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="106"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="100"/>
         <source>Insert</source>
         <translation>Indsæt</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="108"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="166"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
         <source>1 frame</source>
         <translation>1 frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="113"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="167"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="107"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="161"/>
         <source>5 frames</source>
         <translation>5 frames</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="118"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="112"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="162"/>
         <source>10 frames</source>
         <translation>10 frames</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="123"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="117"/>
         <source>20 frames</source>
         <translation type="unfinished">10 frames {20 ?}</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="128"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="122"/>
         <source>50 frames</source>
         <translation type="unfinished">10 frames {50 ?}</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="133"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="127"/>
         <source>100 frames</source>
         <translation type="unfinished">10 frames {100 ?}</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="140"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="134"/>
         <source>Remove frame</source>
         <translation>Fjern frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="145"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="139"/>
         <source>Clear frame</source>
         <translation>Rens frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="150"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="144"/>
         <source>Lock/Unlock frame</source>
         <translation>Lås/Løs frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="155"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="149"/>
         <source>Copy frame</source>
         <translation>Kopier frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="154"/>
         <source>Paste in frame</source>
         <translation>Indsæt i frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="165"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="159"/>
         <source>Expand</source>
         <translation>Udvid</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
         <source>Copy TL forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="174"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="169"/>
         <source>1 time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="175"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="170"/>
         <source>2 times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="176"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="171"/>
         <source>3 times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="177"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="172"/>
         <source>4 times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="178"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
         <source>5 times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="239"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="632"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="247"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="671"/>
         <source>Layer %1</source>
         <translation>Lag %1</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="246"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="474"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="635"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="254"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="501"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="674"/>
         <source>Frame %1</source>
         <translation>Billed %1</translation>
     </message>
@@ -2659,33 +2784,33 @@
 <context>
     <name>TupGradientCreator</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Linear</source>
         <translation>Lineær</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Radial</source>
         <translation>Radial</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Conical</source>
         <translation>Konisk</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Pad</source>
         <translatorcomment>What is this...?</translatorcomment>
         <translation>Pad</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Reflect</source>
         <translation>Reflekter</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Repeat</source>
         <translation>Gentag</translation>
     </message>
@@ -2693,34 +2818,34 @@
 <context>
     <name>TupGraphicsScene</name>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="154"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="155"/>
         <source>PolyLine</source>
         <translation>PolyLine</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="533"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="727"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="583"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="771"/>
         <source>/Step: 0</source>
         <translation>/Trin: 0</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="610"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="759"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="653"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="803"/>
         <source>/Step: </source>
         <translation>/Trin: </translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1108"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1212"/>
         <source>Line</source>
         <translation>Linie</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2728,7 +2853,7 @@
 <context>
     <name>TupHelpBrowser</name>
     <message>
-        <location filename="../src/components/help/tuphelpbrowser.cpp" line="50"/>
+        <location filename="../src/components/help/tuphelpbrowser.cpp" line="42"/>
         <source>Help</source>
         <translation>Hjælp</translation>
     </message>
@@ -2736,7 +2861,7 @@
 <context>
     <name>TupHelpWidget</name>
     <message>
-        <location filename="../src/components/help/tuphelpwidget.cpp" line="48"/>
+        <location filename="../src/components/help/tuphelpwidget.cpp" line="40"/>
         <source>Help</source>
         <translation>Hjælp</translation>
     </message>
@@ -2744,59 +2869,59 @@
 <context>
     <name>TupImageDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="48"/>
         <source>Image Properties</source>
         <translation>Billed egenskaber</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="53"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="67"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="54"/>
         <source>My Picture</source>
         <translation>Mit billede</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="73"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="60"/>
         <source>Topics</source>
         <translation type="unfinished">Emner</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation>#emne1 #emne2 #emne3</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="79"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="72"/>
         <source>Just a little taste of my style :)</source>
         <translation>Bare en smagsprøve på min stil :)</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="89"/>
         <source>Post Image</source>
         <translation>Send billede</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="124"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="130"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="128"/>
         <source>Set a title for the picture here!</source>
         <translation>Skriv billedets titel her!</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="139"/>
         <source>Set some topic tags for the picture here!</source>
         <translation>Skriv nogle emne-tags for billedet her!</translation>
     </message>
@@ -2804,55 +2929,55 @@
 <context>
     <name>TupInfoWidget</name>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="124"/>
         <source>Currency Converter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="128"/>
         <source>Currency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="227"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="244"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="228"/>
         <source>%1</source>
         <translation type="unfinished">%1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="143"/>
         <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="168"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="152"/>
         <source>Update data every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>1</source>
         <translation type="unfinished">1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
         <source>minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="262"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="246"/>
         <source>Link file to Object</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="263"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="247"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2860,65 +2985,67 @@
 <context>
     <name>TupItemManager</name>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="74"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="70"/>
         <source>New folder %1</source>
         <translation type="unfinished">Ny mappe %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="231"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="343"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="229"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="350"/>
         <source>Options</source>
         <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="234"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="242"/>
         <source>Edit with Inkscape</source>
         <translation type="unfinished">Rediger med Inkscape</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="244"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="252"/>
         <source>Edit with Gimp</source>
         <translation type="unfinished">Rediger med Gimp</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="254"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="262"/>
         <source>Edit with Krita</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="264"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="272"/>
         <source>Edit with MyPaint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="275"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="283"/>
         <source>Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="278"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="286"/>
         <source>Export</source>
         <translation type="unfinished">Eksporter</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="281"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="232"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="289"/>
         <source>Rename</source>
         <translation type="unfinished">Omdøb</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="284"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="235"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="292"/>
         <source>Delete</source>
         <translation type="unfinished">Slet</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="295"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="347"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="354"/>
         <source>Create new raster item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="355"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="309"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="359"/>
         <source>Create new svg item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2926,7 +3053,7 @@
 <context>
     <name>TupItemPreview</name>
     <message>
-        <location filename="../src/libtupi/tupitempreview.cpp" line="64"/>
+        <location filename="../src/libtupi/tupitempreview.cpp" line="56"/>
         <source>Library is empty :(</source>
         <translation>Biblioteket er tomt :(</translation>
     </message>
@@ -2934,40 +3061,45 @@
 <context>
     <name>TupItemTweener</name>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="551"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="610"/>
         <source>Position Tween</source>
         <translation>Positions Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="554"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="613"/>
         <source>Rotation Tween</source>
         <translation>Rotations Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="557"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="616"/>
         <source>Scale Tween</source>
         <translation>Skalerings Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="560"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="619"/>
         <source>Shear Tween</source>
         <translation>Forskydnings Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="563"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="622"/>
         <source>Opacity Tween</source>
         <translation>Gennemsigtigheds Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="566"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="625"/>
         <source>Coloring Tween</source>
         <translation>Farvelægger Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="569"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="628"/>
         <source>Compound Tween</source>
         <translation>Sammensatte Tween</translation>
     </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="631"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupLayer</name>
@@ -2980,7 +3112,7 @@
 <context>
     <name>TupLayerIndex</name>
     <message>
-        <location filename="../src/components/timeline/tuplayerindex.cpp" line="178"/>
+        <location filename="../src/components/timeline/tuplayerindex.cpp" line="169"/>
         <source>Layers</source>
         <translation>Lag</translation>
     </message>
@@ -2988,17 +3120,17 @@
 <context>
     <name>TupLibraryDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="58"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="47"/>
         <source>Library Object</source>
         <translation>Biblioteks objekt</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="92"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="81"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="84"/>
         <source>Item %1</source>
         <translation>Element %1</translation>
     </message>
@@ -3006,238 +3138,238 @@
 <context>
     <name>TupLibraryWidget</name>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="125"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="95"/>
         <source>Library</source>
         <translation>Bibliotek</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="189"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1327"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="162"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1445"/>
         <source>Image</source>
         <translation>Billede</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="191"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1332"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="164"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1450"/>
         <source>Image Array</source>
         <translation>Billed-række</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="190"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="163"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1455"/>
         <source>Svg File</source>
         <translation>Svg Fil</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="192"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1342"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="165"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1460"/>
         <source>Svg Array</source>
         <translation>Svg række</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="198"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="171"/>
         <source>Add an object to library</source>
         <translation>Tilføj objekt til bibliotek</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="206"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="179"/>
         <source>Adds a folder to the object&apos;s list</source>
         <translation>Tilføjer mappe til objektets liste</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="213"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="186"/>
         <source>Inserts the selected object into the drawing area</source>
         <translation>Indsætter det valgte objekt på tegneområdet</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="278"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1374"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="269"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1493"/>
         <source>Directory</source>
         <translation>Mappe</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="289"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="286"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="339"/>
         <source>No preview available</source>
         <translation>Forhåndsvisning ikke tilgængelig</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="518"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="550"/>
         <source>Export object...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Info</source>
         <translation type="unfinished">Info</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Item exported successfully!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
         <source>Couldn&apos;t create images directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
         <source>Couldn&apos;t create vector directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="708"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="781"/>
         <source>Tupi library item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="505"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="753"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="836"/>
         <source>Images</source>
         <translation>Billeder</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="752"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="835"/>
         <source>Import images...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="787"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="928"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1062"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="876"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1026"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1159"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="789"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="878"/>
         <source>Image is bigger than workspace.</source>
         <translation>Billede er større end arbejdsområde.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="790"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="879"/>
         <source>Do you want to resize it?</source>
         <translation>Ønsker du at formindske det?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Cannot open file: %1</source>
         <translation>Kan ikke åbne fil: %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="839"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="929"/>
         <source>Import SVG files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="840"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="930"/>
         <source>Vector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="887"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="986"/>
         <source>Choose the images directory...</source>
         <translation>Vælg billed mappe...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="911"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
         <source>Image files found: %1.</source>
         <translation>Billed filer fundet: %1.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="921"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1019"/>
         <source>Files are too big, so they will be resized.</source>
         <translation>Filerne er for store og vil blive formindsket.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="922"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1020"/>
         <source>Note: This task can take a while.</source>
         <translation>Bemærk: Denne opgave kan tage et stykke tid.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="931"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1065"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1029"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1162"/>
         <source>Do you want to continue?</source>
         <translation>Ønsker du at fortsætte?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="953"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1051"/>
         <source>Loading images...</source>
         <translation>Henter billeder...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1001"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1118"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1099"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1213"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1107"/>
         <source>Loading image #%1</source>
         <translation>Henter billede #%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR!</source>
         <translation>FEJL!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR: Can&apos;t open file %1. Please, check file permissions and try again.</source>
         <translation>FEJL: Kan ikke åbne fil %1. Kontroller venligst fil-rettigheder og prøv igen.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
         <source>No image files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Ingen billed-filer fundet.&lt;br/&gt;Prøv venligst en anden mappe</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1033"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
         <source>Choose the SVG files directory...</source>
         <translation>Vælg SVG billed mappe...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1059"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1156"/>
         <source>%1 SVG files will be loaded.</source>
         <translation>%1 SVG fil bliver hentet.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1086"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1182"/>
         <source>Loading SVG files...</source>
         <translation>Henter SVG billeder...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1126"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1221"/>
         <source>Loading SVG file #%1</source>
         <translation>Henter SVG billed.#%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
         <source>No SVG files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Ingen SVG billed-filer fundet.&lt;br/&gt;Prøv venligst en anden mappe</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1149"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1244"/>
         <source>Import audio file...</source>
         <translation>Importer lydfil...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1150"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1245"/>
         <source>Sound file</source>
         <translation>Lyd fil</translation>
     </message>
@@ -3245,45 +3377,45 @@
 <context>
     <name>TupListProjectDialog</name>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="64"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="54"/>
         <source>Projects List from Server</source>
         <translation>Projekt liste fra server</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="89"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="79"/>
         <source>My works:</source>
         <translation>Mine arbejdeer:</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="90"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="80"/>
         <source>My contributions:</source>
         <translation>Mine tilføjelser:</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="126"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="116"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Author</source>
         <translation>Forfatter</translation>
     </message>
@@ -3291,522 +3423,557 @@
 <context>
     <name>TupMainWindow</name>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="108"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="581"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="111"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="635"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>Tupi: Open 2D Magic</source>
         <translation>Tupi: Open 2D Magic</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
         <source>[ by %1 | net mode ]</source>
         <translation>[ af %1 | net mode ]</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
         <source>Opening a new document...</source>
         <translation>Åbner et nyt dokument...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="263"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1135"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="306"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="273"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1218"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="277"/>
         <source>Animation</source>
         <translation>Animation</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="317"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="327"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="285"/>
         <source>Player</source>
         <translation>Afspiller</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; opened!</source>
         <translation>Projekt &lt;b&gt;%1&lt;/b&gt; åbnet!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="434"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="484"/>
         <source>Question</source>
         <translation>Spørgsmål</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="436"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="486"/>
         <source>The document has been modified.</source>
         <translation>Dokumentet er blevet ændret.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="487"/>
         <source>Do you want to save the project?</source>
         <translation>Ønsker du at gemme projektet?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="489"/>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="440"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="490"/>
         <source>Discard</source>
         <translation>Kassér</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="441"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="491"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>by</source>
         <translation>af</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="746"/>
         <source>Open Tupi project</source>
         <translation>Åbn Tupi projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="689"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1014"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1341"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="747"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1093"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1429"/>
         <source>Tupi Project Package (*.tup)</source>
         <translation>Tupi Projekt Pakke (*.tup)</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
         <source>Cannot open project!</source>
         <translation>Kan ikke åbne projekt!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Import Gimp palettes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Gimp Palette (*.gpl *.txt *.css)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
         <source>Gimp palette import was successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
         <source>Gimp palette import was unsuccessful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Tip of the day</source>
         <translation>Dagens Tip</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Show on start</source>
         <translation>Vis ved opstart</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Previous tip</source>
         <translation>Forrige tip</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Next tip</source>
         <translation>Næste tip</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1374"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1462"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1013"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1092"/>
         <source>Save Project As</source>
         <translation>Gem projekt som</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
         <source>Directory does not exist! Please, choose another path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation>Du har ikke tilladelse til at oprette denne fil. Vælg venligst enanden sti.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; saved</source>
         <translation>Projekt &lt;b&gt;%1&lt;/b&gt; gemt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
         <source>Cannot save the project!</source>
         <translation>Kan ikke gemme projekt!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1136"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1219"/>
         <source>New camera</source>
         <translation>Nyt kamera</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1340"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1428"/>
         <source>Import project package</source>
         <translation>Importer projekt pakke</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
         <source>Can&apos;t import project. File is empty!</source>
         <translation>Kan ikke importere projekt. Filen er tom!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
         <source>Can&apos;t save the project. File doesn&apos;t exist!</source>
         <translation>Kan ikke gemme projekt. Filen eksisterer ikke!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1369"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1457"/>
         <source>Fatal Error</source>
         <translation>Alvorlig Fejl</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1371"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1459"/>
         <source>The connection to the server has been lost.</source>
         <translation>Forbindelsen til serveren er væk.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1372"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1460"/>
         <source>Please, try to connect again in a while</source>
         <translation>Forsøg venligst at forbinde igen senere</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="70"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="64"/>
         <source>Shift+P</source>
         <translation>Shift+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="81"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="75"/>
         <source>Shift+B</source>
         <translation>Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="92"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="86"/>
         <source>Shift+L</source>
         <translation>Shift+L</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Bitmap</source>
         <translation>Bitmap</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Alt+B</source>
         <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Bitmap Array</source>
         <translation>Bitmap Række</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Alt+Shift+B</source>
         <translation>Alt+Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>SVG File</source>
         <translation>Svg Fil</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>SVG Array</source>
         <translation>SVG række</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>Alt+Shift+S</source>
         <translation>Alt+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="121"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="115"/>
         <source>Shift+C</source>
         <translation>Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="130"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="124"/>
         <source>Shift+E</source>
         <translation>Shift+E</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="140"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="139"/>
         <source>Shift+H</source>
         <translation>Shift+H</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="155"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="154"/>
         <source>Shift+T</source>
         <translation>Shift+T</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="165"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="164"/>
         <source>Shift+D</source>
         <translation>Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="196"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="195"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="204"/>
         <source>Recents</source>
         <translation>Seneste</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="243"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="225"/>
         <source>&amp;Edit</source>
         <translation>R&amp;ediger</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="257"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="235"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="280"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="252"/>
         <source>&amp;Window</source>
         <translation>&amp;Vindue</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="272"/>
         <source>Modules</source>
         <translation>Moduler</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="322"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="293"/>
         <source>Help</source>
         <translation>Hjælp</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="330"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
         <source>News</source>
         <translation>Nyheder</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="343"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>New project</source>
         <translation>Nyt projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="392"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="363"/>
         <source>Open new project</source>
         <translation>Åbn nyt projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Open project</source>
         <translation>Åbn projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="398"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="369"/>
         <source>Load existent project</source>
         <translation>Hent eksisterende projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="432"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="409"/>
         <source>Shift+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="544"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="413"/>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="415"/>
+        <source>Import Papagayo lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="526"/>
         <source>Actions Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="411"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Import Papagayo project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
+        <source>Papagayo project is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="382"/>
         <source>Save project</source>
         <translation>Gem projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="412"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="383"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="385"/>
         <source>Save current project in current location</source>
         <translation>Gem nuværende projekt på nuværende placering</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="416"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
         <source>Save project &amp;As...</source>
         <translation>Gem projekt so&amp;m...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="417"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="391"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="420"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="394"/>
         <source>Open dialog box to save current project in any location</source>
         <translation>Åbn boks for at gemme projekt andetsteds</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="423"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Cl&amp;ose project</source>
         <translation>Luk pr&amp;ojekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="424"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="426"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="403"/>
         <source>Close active project</source>
         <translation>Luk aktivt projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="431"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="408"/>
         <source>&amp;Import GIMP palettes</source>
         <translation>&amp;Importer GIMP paletter</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="433"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="410"/>
         <source>Import palettes</source>
         <translation>Importerer paletter</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>&amp;Export Project</source>
         <translation>&amp;Eksporter Projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="421"/>
         <source>Export project to several video formats</source>
         <translation>Eksporter projekt til forskellige video formater</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>E&amp;xit</source>
         <translation>&amp;Afslut</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="445"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="427"/>
         <source>Close application</source>
         <translation>Luk program</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="469"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="451"/>
         <source>Pr&amp;eferences...</source>
         <translation>Indstilling&amp;er...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="452"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="472"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="454"/>
         <source>Opens the preferences dialog box</source>
         <translation>Åbn instillinger boks</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>About Tupi</source>
         <translation>Om Tupi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>Ctrl+K</source>
         <translation>Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="685"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="666"/>
         <source>Undo</source>
         <translation>Fortryd</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="669"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="672"/>
         <source>Redo</source>
         <translation>Gendan</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="694"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="675"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
@@ -3814,61 +3981,61 @@
 <context>
     <name>TupNetProjectManagerHandler</name>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="111"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="80"/>
         <source>Communications</source>
         <translation>Kommunikation</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="115"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="84"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="120"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="89"/>
         <source>Notices</source>
         <translation>Noter</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="462"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="507"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
         <source>Unable to connect to server</source>
         <translation>Kan ikke forbinde til server</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="310"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="319"/>
         <source>Fatal Error</source>
         <translation>Alvorlig Fejl</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="312"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="321"/>
         <source>User &quot;%1&quot; is disabled.
 Please, contact the animation server admin to get access.</source>
         <translation>Bruger &quot;%1&quot; is deaktiveret.
 Kontakt venligst animation serverens admin, for at få adgang.</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="491"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="536"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
         <source>User has no available projects in the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="460"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="505"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="484"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="529"/>
         <source>Notice</source>
         <translation>Bemærk</translation>
     </message>
@@ -3876,61 +4043,61 @@
 <context>
     <name>TupNewItemDialog</name>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="76"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="66"/>
         <source>Create new raster item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="83"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="192"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="196"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="215"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="219"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="73"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="182"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="186"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="205"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="209"/>
         <source>Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="84"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="74"/>
         <source>White</source>
         <translation type="unfinished">Hvid</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="85"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="75"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="97"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="87"/>
         <source>Create new vector item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="123"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="134"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="124"/>
         <source>&amp;Extension:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="135"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="125"/>
         <source>&amp;Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="136"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="126"/>
         <source>&amp;Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="139"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="129"/>
         <source>&amp;Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="143"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
         <source>&amp;Open it with:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3938,175 +4105,175 @@
 <context>
     <name>TupNewProject</name>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="84"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="75"/>
         <source>Create a new project</source>
         <translation>Opret nyt projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="90"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="81"/>
         <source>Project Name</source>
         <translation>Projekt navn</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="94"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="85"/>
         <source>my_project</source>
         <translation>mit_projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="97"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="88"/>
         <source>Author</source>
         <translation>Forfatter</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="101"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="92"/>
         <source>Your name</source>
         <translation>Dit Navn</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="104"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="95"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="99"/>
         <source>Just for fun!</source>
         <translation>Kun for sjov!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="103"/>
         <source>Presets</source>
         <translation>Forudindstillinger</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="115"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="106"/>
         <source>Free format</source>
         <translation>Frit format</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="116"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="107"/>
         <source>520x380 - 24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="117"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
         <source>640x480 - 24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="118"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="109"/>
         <source>480p (PAL DV/DVD) - 25</source>
         <translation>480p (PAL DV/DVD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="110"/>
         <source>576p (PAL DV/DVD) - 25</source>
         <translation>576p (PAL DV/DVD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="120"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="111"/>
         <source>720p (HD) - 25</source>
         <translation>720p (HD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="121"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
         <source>1280p (Full HD) - 25</source>
         <translation>1280p (Full HD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="128"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="126"/>
         <source>Background</source>
         <translation>Baggrund</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="136"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="127"/>
         <source>Click here to change background color</source>
         <translation>Klik her for at ændre baggrundsfarve</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="144"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
         <source>FPS</source>
         <translation>BPS</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="154"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="145"/>
         <source>Dimension</source>
         <translation>Dimensioner</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="170"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="161"/>
         <source>Tupitube project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="176"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="167"/>
         <source>Project info</source>
         <translation>Projekt info</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="235"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="226"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Username</source>
         <translation>Brugernavn</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="242"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="233"/>
         <source>Store password</source>
         <translation>Gem password</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
         <source>Please, set a name for the project</source>
         <translation>Angiv venligst navn til projektet</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
         <source>Please, fill in your username</source>
         <translation>Indtast venligst brugernavn</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
         <source>Please, fill in your password</source>
         <translation>Indtast venligst password</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Please, fill in the server name or IP</source>
         <translation>Indtast venligst server-navn eller IP</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="334"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="325"/>
         <source>White</source>
         <translation>Hvid</translation>
     </message>
@@ -4114,7 +4281,7 @@
 <context>
     <name>TupNotice</name>
     <message>
-        <location filename="../src/net/tupnotice.cpp" line="65"/>
+        <location filename="../src/net/tupnotice.cpp" line="58"/>
         <source>Notices</source>
         <translation>Noter</translation>
     </message>
@@ -4122,27 +4289,27 @@
 <context>
     <name>TupOnionOpacityDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="50"/>
         <source>Onion Paper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="103"/>
         <source>-0.05</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="107"/>
         <source>-0.01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="119"/>
         <source>+0.01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="123"/>
         <source>+0.05</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4150,162 +4317,163 @@
 <context>
     <name>TupPaintArea</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="109"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1159"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1378"/>
         <source>Pencil</source>
         <translation>Blyant</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="166"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <source>Nodes Selection</source>
         <translation>Vælg Linie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="181"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="564"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1160"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="182"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="644"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1379"/>
         <source>Object Selection</source>
         <translation>Vælg objekt</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="196"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="199"/>
         <source>Drawing area</source>
         <translation>Tegne område</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Cut</source>
         <translation>Klip</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Copy</source>
         <translation>Kopier</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Paste</source>
         <translation>Indsæt</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
         <source>Paste in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
         <source>next 5 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="207"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
         <source>next 10 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="211"/>
         <source>next 20 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="212"/>
         <source>next 50 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="213"/>
         <source>next 100 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="220"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="235"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="238"/>
         <source>Add to library...</source>
         <translation>Tilføj til bibliotek...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="174"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="521"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1145"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="591"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1364"/>
         <source>PolyLine</source>
         <translation>PolyLine</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
         <source>Send</source>
         <translation type="unfinished">Send</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
         <source>To back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="227"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="230"/>
         <source>To front</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="228"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="231"/>
         <source>One level to back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="232"/>
         <source>One level to front</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>No items selected</source>
         <translation>Ingen elementer valgt</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1151"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1370"/>
         <source>Rectangle</source>
         <translation>Rektangel</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1152"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1371"/>
         <source>Ellipse</source>
         <translation>Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1153"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1372"/>
         <source>Line</source>
         <translation>Linie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="922"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1211"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1085"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1430"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
@@ -4313,27 +4481,22 @@
 <context>
     <name>TupPaintAreaBase</name>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="201"/>
-        <source>OpenGL isn&apos;t supported</source>
-        <translation>OpenGL er ikke understøttet</translation>
-    </message>
-    <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="372"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="393"/>
         <source>No Scene!</source>
         <translation>Ingen scene!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="379"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="400"/>
         <source>Locked!</source>
         <translation>Låst!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="448"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="469"/>
         <source>No Frames!</source>
         <translation>Ingen frames!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="451"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="472"/>
         <source>No Layers!</source>
         <translation>Ingen lag!</translation>
     </message>
@@ -4341,27 +4504,27 @@
 <context>
     <name>TupPaintAreaConfig</name>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="67"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="59"/>
         <source>Grid color</source>
         <translation>Gitter farve</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="73"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="65"/>
         <source>Grid separation</source>
         <translation>Gitter adskillelse</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="82"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="74"/>
         <source>Background color</source>
         <translation>Baggrundsfarve</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="88"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="80"/>
         <source>Onion skin color</source>
         <translation>Gennemslag farve</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="94"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="86"/>
         <source>Onion skin background </source>
         <translation>Gennemslag baggrund </translation>
     </message>
@@ -4369,82 +4532,82 @@
 <context>
     <name>TupPaintAreaStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="93"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="76"/>
         <source>Action Safe Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="77"/>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="85"/>
         <source>Show grid</source>
         <translation type="unfinished">Vis gitter</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="103"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="86"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
         <source>Full screen</source>
         <translation type="unfinished">Fuld skærm</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="95"/>
         <source>F11</source>
         <translation type="unfinished">F11</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="106"/>
         <source>Current Frame</source>
         <translation>Nuværende frame</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="113"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="127"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="164"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="147"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="159"/>
         <source>Rotate Workspace</source>
         <translation>Roter arbejdsområde</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="182"/>
         <source>Antialiasing</source>
         <translation>Antialiasing/Udjævning</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="191"/>
         <source>Background Color</source>
         <translation>Baggrundsfarve</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="192"/>
         <source>Click here to change background color</source>
         <translation>Klik her for at ændre baggrundsfarve</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="215"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="198"/>
         <source>Brush Color</source>
         <translation>Pensel Farve</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="216"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
         <source>Click here to change brush color</source>
         <translation>Klik her for at ændre penselfarve</translation>
     </message>
@@ -4452,27 +4615,27 @@
 <context>
     <name>TupPenDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="60"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="50"/>
         <source>Pen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="102"/>
         <source>-5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="116"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="106"/>
         <source>-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="114"/>
         <source>+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="128"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="118"/>
         <source>+5</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4480,83 +4643,83 @@
 <context>
     <name>TupPenWidget</name>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="60"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="52"/>
         <source>Pen Properties</source>
         <translation>Pen egenskaber</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="71"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="63"/>
         <source>Thickness</source>
         <translation>Tykkelse</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="84"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="76"/>
         <source>Dashes</source>
         <translation>Streger</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="90"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="83"/>
         <source>Solid</source>
         <translation>Ubrudt</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="85"/>
         <source>Dash</source>
         <translation>Streg</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="92"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="87"/>
         <source>Dot</source>
         <translation>Prik</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="93"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="89"/>
         <source>Dash dot</source>
         <translation>Streg prik</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="94"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
         <source>Dash dot dot</source>
         <translation>Streg prik prik</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="103"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="108"/>
         <source>Cap</source>
         <translation>Spids</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="109"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="114"/>
         <source>Flat</source>
         <translation>Flad</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="110"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="115"/>
         <source>Square</source>
         <translation>Kvadrat</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="111"/>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="127"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="116"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="132"/>
         <source>Round</source>
         <translation>Rund</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="120"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
         <source>Join</source>
         <translation>Join/Tilslut</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="130"/>
         <source>Miter</source>
         <translation>Miter</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="126"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="131"/>
         <source>Bevel</source>
         <translation>Bevel</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="136"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="141"/>
         <source>Brush</source>
         <translation>Pensel</translation>
     </message>
@@ -4564,27 +4727,27 @@
 <context>
     <name>TupPreferences</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="202"/>
         <source>Application TupPreferences</source>
         <translation>Applikation TupIndstillinger</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
         <source>General</source>
         <translation>Alment</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="217"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
         <source>Workspace</source>
         <translation>Arbejdsområde</translation>
     </message>
@@ -4592,27 +4755,27 @@
 <context>
     <name>TupPreferences::GeneralPage</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Tupi Home</source>
         <translation>Tupi Home</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Cache</source>
         <translation>Cache</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Browser</source>
         <translation>Browser</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Open last project</source>
         <translation>Åbn seneste projekt</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Auto save (minutes)</source>
         <translation>Gem automatisk (minutter)</translation>
     </message>
@@ -4620,126 +4783,126 @@
 <context>
     <name>TupProjectActionBar</name>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="108"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="97"/>
         <source>Insert a layer</source>
         <translation>Indsæt lag</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="98"/>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="120"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
         <source>Remove the layer</source>
         <translation>Fjern lag</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="110"/>
         <source>F6</source>
         <translation>F6</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
         <source>Move layer up</source>
         <translation>Flyt lag op</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="122"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="197"/>
         <source>F9</source>
         <translation>F9</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="143"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
         <source>Move layer down</source>
         <translation>Flyt lag ned</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="144"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="219"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
         <source>F10</source>
         <translation>F10</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="148"/>
         <source>Insert frame</source>
         <translation>Indsæt frame</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="170"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
         <source>Remove the frame</source>
         <translation>Fjern frame</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="188"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="177"/>
         <source>Move frame up</source>
         <translation>Flyt frame op</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="189"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="178"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="196"/>
         <source>Move frame down</source>
         <translation>Flyt frame ned</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
         <source>Lock frame</source>
         <translation>Lås frame</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="229"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
         <source>Lock layer</source>
         <translation>Lås lag</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="239"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="228"/>
         <source>Insert a scene</source>
         <translation>Indsæt scene</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="249"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="238"/>
         <source>Remove the scene</source>
         <translation>Fjern scene</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="259"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="248"/>
         <source>Move scene up</source>
         <translation>Flyt scene op</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="269"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="258"/>
         <source>Move scene down</source>
         <translation>Flyt scene ned</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="279"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="268"/>
         <source>Lock scene</source>
         <translation>Lås scene</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
         <source>Do you want to remove this frame?</source>
         <translation>Ønsker du at fjerne denne frame?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Remove?</source>
         <translation>Fjern?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
         <source>Do you want to remove this layer?</source>
         <translation>Ønsker du at fjerne dette lag?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Do you want to remove this scene?</source>
         <translation>Ønsker du at fjerne denne scene?</translation>
     </message>
@@ -4747,17 +4910,17 @@
 <context>
     <name>TupProjectManager</name>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="190"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="207"/>
         <source>Scene %1</source>
         <translation>Scene %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="193"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="210"/>
         <source>Layer %1</source>
         <translation>Lag %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="196"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="213"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
@@ -4765,17 +4928,17 @@
 <context>
     <name>TupScene</name>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="185"/>
+        <location filename="../src/store/tupscene.cpp" line="190"/>
         <source>Sound layer %1</source>
         <translation>Lyd lag %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="634"/>
+        <location filename="../src/store/tupscene.cpp" line="648"/>
         <source>Layer %1</source>
         <translation>Lag %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="635"/>
+        <location filename="../src/store/tupscene.cpp" line="649"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
@@ -4783,7 +4946,7 @@
 <context>
     <name>TupSceneTabWidget</name>
     <message>
-        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="84"/>
+        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="77"/>
         <source>Layers</source>
         <translation>Lag</translation>
     </message>
@@ -4791,29 +4954,29 @@
 <context>
     <name>TupScenesWidget</name>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="69"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="57"/>
         <source>Scenes Manager</source>
         <translation>Scene Manager</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="101"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="94"/>
         <source>Filter here...</source>
         <translation>Filter her...</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="154"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="158"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="185"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="155"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="159"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="190"/>
         <source>Scene %1</source>
         <translation>Scene %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="164"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="165"/>
         <source>Layer %1</source>
         <translation>Lag %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="167"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="168"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
@@ -4821,7 +4984,7 @@
 <context>
     <name>TupScreen</name>
     <message>
-        <location filename="../src/components/animation/tupscreen.cpp" line="421"/>
+        <location filename="../src/components/animation/tupscreen.cpp" line="482"/>
         <source>Rendering...</source>
         <translation type="unfinished">Rendering...</translation>
     </message>
@@ -4829,7 +4992,7 @@
 <context>
     <name>TupSplash</name>
     <message>
-        <location filename="../src/shell/tupsplash.cpp" line="55"/>
+        <location filename="../src/shell/tupsplash.cpp" line="53"/>
         <source>Version </source>
         <translation>Version </translation>
     </message>
@@ -4837,137 +5000,137 @@
 <context>
     <name>TupStoryBoardDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="117"/>
         <source>Storyboard Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="158"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="128"/>
         <source>&amp;PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="129"/>
         <source>Export as PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="132"/>
         <source>&amp;HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="133"/>
         <source>Export as HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="167"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="137"/>
         <source>Close</source>
         <translation type="unfinished">Luk</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="146"/>
         <source>&amp;Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="232"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="202"/>
         <source>Storyboard General Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="299"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="269"/>
         <source>Title</source>
         <translation type="unfinished">Titel</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="242"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="212"/>
         <source>Author</source>
         <translation type="unfinished">Forfatter</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="247"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="217"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="266"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
         <source>Topics</source>
         <translation type="unfinished">Emner</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="295"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="265"/>
         <source>Scene Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="304"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="274"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="309"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="279"/>
         <source>Description</source>
         <translation type="unfinished">Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="344"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="364"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="314"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="334"/>
         <source>Cover</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="358"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="328"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="411"/>
         <source>Storyboard</source>
         <translation type="unfinished">Storyboard</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="390"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="360"/>
         <source>Scene</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="404"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="374"/>
         <source>Scene No %1 - Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="559"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="570"/>
         <source>Choose a directory...</source>
         <translation type="unfinished">Vælg en mappe...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Info</source>
         <translation type="unfinished">Info</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Storyboard exported successfully!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>Save PDF file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>PDF file (*.pdf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="684"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="700"/>
         <source>PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="686"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="702"/>
         <source>Html</source>
         <translation type="unfinished">Html</translation>
     </message>
@@ -4975,27 +5138,27 @@
 <context>
     <name>TupSymbolEditor</name>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="85"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="74"/>
         <source>Symbol editor</source>
         <translation>Symbol editor</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="95"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="84"/>
         <source>Brushes</source>
         <translation>Pensler</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="98"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="87"/>
         <source>Selection</source>
         <translation>Valgte</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="101"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="90"/>
         <source>Fill</source>
         <translation>Fill</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="104"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="93"/>
         <source>View</source>
         <translation>Se</translation>
     </message>
@@ -5003,138 +5166,138 @@
 <context>
     <name>TupThemeSelector</name>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="75"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="73"/>
         <source>General</source>
         <translation>Alment</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Base</source>
         <translation>Base</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Foreground</source>
         <translation>Forgrund</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Background</source>
         <translation>Baggrund</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button</source>
         <translation>Knap</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button Text</source>
         <translation>Knap-tekst</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="103"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="101"/>
         <source>Effects</source>
         <translation>Effekter</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Light</source>
         <translation>Lys</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Midlight</source>
         <translation>Mellemlys</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Dark</source>
         <translation>Mørk</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Mid</source>
         <translation>Mellem</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="129"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="127"/>
         <source>Selections</source>
         <translation>Valgte</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlight</source>
         <translation>Fremhæv</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlighted Text</source>
         <translation>Fremhævet tekst</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="150"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="148"/>
         <source>Text effects</source>
         <translation>Tekst effekter</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Bright Text</source>
         <translation>Lys tekst</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link</source>
         <translation>Link</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link Visited</source>
         <translation>Besøgt link</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="171"/>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="169"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Schema</source>
         <translation>Skema</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Owner</source>
         <translation>Ejer</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="183"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="182"/>
         <source>Save schema</source>
         <translation>Gem skema</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="190"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="189"/>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="194"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="193"/>
         <source>Use this colors</source>
         <translation>Brug disse farver</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Please choose a theme name</source>
         <translation>Vælg venligst et tema navn</translation>
     </message>
@@ -5142,25 +5305,25 @@
 <context>
     <name>TupTimeLine</name>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="75"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="60"/>
         <source>Time Line</source>
         <translation>Tidslinie</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="461"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="471"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="543"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="549"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="476"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="486"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="558"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="564"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="538"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="553"/>
         <source>Layer %1</source>
         <translation>Lag %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="598"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="613"/>
         <source>Scene %1</source>
         <translation>Scene %1</translation>
     </message>
@@ -5168,8 +5331,8 @@
 <context>
     <name>TupToolStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="52"/>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="55"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="46"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="49"/>
         <source>Current Tool</source>
         <translation>Nuværende Værktøj</translation>
     </message>
@@ -5177,60 +5340,88 @@
 <context>
     <name>TupToolsDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="59"/>
         <source>Pencil</source>
         <translation type="unfinished">Blyant</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="67"/>
         <source>Ink</source>
         <translation type="unfinished">Ink</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="82"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="75"/>
         <source>Polyline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="83"/>
         <source>Ellipse</source>
         <translation type="unfinished">Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="91"/>
         <source>Rectangle</source>
         <translation type="unfinished">Rektangel</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="106"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="99"/>
         <source>Object Selection</source>
         <translation type="unfinished">Vælg objekt</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="115"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="108"/>
+        <source>Nodes Selection</source>
         <translation type="unfinished">Vælg Linie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="116"/>
         <source>Color Palette</source>
         <translation type="unfinished">Farve Palet</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="124"/>
         <source>Pen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="132"/>
         <source>Opacity Value</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TupTwitter</name>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="270"/>
+        <source>Latest version</source>
+        <translation type="unfinished">Seneste version</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="271"/>
+        <source>Revision</source>
+        <translation type="unfinished">Revision</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="272"/>
+        <source>Code Name</source>
+        <translation type="unfinished">Kode navn</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="275"/>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="279"/>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupTwitterWidget</name>
     <message>
-        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="52"/>
+        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="47"/>
         <source>News!</source>
         <translation>Nyheder!</translation>
     </message>
@@ -5238,32 +5429,32 @@
 <context>
     <name>TupViewColorCells</name>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="109"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="111"/>
         <source>Default Palette</source>
         <translation>Standard Palette</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="118"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="120"/>
         <source>Named Colors</source>
         <translation>Navngivne farver</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="125"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="127"/>
         <source>Custom Color Palette</source>
         <translation>Tilpasset Farve Palet</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="130"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="132"/>
         <source>Custom Gradient Palette</source>
         <translation>Tilpasset Graduering Palette</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="342"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="373"/>
         <source>Add Color</source>
         <translation>Tilføj farve</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="349"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="380"/>
         <source>Remove Color</source>
         <translation>Fjern farve</translation>
     </message>
@@ -5271,88 +5462,40 @@
 <context>
     <name>TupWebHunter</name>
     <message>
-        <location filename="../src/libbase/tupwebhunter.cpp" line="108"/>
+        <location filename="../src/libbase/tupwebhunter.cpp" line="101"/>
         <source>Information Temporarily Unavailable</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Tupwitter</name>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Latest version</source>
-        <translation type="unfinished">Seneste version</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Revision</source>
-        <translation type="unfinished">Revision</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Code Name</source>
-        <translation type="unfinished">Kode navn</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="333"/>
-        <source>Update here!</source>
-        <translation type="unfinished">Opdater her!</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="341"/>
-        <source>This is what&apos;s happening</source>
-        <translation type="unfinished">Dette sker</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="356"/>
-        <source>Name</source>
-        <translation type="unfinished">Navn</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="357"/>
-        <source>Description</source>
-        <translation type="unfinished">Beskrivelse</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="358"/>
-        <source>Website</source>
-        <translation type="unfinished">Website</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="359"/>
-        <source>Followers</source>
-        <translation type="unfinished">Følgere</translation>
-    </message>
-</context>
-<context>
     <name>TweenManager</name>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="66"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="56"/>
         <source>Create a new Tween</source>
         <translation>Opret ny Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Tween name already exists!</source>
         <translation>Tween navn eksisterer allerede!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="189"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="179"/>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="191"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="181"/>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="194"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="184"/>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
@@ -5360,161 +5503,161 @@
 <context>
     <name>Tweener</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="130"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="260"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="264"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="101"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="239"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="243"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="527"/>
         <source>Coloring Tween</source>
         <translation>Farvelægger Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
         <source>Coloring Tween can&apos;t be applied to raster images</source>
         <translation>Farvelægger Tween, kan ikke udføres på bitmap billeder</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
         <source>Coloring Tween can&apos;t be applied to SVG files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="262"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="241"/>
         <source>Shift+C</source>
         <translation>Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Tween name is missing!</source>
         <translation>Tween navn mangler!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="528"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="614"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="481"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="647"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="525"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="505"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="619"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="480"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="654"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="523"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="540"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Tween %1 applied!</source>
         <translation>Tween %1 anvendes!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="156"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="373"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="377"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="759"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="144"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="379"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="383"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="758"/>
         <source>Compound Tween</source>
         <translation>Sammensatte Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="375"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="381"/>
         <source>Shift+X</source>
         <translation>Shift+X</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="126"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="227"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="231"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="503"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="117"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="230"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="502"/>
         <source>Opacity Tween</source>
         <translation>Gennemsigtighed Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="229"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="228"/>
         <source>Shift+O</source>
         <translation>Shift+O</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="169"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="362"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="752"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="161"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="359"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="363"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="768"/>
         <source>Position Tween</source>
         <translation>Position Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="360"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="361"/>
         <source>Shift+W</source>
         <translation>Shift+W</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="140"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="253"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="257"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="134"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="257"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="261"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="555"/>
         <source>Rotation Tween</source>
         <translation>Roterende Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="255"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="259"/>
         <source>Shift+R</source>
         <translation>Shift+R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="250"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="546"/>
         <source>Scale Tween</source>
         <translation>Skaler Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="252"/>
         <source>Shift+S</source>
         <translation>Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="555"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="133"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="256"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="260"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="562"/>
         <source>Shear Tween</source>
         <translation>Forskyd Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="258"/>
         <source>Shift+H</source>
         <translation>Shift+H</translation>
     </message>
@@ -5522,88 +5665,88 @@
 <context>
     <name>TweenerPanel</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="84"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="127"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="119"/>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="128"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="120"/>
         <source>Select object</source>
         <translation>Vælg objekt</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="129"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="121"/>
         <source>Set Tweeners</source>
         <translation>Sæt Tweeners</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="153"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="145"/>
         <source>Tweeners</source>
         <translation>Tweeners</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Position</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Rotation</source>
         <translation>Rotation</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Scale</source>
         <translation>Skalering</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Shear</source>
         <translation>Forskyd</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Opacity</source>
         <translation>Gennemsigtighed</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Coloring</source>
         <translation>Farvelægning</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="283"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="275"/>
         <source>Save Tween</source>
         <translation>Gem Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="285"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="277"/>
         <source>Cancel Tween</source>
         <translation>Annuler Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="377"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="369"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
         <source>Select objects for Tweening first!</source>
         <translation>Vælg objekt at Tweene først!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="429"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="421"/>
         <source>Update Tween</source>
         <translation>Opdater Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="431"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="423"/>
         <source>Close Tween properties</source>
         <translation>Luk Tween egenskaber</translation>
     </message>
@@ -5611,32 +5754,32 @@
 <context>
     <name>TweenerTable</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Position</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Rotation</source>
         <translation>Rotation</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Scale</source>
         <translation>Skalering</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Shear</source>
         <translation>Forskyd</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Opacity</source>
         <translation>Gennemsigtighed</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Coloring</source>
         <translation>Farvelægning</translation>
     </message>
@@ -5644,49 +5787,49 @@
 <context>
     <name>VideoProperties</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="848"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="877"/>
         <source>Set Animation Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="860"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="889"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="861"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="890"/>
         <source>My Video</source>
         <translation>Min Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="866"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="895"/>
         <source>Topics</source>
         <translation>Emner</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="867"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="896"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation>#emne1 #emne2 #emne3</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="872"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="901"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="878"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="907"/>
         <source>Just a little taste of my style :)</source>
         <translation>Bare en smagsprøve på min stil :)</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="939"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="959"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="968"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="988"/>
         <source>Set a title for the picture here!</source>
         <translation>Skriv billedets titel her!</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="946"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="970"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="975"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="999"/>
         <source>Set some topic tags for the picture here!</source>
         <translation>Skriv nogle emne-tags for billedet her!</translation>
     </message>
@@ -5694,53 +5837,52 @@
 <context>
     <name>ViewTool</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="114"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="147"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="189"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="308"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="338"/>
-        <source>Hand</source>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="96"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="143"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="184"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="288"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="304"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="334"/>
+        <source>Shift</source>
         <translation>Hånd</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="100"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="105"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="149"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="250"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="271"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="340"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="103"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="145"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="241"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="263"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="336"/>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="107"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="112"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="254"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="273"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="342"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="110"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="245"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="338"/>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="104"/>
         <source>Z</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="111"/>
         <source>Shift+Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="97"/>
         <source>H</source>
         <translation>H</translation>
     </message>
@@ -5748,22 +5890,22 @@
 <context>
     <name>ZoomConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="54"/>
         <source>Scale Factor</source>
         <translation>Skalerings faktor</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="67"/>
         <source>Tips</source>
         <translation>Tips</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Zoom Square mode</source>
         <translation>Zoom kvadrat tilstand</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Press Ctrl key + Mouse left button</source>
         <translation>Tryk Ctrl tast + Mus venstre knap</translation>
     </message>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_de.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_de.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_de.ts tupi-0.2+git05/src/shell/data/translations/tupi_de.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_de.ts	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_de.ts	2014-12-15 14:21:34.000000000 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE" sourcelanguage="en_US">
+<TS version="2.1" language="de_DE" sourcelanguage="en_US">
 <context>
     <name>ButtonsPanel</name>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="47"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="41"/>
         <source>Edit Tween</source>
         <translation>Bearbeite Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="51"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="45"/>
         <source>Remove Tween</source>
         <translation>Entferne Tween</translation>
     </message>
@@ -17,122 +17,108 @@
 <context>
     <name>Configurator</name>
     <message>
-        <location filename="../src/plugins/tools/positiontool/configurator.cpp" line="91"/>
+        <location filename="../src/plugins/tools/position/configurator.cpp" line="80"/>
         <source>Position Tween</source>
         <translation>Positions Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/papagayo/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/rotation/configurator.cpp" line="70"/>
         <source>Rotation Tween</source>
         <translation>Rotations Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/scale/configurator.cpp" line="70"/>
         <source>Scale Tween</source>
         <translation>Skalierungs Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/opacity/configurator.cpp" line="70"/>
         <source>Opacity Tween</source>
         <translation>Deckkraft Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/color/configurator.cpp" line="66"/>
         <source>Coloring Tween</source>
         <translation>Farb Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/configurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/compound/configurator.cpp" line="71"/>
         <source>Compound Tween</source>
         <translation>Verbindungs Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="122"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="117"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="121"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="112"/>
         <source>Smoothness</source>
         <translation type="unfinished">Glattheit</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="53"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="48"/>
         <source>This tool is just a &lt;b&gt;proof-of-concept&lt;/b&gt; of the basic algorithm for the Tupi&apos;s free-tracing vectorial brushes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="59"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="57"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="58"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="52"/>
         <source>Parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="63"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="58"/>
         <source>Structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="68"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="63"/>
         <source>Basic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="64"/>
         <source>Axial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="65"/>
         <source>Organic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="81"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="77"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="80"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="72"/>
         <source>Dot Spacing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="97"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="93"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="96"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="88"/>
         <source>Size Tolerance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="109"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="104"/>
         <source>Run simulation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/shear/configurator.cpp" line="70"/>
         <source>Shear Tween</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ContourSelection</name>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="107"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="306"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="309"/>
-        <source>Line Selection</source>
-        <translation>Auswahl Kontur</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="307"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-</context>
-<context>
     <name>EraserTool</name>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="67"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="72"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="76"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="49"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="54"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="58"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="79"/>
         <source>Eraser</source>
         <translation>Radiergummi</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="73"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="55"/>
         <source>E</source>
         <translation>E</translation>
     </message>
@@ -140,17 +126,17 @@
 <context>
     <name>ExportTo</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="468"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="469"/>
         <source>Image name prefix: </source>
         <translation>Name der Bilddatei: </translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="476"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="477"/>
         <source>File: </source>
         <translation>Datei: </translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="473"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="474"/>
         <source>Directory: </source>
         <translation>Verzeichnis: </translation>
     </message>
@@ -180,62 +166,62 @@
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="644"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="649"/>
         <source>Choose a file name...</source>
         <translation>Wählen Sie einen Dateinamen...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="657"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="663"/>
         <source>Choose a directory...</source>
         <translation>Wählen Sie ein Verzeichnis...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="726"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="741"/>
         <source>Warning!</source>
         <translation>Achtung!</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="727"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="742"/>
         <source>File exists. Overwrite it?</source>
         <translation>Datei existiert schon. Überschreiben?</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="689"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
         <source>Images name prefix can&apos;t be empty! Please, type a prefix.</source>
         <translation>Der Name der Bilddatei darf nicht leer bleiben! Bitte geben sie einen Namen ein.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="689"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="703"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="738"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="748"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="789"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="703"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="738"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
         <source>Directory doesn&apos;t exist! Please, choose another path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="748"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation>Sie haben keine Rechte diese Datei hier zu erstellen. Bitte wählen sie einen anderen Verzeichnisspfad.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="789"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Format problem. Tupi Internal error.</source>
         <translation>Formatproblem. Interner Fehler in Tupi.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="796"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="825"/>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="800"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="829"/>
         <source>ERROR!</source>
         <translation>FEHLER!</translation>
     </message>
@@ -243,145 +229,145 @@
 <context>
     <name>FillTool</name>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="98"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="102"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="169"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="80"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="84"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="177"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="278"/>
         <source>Internal fill</source>
         <translation>Flächenfüllung</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="104"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="108"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="171"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="267"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="86"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="90"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="179"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="280"/>
         <source>Line fill</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="99"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="81"/>
         <source>I</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="105"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="87"/>
         <source>B</source>
         <translation>B</translation>
     </message>
 </context>
 <context>
-    <name>GenericExportPlugin</name>
-    <message>
-        <location filename="../src/plugins/export/genericexportplugin/genericexportplugin.cpp" line="55"/>
-        <source>Image Array</source>
-        <translation type="unfinished">Bildfolge</translation>
-    </message>
-</context>
-<context>
     <name>GeometricTool</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="124"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="151"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="207"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="220"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="283"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="302"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="333"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="380"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="113"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="118"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="149"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="209"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="222"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="285"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="308"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="339"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="386"/>
         <source>Rectangle</source>
         <translation>Rechteck</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="126"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="131"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="158"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="305"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="335"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="382"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="125"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="311"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="341"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="388"/>
         <source>Ellipse</source>
         <translation>Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="133"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="138"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="165"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="309"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="384"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="448"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="455"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="462"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="132"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="163"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="315"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="390"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="460"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="467"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="474"/>
         <source>Line</source>
         <translation>Linie</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="114"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="121"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="128"/>
         <source>L</source>
         <translation>L</translation>
     </message>
 </context>
 <context>
+    <name>ImagePlugin</name>
+    <message>
+        <location filename="../src/plugins/export/imageplugin/imageplugin.cpp" line="48"/>
+        <source>Image Array</source>
+        <translation type="unfinished">Bildfolge</translation>
+    </message>
+</context>
+<context>
     <name>InfoPanel</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="48"/>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="52"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="43"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="51"/>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Shift + Left Mouse Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>Close line</source>
         <translation>Schliesse Linie</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>X key or Right mouse button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
-        <source>Mouse Double Click</source>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Close the line path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
-        <source>Close the line path</source>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Mouse Right Click</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Align line to horizontal/vertical axis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Set width/height proportional dimensions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -389,14 +375,14 @@
 <context>
     <name>InkTool</name>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="139"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="558"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="562"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="605"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="609"/>
         <source>Ink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="559"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="606"/>
         <source>K</source>
         <translation type="unfinished"></translation>
     </message>
@@ -404,89 +390,145 @@
 <context>
     <name>KinasWidget</name>
     <message>
-        <location filename="../src/components/kinas/kinaswidget.cpp" line="43"/>
+        <location filename="../src/components/kinas/kinaswidget.cpp" line="42"/>
         <source>Tupi Script</source>
         <translation>Tupi Skript</translation>
     </message>
 </context>
 <context>
+    <name>NodesTool</name>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="88"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="351"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="354"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Auswahl Kontur</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="352"/>
+        <source>N</source>
+        <translation type="unfinished">N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="257"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="261"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="555"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="259"/>
+        <source>Shift+R</source>
+        <translation type="unfinished">Shift+R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Tween name is missing!</source>
+        <translation type="unfinished">Tween Name fehlt!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="533"/>
+        <source>Frame %1</source>
+        <translation type="unfinished">Frame %1</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Tween %1 applied!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>PencilTool</name>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="88"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="135"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="78"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="83"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="129"/>
         <source>Pencil</source>
         <translation type="unfinished">Stift</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="89"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="79"/>
         <source>P</source>
         <translation type="unfinished">P</translation>
     </message>
 </context>
 <context>
-    <name>PolyLine</name>
+    <name>PolyLineTool</name>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="100"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="104"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="129"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="93"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="122"/>
         <source>PolyLine</source>
-        <translation>PolyLinie</translation>
+        <translation type="unfinished">PolyLinie</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="101"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="94"/>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished">S</translation>
     </message>
 </context>
 <context>
     <name>PositionSettings</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="78"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="68"/>
         <source>Component</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="71"/>
         <source>Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="82"/>
         <source>Starting at frame</source>
         <translation type="unfinished">Starte bei Frame</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="119"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="180"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="212"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="243"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="202"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="233"/>
         <source>Frames Total</source>
         <translation type="unfinished">Frames Gesamt</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="154"/>
         <source>Cancel Tween</source>
         <translation type="unfinished">Abbrechen Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>You must define a path for this Tween!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="235"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="225"/>
         <source>Position Tween is set!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="260"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="250"/>
         <source>Close Tween properties</source>
         <translation type="unfinished">Schliesse Tween Einstellungen</translation>
     </message>
@@ -494,102 +536,102 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="70"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="51"/>
         <source>Fatal Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="71"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="52"/>
         <source>Well, Tupi has crashed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="72"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="53"/>
         <source>Close</source>
         <translation type="unfinished">Schliessen</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="73"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="54"/>
         <source>Re-launch Tupi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="74"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="55"/>
         <source>This is a general failure</source>
         <translation type="unfinished">Das ist ein allgemeiner Fehler</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="137"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="159"/>
         <source>add</source>
         <translation>füge hinzu</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="142"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="164"/>
         <source>remove</source>
         <translation>entferne</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="147"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="169"/>
         <source>move</source>
         <translation>bewege</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="152"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="174"/>
         <source>lock</source>
         <translation>sperre</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="157"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="179"/>
         <source>rename</source>
         <translation>umbenennen</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="162"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="184"/>
         <source>select</source>
         <translation>auswählen</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="167"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="189"/>
         <source>edit node</source>
         <translation>bearbeite Verbindungspunkt</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="172"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="194"/>
         <source>view</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="177"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="199"/>
         <source>transform</source>
         <translation>umwandeln</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="182"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="204"/>
         <source>convert</source>
         <translation>konvertieren</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="262"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="229"/>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="268"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="235"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="274"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="241"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="280"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="247"/>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="490"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="535"/>
         <source>Wall from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -597,14 +639,14 @@
 <context>
     <name>SchemeTool</name>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="144"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="697"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="701"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="682"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="686"/>
         <source>Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="698"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="683"/>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
@@ -612,93 +654,93 @@
 <context>
     <name>SelectPlugin</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="100"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="77"/>
         <source>Select plugin</source>
         <translation>Wähle plugin</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="165"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="231"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="142"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
         <source>WEBM Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="170"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="234"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="147"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="211"/>
         <source>OGV Video</source>
         <translation>OGV Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="175"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="237"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="152"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="214"/>
         <source>MPEG Video</source>
         <translation>MPEG Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="180"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="240"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="217"/>
         <source>Macromedia flash</source>
         <translation>Macromedia Flash</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="243"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="162"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="220"/>
         <source>AVI Video</source>
         <translation>AVI Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="218"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="264"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="241"/>
         <source>Animated PNG (APNG)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="246"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="223"/>
         <source>RealMedia Video</source>
         <translation>RealMedia Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="282"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="259"/>
         <source>Animated Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="284"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
         <source>Image Array</source>
         <translation type="unfinished">Bildfolge</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="249"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="167"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="226"/>
         <source>ASF Video</source>
         <translation>ASF Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="252"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="172"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="229"/>
         <source>QuickTime Video</source>
         <translation>QuickTime Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="255"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="232"/>
         <source>Gif Image</source>
         <translation>Gif Bild</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="258"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="235"/>
         <source>PNG Image Array</source>
         <translation>PNG Bildfolge</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="213"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="238"/>
         <source>JPEG Image Array</source>
         <translation>JPEG Bildfolge</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="224"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="267"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="201"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="244"/>
         <source>SMIL</source>
         <translation>SMIL</translation>
     </message>
@@ -706,26 +748,26 @@
 <context>
     <name>SelectScenes</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="327"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="304"/>
         <source>Select Scenes</source>
         <translation>Szenenauswahl</translation>
     </message>
 </context>
 <context>
-    <name>SelectTool</name>
+    <name>SelectionTool</name>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="339"/>
-        <source>Select</source>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="161"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="369"/>
+        <source>Selection</source>
         <translation type="unfinished">Auswahl</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="336"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="366"/>
         <source>Object Selection</source>
         <translation type="unfinished">Objekte auswählen</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="337"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="367"/>
         <source>O</source>
         <translation type="unfinished">O</translation>
     </message>
@@ -733,438 +775,468 @@
 <context>
     <name>Settings</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="96"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="82"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="101"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="97"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="85"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="72"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="87"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="88"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="148"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="146"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="134"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="133"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="137"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="124"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="140"/>
         <source>Starting at frame</source>
         <translation>Starte bei Frame</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="104"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="92"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="111"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="108"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="91"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="95"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="82"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="98"/>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="105"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="93"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="112"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="99"/>
         <source>Select object</source>
         <translation>Wähle Objekt</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="113"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="109"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="110"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="93"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="84"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="99"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="100"/>
         <source>Set Properties</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="177"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="573"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="175"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="524"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="185"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="210"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="184"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="670"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="178"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="546"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="179"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="552"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="565"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="168"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="516"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="200"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="538"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="171"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="544"/>
         <source>Frames Total</source>
         <translation>Frames Gesamt</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="288"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="190"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="385"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="289"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="289"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="275"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="281"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="281"/>
         <source>Cancel Tween</source>
         <translation>Abbrechen Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
         <source>You must select at least one object!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
         <source>You must define a path for this Tween!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="284"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="383"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="287"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="287"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="178"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="279"/>
         <source>Save Tween</source>
         <translation>Speichere Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Select objects for Tweening first!</source>
         <translation>Wählen Sie erst die Objekte fürs Tweening aus!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="350"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="343"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="459"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="359"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="343"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="333"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="347"/>
         <source>Update Tween</source>
         <translation>Aktualisiere Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="360"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="352"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="345"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="461"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="361"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="357"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="347"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="335"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="349"/>
         <source>Close Tween properties</source>
         <translation>Schliesse Tween Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="155"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="156"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="141"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="145"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="147"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="148"/>
         <source>Ending at frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="193"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="185"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="185"/>
         <source>Continuous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="194"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="186"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="186"/>
         <source>Partial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="190"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="199"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="199"/>
         <source>Speed (Degrees/Frame)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="265"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="265"/>
         <source>Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="269"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="269"/>
         <source>Clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="278"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="270"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="270"/>
         <source>Counterclockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="302"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="294"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="294"/>
         <source>Degrees Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="305"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="297"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="297"/>
         <source>Start at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="321"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="313"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="313"/>
         <source>Finish at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="230"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="337"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="217"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="221"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="221"/>
         <source>Loop</source>
         <translation type="unfinished">Wiederholen</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="346"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="238"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="230"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="230"/>
         <source>Loop with Reverse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
         <source>You must set Tween properties first!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="188"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="179"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="180"/>
         <source>Width &amp; Height</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="189"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="181"/>
         <source>Only Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="189"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="181"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="182"/>
         <source>Only Height</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="182"/>
         <source>Scale in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="206"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="199"/>
         <source>Scaling Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="221"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="212"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="211"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="212"/>
         <source>Iterations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="191"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="183"/>
         <source>Shear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="183"/>
         <source>Initial Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="206"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="199"/>
         <source>Ending Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="203"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="190"/>
         <source>White</source>
         <translation type="unfinished">Weiss</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="192"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="179"/>
         <source>Initial Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="195"/>
         <source>Ending Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/settings.cpp" line="57"/>
+        <location filename="../src/plugins/tools/pencil/settings.cpp" line="53"/>
         <source>Smoothness</source>
         <translation type="unfinished">Glattheit</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="66"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="59"/>
         <source>Flips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="77"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="70"/>
         <source>Horizontal Flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="80"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="73"/>
         <source>Vertical Flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="76"/>
         <source>Crossed Flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="89"/>
         <source>Order</source>
         <translation type="unfinished">Anordnung</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="106"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="99"/>
         <source>Send object to back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="102"/>
         <source>Send object to back one level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="112"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="105"/>
         <source>Send object to front</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="115"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="108"/>
         <source>Send object to front one level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="131"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="124"/>
         <source>Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="236"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="229"/>
         <source>Show Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="158"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="237"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="151"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="230"/>
         <source>A little help for the Selection tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Rotation mode</source>
         <translation type="unfinished">Rotationsmodus</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Double click on any node or shortcut Alt + R</source>
         <translation type="unfinished">Doppelklick auf einen Verbindungspunkt oder Tastenkürzel Alt + R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Arrows</source>
         <translation type="unfinished">Pfeile</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Movement on selection</source>
         <translation type="unfinished">Bewegung der Auswahl</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Shift + Arrows</source>
         <translation type="unfinished">Shift + Pfeile</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Slow movement on selection</source>
         <translation type="unfinished">Langsame Bewegung der Auswahl</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Ctrl + Arrows</source>
         <translation type="unfinished">Ctrl + Pfeile</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Fast movement on selection</source>
         <translation type="unfinished">Schnelle Bewegung der Auswahl</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Shift + Left Mouse Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Proportional scaling on selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="231"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="224"/>
         <source>Show Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="232"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="225"/>
         <source>Options panel for the Selection tool</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1172,12 +1244,12 @@
 <context>
     <name>SpinControl</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="220"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="221"/>
         <source>Radius</source>
         <translation type="unfinished">Radius</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="229"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="230"/>
         <source>Angle</source>
         <translation type="unfinished">Winkel</translation>
     </message>
@@ -1185,12 +1257,12 @@
 <context>
     <name>StepsViewer</name>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Frames</source>
         <translation>Frames</translation>
     </message>
@@ -1198,42 +1270,42 @@
 <context>
     <name>TButtonBar</name>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="59"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="47"/>
         <source>Left button bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="64"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="52"/>
         <source>Right button bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="69"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="57"/>
         <source>Bottom button bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="74"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="62"/>
         <source>Top button bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="88"/>
         <source>Only icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="91"/>
         <source>Only texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="108"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="96"/>
         <source>Exclusive space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="115"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
         <source>Auto hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1241,12 +1313,12 @@
 <context>
     <name>TCommandHistory</name>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="45"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="41"/>
         <source>Undo</source>
         <translation type="unfinished">Rückgängig</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="46"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="42"/>
         <source>Redo</source>
         <translation type="unfinished">Wiederherstellen</translation>
     </message>
@@ -1254,32 +1326,32 @@
 <context>
     <name>TFontChooser</name>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="52"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="45"/>
         <source>Family</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="56"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="49"/>
         <source>Style</source>
         <translation type="unfinished">Stil</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="60"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="53"/>
         <source>Size</source>
         <translation type="unfinished">Dateigrösse</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="80"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="73"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="81"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="74"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="82"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="75"/>
         <source>Oblique</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1287,17 +1359,17 @@
 <context>
     <name>TOptionalDialog</name>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="60"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="56"/>
         <source>Don&apos;t show again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="59"/>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="67"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1305,12 +1377,12 @@
 <context>
     <name>TRulerBase</name>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="109"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="102"/>
         <source>Change scale to 5...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="110"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="103"/>
         <source>Change scale to 10...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1318,22 +1390,22 @@
 <context>
     <name>TViewButton</name>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="275"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="265"/>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="276"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="266"/>
         <source>Only icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="277"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="267"/>
         <source>Only text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="280"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="270"/>
         <source>Mouse sensibility</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1341,22 +1413,22 @@
 <context>
     <name>TWizard</name>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="48"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="40"/>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="49"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="41"/>
         <source>&lt; &amp;Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="50"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="42"/>
         <source>Next &gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="51"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="43"/>
         <source>&amp;Finish</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1364,22 +1436,22 @@
 <context>
     <name>TabDialog</name>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="93"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="89"/>
         <source>Help</source>
         <translation type="unfinished">Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="96"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="107"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="103"/>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="114"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="110"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -1387,7 +1459,7 @@
 <context>
     <name>TextConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/textconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/text/textconfigurator.cpp" line="49"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
@@ -1395,14 +1467,14 @@
 <context>
     <name>TextTool</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="64"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="163"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="167"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="57"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="160"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="164"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="157"/>
         <source>T</source>
         <translation>T</translation>
     </message>
@@ -1410,18 +1482,18 @@
 <context>
     <name>TreeWidgetSearchLine</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="74"/>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="89"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="63"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="78"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="277"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="266"/>
         <source>Search Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="279"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="268"/>
         <source>All Visible Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1429,7 +1501,7 @@
 <context>
     <name>TreeWidgetSearchLineWidget</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="575"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="564"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1437,32 +1509,32 @@
 <context>
     <name>TupAbout</name>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="136"/>
+        <location filename="../src/libui/tupabout.cpp" line="152"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="111"/>
+        <location filename="../src/libui/tupabout.cpp" line="115"/>
         <source>Credits</source>
         <translation>Mitwirkende</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="58"/>
+        <location filename="../src/libui/tupabout.cpp" line="48"/>
         <source>About Tupi</source>
         <translation type="unfinished">Über Tupi</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="126"/>
+        <location filename="../src/libui/tupabout.cpp" line="136"/>
         <source>Thanks</source>
         <translation>Dank an</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="146"/>
+        <location filename="../src/libui/tupabout.cpp" line="167"/>
         <source>License Agreement</source>
         <translation>Lizenzvereinbarung</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="147"/>
+        <location filename="../src/libui/tupabout.cpp" line="168"/>
         <source>Close</source>
         <translation>Schliesse</translation>
     </message>
@@ -1470,37 +1542,42 @@
 <context>
     <name>TupBasicCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Tupi Camera Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Current resolution:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="122"/>
         <source>Cameras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="124"/>
         <source>Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="138"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
         <source>Take picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="147"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Can&apos;t create pictures directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1508,27 +1585,27 @@
 <context>
     <name>TupCameraBar</name>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="61"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="59"/>
         <source>Rewind</source>
         <translation>Zurück</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="66"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="64"/>
         <source>Play in reverse</source>
         <translation>Rückwärts abspielen</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="71"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="69"/>
         <source>Play</source>
         <translation>Abspielen</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="76"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="74"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="81"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="79"/>
         <source>Forward</source>
         <translation>Vorwärts</translation>
     </message>
@@ -1536,42 +1613,42 @@
 <context>
     <name>TupCameraDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="56"/>
         <source>Camera Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="72"/>
         <source>Available Camera Devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="77"/>
         <source>Camera Detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="89"/>
         <source>Available Camera Resolutions:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="101"/>
         <source>Resize my project to fit camera resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="104"/>
         <source>Use the basic camera interface (low resources)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="110"/>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="127"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1579,87 +1656,92 @@
 <context>
     <name>TupCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Tupi Camera Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Current resolution:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="125"/>
         <source>Cameras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="127"/>
         <source>Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="133"/>
         <source>Take picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="138"/>
         <source>Show safe area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="139"/>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
         <source>Show grid</source>
         <translation type="unfinished">Zeige Hilfsgitter</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="156"/>
         <source>Grid spacing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="174"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="167"/>
         <source>Grid color</source>
         <translation type="unfinished">Farbe des Hilfsgitters</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="190"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="183"/>
         <source>Show previous images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="191"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="184"/>
         <source>P</source>
         <translation type="unfinished">P</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="194"/>
         <source>Image opacity level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="204"/>
         <source>Amount of images to show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="231"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Can&apos;t create pictures directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1667,37 +1749,37 @@
 <context>
     <name>TupCameraStatus</name>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="79"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="71"/>
         <source>Scene name</source>
         <translation>Name der Szene</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="92"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="84"/>
         <source>Frames total</source>
         <translation>Frames gesamt</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="103"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="95"/>
         <source>FPS</source>
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="120"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="112"/>
         <source>Loop</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="124"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="116"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="137"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="129"/>
         <source>Export</source>
         <translation>Exportieren</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="147"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="139"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1705,207 +1787,230 @@
 <context>
     <name>TupCameraWidget</name>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="98"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="91"/>
         <source>Scene Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="162"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="159"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="185"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="182"/>
         <source>Size</source>
         <translation type="unfinished">Dateigrösse</translation>
     </message>
 </context>
 <context>
+    <name>TupCameraWindow</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="95"/>
+        <source>General Camera error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="100"/>
+        <source>Camera invalid request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="105"/>
+        <source>Camera service missing error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="110"/>
+        <source>Camera not supported error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupCanvas</name>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="94"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="80"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="71"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="78"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="79"/>
         <source>Tupi: Open 2D Magic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="101"/>
         <source>Sketch Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="128"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="119"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="119"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="105"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="118"/>
         <source>Images</source>
         <translation type="unfinished">Bilder</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="109"/>
         <source>Selection Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="136"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="147"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="146"/>
         <source>Undo</source>
         <translation type="unfinished">Rückgängig</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="140"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="151"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="151"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="149"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="150"/>
         <source>Redo</source>
         <translation type="unfinished">Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="144"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="131"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="130"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="135"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="135"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="134"/>
         <source>Zoom In</source>
         <translation type="unfinished">Vergrössern</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="139"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="137"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="138"/>
         <source>Zoom Out</source>
         <translation type="unfinished">Verkleinern</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="156"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="143"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="143"/>
-        <source>Hand</source>
-        <translation type="unfinished">Hand</translation>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="142"/>
+        <source>Shift</source>
+        <translation type="unfinished">Shift</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="160"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="137"/>
         <source>Pen Properties</source>
         <translation type="unfinished">Stift Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="164"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="163"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="162"/>
         <source>Exposure Sheet</source>
         <translation type="unfinished">Exposure Sheet</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="447"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="295"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="425"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="293"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="295"/>
         <source>Import a SVG file...</source>
         <translation type="unfinished">Importieren einer SVG Datei...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="448"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="296"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="297"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="426"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="294"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
         <source>Vector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="485"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="463"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="331"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="333"/>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="487"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="335"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="465"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="335"/>
         <source>Image is bigger than workspace.</source>
         <translation type="unfinished">Das Bild ist grösser als der Arbeitsbereich.</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="488"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="336"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="337"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="466"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
         <source>Do you want to resize it?</source>
         <translation type="unfinished">Möchten Sie es skalieren?</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="634"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="609"/>
         <source>Scene %1</source>
         <translation type="unfinished">Szene %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="637"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="612"/>
         <source>Layer 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="640"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="615"/>
         <source>Frame 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="653"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="628"/>
         <source>Layer %1</source>
         <translation type="unfinished">Bildebene %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="660"/>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="672"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="635"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="647"/>
         <source>Frame %1</source>
         <translation type="unfinished">Frame %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="97"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="97"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="96"/>
         <source>Pencil</source>
         <translation type="unfinished">Stift</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="101"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="101"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="99"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="100"/>
         <source>Ink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="111"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="109"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="110"/>
         <source>Ellipse</source>
         <translation type="unfinished">Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="115"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="114"/>
         <source>Rectangle</source>
         <translation type="unfinished">Rechteck</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="122"/>
         <source>Object Selection</source>
         <translation type="unfinished">Objekte auswählen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="127"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="127"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="126"/>
+        <source>Nodes Selection</source>
         <translation type="unfinished">Auswahl Kontur</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="155"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="155"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="154"/>
         <source>Color Palette</source>
         <translation type="unfinished">Farbpalette</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="159"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="158"/>
         <source>Pen Size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1913,17 +2018,17 @@
 <context>
     <name>TupChat</name>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="85"/>
+        <location filename="../src/net/tupchat.cpp" line="75"/>
         <source>Send</source>
         <translation>Abschicken</translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="174"/>
+        <location filename="../src/net/tupchat.cpp" line="164"/>
         <source>Error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="175"/>
+        <location filename="../src/net/tupchat.cpp" line="165"/>
         <source>Invalid Message. It won&apos;t be sent. Please, don&apos;t use HTML tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1931,27 +2036,27 @@
 <context>
     <name>TupColorPalette</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="95"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="77"/>
         <source>Color Palette</source>
         <translation>Farbpalette</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="141"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="127"/>
         <source>Contour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="142"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="128"/>
         <source>Fill</source>
         <translation type="unfinished">Füllung</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="221"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="207"/>
         <source>Color Mixer</source>
         <translation>Farbmixer</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="229"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="215"/>
         <source>Gradients</source>
         <translation>Farbverläufe</translation>
     </message>
@@ -1959,7 +2064,7 @@
 <context>
     <name>TupColorValue</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="184"/>
+        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="180"/>
         <source>Percent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1967,12 +2072,12 @@
 <context>
     <name>TupConfigurationArea</name>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="286"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="296"/>
         <source>Cursor here for expand</source>
         <translation>Mauszeiger hier zum Ausklappen </translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="329"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="339"/>
         <source>Properties</source>
         <translation>Eigenschaften</translation>
     </message>
@@ -1980,42 +2085,42 @@
 <context>
     <name>TupConnectDialog</name>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="60"/>
         <source>Connection Dialog</source>
         <translation>Verbindungsdialog</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="84"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
         <source>Store password</source>
         <translation>Passwort sichern</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Please, fill in your password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2023,18 +2128,18 @@
 <context>
     <name>TupCrashWidget</name>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="129"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="112"/>
         <source>What&apos;s happening?</source>
         <translation type="unfinished">Was ist passiert?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="159"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="140"/>
         <source>Executable information</source>
         <translation type="unfinished">Ausführbare Information</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="165"/>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="172"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="146"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="153"/>
         <source>Backtrace</source>
         <translation type="unfinished">Problemverfolgung</translation>
     </message>
@@ -2042,7 +2147,7 @@
 <context>
     <name>TupDebugWidget</name>
     <message>
-        <location filename="../src/components/debug/tupdebugwidget.cpp" line="48"/>
+        <location filename="../src/components/debug/tupdebugwidget.cpp" line="44"/>
         <source>Debug Console</source>
         <translation>Debug-Konsole</translation>
     </message>
@@ -2050,368 +2155,388 @@
 <context>
     <name>TupDocumentView</name>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="341"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="587"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="836"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="874"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1126"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="617"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="931"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
         <source>Object Selection</source>
         <translation type="unfinished">Objekte auswählen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Auswahl Kontur</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Copy</source>
         <translation type="unfinished">Kopieren</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Ctrl+C</source>
         <translation type="unfinished">Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Paste</source>
         <translation type="unfinished">Einfügen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Ctrl+V</source>
         <translation type="unfinished">Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Cut</source>
         <translation type="unfinished">Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Ctrl+X</source>
         <translation type="unfinished">Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
         <source>Delete</source>
         <translation type="unfinished">Löschen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>&amp;Group</source>
         <translation type="unfinished">G&amp;ruppieren</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>Ctrl+G</source>
         <translation type="unfinished">Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="375"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="378"/>
         <source>&amp;Ungroup</source>
         <translation type="unfinished">Gruppe auf&amp;lösen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="376"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="379"/>
         <source>Ctrl+Shift+G</source>
         <translation type="unfinished">Ctrl+Shift+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Onion Skin</source>
         <translation type="unfinished">Onion Skin</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1016"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1123"/>
         <source>Onion Skin Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished">Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
         <source>Export Current Frame As Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>Export Current Frame To Gallery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Storyboard Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Ctrl+Shift+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="406"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="409"/>
         <source>Draw tools</source>
         <translation type="unfinished">Zeichenwerkzeuge</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="416"/>
         <source>Brushes</source>
         <translation type="unfinished">Pinsel</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="420"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="423"/>
         <source>Selection</source>
         <translation type="unfinished">Auswahl</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="427"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="430"/>
         <source>Fill</source>
         <translation type="unfinished">Füllung</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="434"/>
-        <source>View</source>
-        <translation type="unfinished">Ansicht</translation>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
+        <source>Papagayo file has been imported successfully</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="444"/>
         <source>Tweening</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="455"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="467"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="478"/>
         <source>Image Array</source>
         <translation type="unfinished">Bildfolge</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="510"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="800"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="896"/>
         <source>Pencil</source>
         <translation type="unfinished">Stift</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="516"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
         <source>Ink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="520"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="542"/>
         <source>Eraser</source>
         <translation type="unfinished">Radiergummi</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="525"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="804"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1537"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="547"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1648"/>
         <source>PolyLine</source>
         <translation type="unfinished">PolyLinie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1651"/>
         <source>Line</source>
         <translation type="unfinished">Linie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="535"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="805"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="561"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
         <source>Rectangle</source>
         <translation type="unfinished">Rechteck</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="806"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="564"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
         <source>Ellipse</source>
         <translation type="unfinished">Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="541"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="802"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="567"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="898"/>
         <source>Text</source>
         <translation type="unfinished">Text</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="549"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="575"/>
         <source>Position Tween</source>
         <translation type="unfinished">Positions Tween</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="580"/>
         <source>Rotation Tween</source>
         <translation type="unfinished">Rotations Tween</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="558"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="584"/>
         <source>Scale Tween</source>
         <translation type="unfinished">Skalierungs Tween</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="563"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="589"/>
         <source>Shear Tween</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="568"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
         <source>Opacity Tween</source>
         <translation type="unfinished">Deckkraft Tween</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="573"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="599"/>
         <source>Coloring Tween</source>
         <translation type="unfinished">Farb Tween</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="578"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="604"/>
         <source>Compound Tween</source>
         <translation type="unfinished">Verbindungs Tween</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="624"/>
         <source>Internal fill</source>
         <translation type="unfinished">Flächenfüllung</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="601"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom In</source>
         <translation type="unfinished">Vergrössern</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="743"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="775"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="816"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="871"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom Out</source>
         <translation type="unfinished">Verkleinern</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="851"/>
-        <source>Hand</source>
-        <translation type="unfinished">Hand</translation>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="437"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="631"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="946"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1496"/>
+        <source>Shift</source>
+        <translation type="unfinished">Shift</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="609"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="953"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1060"/>
         <source>Paint area actions</source>
         <translation type="unfinished">Aktionen Zeichenfläche</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="956"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1063"/>
         <source>Dynamic Background Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="961"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1068"/>
         <source>Frames Mode</source>
         <translation type="unfinished">Frames bearbeiten</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="962"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1069"/>
         <source>Static BG Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="963"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1070"/>
         <source>Dynamic BG Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="988"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1095"/>
         <source>Previous Frames</source>
         <translation type="unfinished">Vorschau Frames</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1000"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1107"/>
         <source>Next Frames</source>
         <translation type="unfinished">Nächter Frame</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1035"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1142"/>
         <source>Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1038"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1145"/>
         <source>Left to Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1146"/>
         <source>Right to Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1040"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1147"/>
         <source>Top to Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1041"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1148"/>
         <source>Bottom to Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1044"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1151"/>
         <source>Shift Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1519"/>
         <source>Export Frame As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1414"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1520"/>
         <source>Images</source>
         <translation type="unfinished">Bilder</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
         <source>Frame has been exported successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
         <source>Can&apos;t export frame as image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>No cameras detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1668"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1797"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1870"/>
         <source>Frame %1</source>
         <translation type="unfinished">Frame %1</translation>
     </message>
@@ -2419,47 +2544,47 @@
 <context>
     <name>TupExportWidget</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="997"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1030"/>
         <source>Export to Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1007"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1041"/>
         <source>Export to Video File</source>
         <translation>als Videodatei exportieren</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1010"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1044"/>
         <source>Export to Images Array</source>
         <translation>als Bildfolge exportieren</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1013"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1047"/>
         <source>Export to Animated Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1029"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1063"/>
         <source>Post Animation in Tupitube</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1058"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1097"/>
         <source>Video Formats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1060"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1099"/>
         <source>Open Video Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1062"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1101"/>
         <source>Image Array</source>
         <translation type="unfinished">Bildfolge</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1064"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1103"/>
         <source>Animated Image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2467,29 +2592,29 @@
 <context>
     <name>TupExportWizard</name>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="62"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="54"/>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="63"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="55"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="64"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="56"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="149"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="187"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="214"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="179"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="206"/>
         <source>Export</source>
         <translation type="unfinished">Exportieren</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="216"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="208"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2497,21 +2622,21 @@
 <context>
     <name>TupExposureDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="57"/>
         <source>Exposure Sheet</source>
         <translation type="unfinished">Exposure Sheet</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="132"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="149"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="273"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="288"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="264"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="279"/>
         <source>Scene</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="144"/>
         <source>Work Team</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2519,15 +2644,15 @@
 <context>
     <name>TupExposureScene</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="70"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="65"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="110"/>
         <source>Layer</source>
         <translation type="unfinished">Bildebene</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="77"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="72"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="154"/>
         <source>Frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2535,123 +2660,123 @@
 <context>
     <name>TupExposureSheet</name>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="71"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="60"/>
         <source>Exposure Sheet</source>
         <translation>Exposure Sheet</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="96"/>
         <source>actions</source>
         <translation>Aktionen</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="106"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="100"/>
         <source>Insert</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="123"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="117"/>
         <source>20 frames</source>
         <translation type="unfinished">10 FRames {20 ?}</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="128"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="122"/>
         <source>50 frames</source>
         <translation type="unfinished">10 FRames {50 ?}</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="133"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="127"/>
         <source>100 frames</source>
         <translation type="unfinished">10 FRames {100 ?}</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="140"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="134"/>
         <source>Remove frame</source>
         <translation>Entferne Frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="145"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="139"/>
         <source>Clear frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="150"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="144"/>
         <source>Lock/Unlock frame</source>
         <translation>Sichere/Entsichere Frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="155"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="149"/>
         <source>Copy frame</source>
         <translation>Kopiere Frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="154"/>
         <source>Paste in frame</source>
         <translation>Einfügen in Frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="165"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="159"/>
         <source>Expand</source>
         <translation>Erweitere</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="108"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="166"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
         <source>1 frame</source>
         <translation>1 Frame</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="113"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="167"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="107"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="161"/>
         <source>5 frames</source>
         <translation>5 Frames</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="118"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="112"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="162"/>
         <source>10 frames</source>
         <translation>10 FRames</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
         <source>Copy TL forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="174"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="169"/>
         <source>1 time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="175"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="170"/>
         <source>2 times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="176"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="171"/>
         <source>3 times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="177"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="172"/>
         <source>4 times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="178"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
         <source>5 times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="246"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="474"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="635"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="254"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="501"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="674"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="239"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="632"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="247"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="671"/>
         <source>Layer %1</source>
         <translation>Bildebene %1</translation>
     </message>
@@ -2659,32 +2784,32 @@
 <context>
     <name>TupGradientCreator</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Linear</source>
         <translation>Linear</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Radial</source>
         <translation>Radial</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Conical</source>
         <translation>Konisch</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Pad</source>
         <translation>Uniform</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Reflect</source>
         <translation>Reflektiv</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Repeat</source>
         <translation>Wiederholung</translation>
     </message>
@@ -2692,34 +2817,34 @@
 <context>
     <name>TupGraphicsScene</name>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="154"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="155"/>
         <source>PolyLine</source>
         <translation>PolyLinie</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="533"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="727"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="583"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="771"/>
         <source>/Step: 0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="610"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="759"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="653"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="803"/>
         <source>/Step: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1108"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1212"/>
         <source>Line</source>
         <translation type="unfinished">Linie</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom In</source>
         <translation type="unfinished">Vergrössern</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom Out</source>
         <translation type="unfinished">Verkleinern</translation>
     </message>
@@ -2727,7 +2852,7 @@
 <context>
     <name>TupHelpBrowser</name>
     <message>
-        <location filename="../src/components/help/tuphelpbrowser.cpp" line="50"/>
+        <location filename="../src/components/help/tuphelpbrowser.cpp" line="42"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
@@ -2735,7 +2860,7 @@
 <context>
     <name>TupHelpWidget</name>
     <message>
-        <location filename="../src/components/help/tuphelpwidget.cpp" line="48"/>
+        <location filename="../src/components/help/tuphelpwidget.cpp" line="40"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
@@ -2743,59 +2868,59 @@
 <context>
     <name>TupImageDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="48"/>
         <source>Image Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="53"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="67"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="54"/>
         <source>My Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="73"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="60"/>
         <source>Topics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="79"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
         <source>Description</source>
         <translation type="unfinished">Beschreibung</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="72"/>
         <source>Just a little taste of my style :)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="89"/>
         <source>Post Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="124"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="130"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="128"/>
         <source>Set a title for the picture here!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="139"/>
         <source>Set some topic tags for the picture here!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2803,55 +2928,55 @@
 <context>
     <name>TupInfoWidget</name>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="124"/>
         <source>Currency Converter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="128"/>
         <source>Currency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="227"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="244"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="228"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="143"/>
         <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="168"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="152"/>
         <source>Update data every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
         <source>minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="262"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="246"/>
         <source>Link file to Object</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="263"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="247"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2859,65 +2984,67 @@
 <context>
     <name>TupItemManager</name>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="74"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="70"/>
         <source>New folder %1</source>
         <translation type="unfinished">Neuer Ordner %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="231"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="343"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="229"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="350"/>
         <source>Options</source>
         <translation type="unfinished">Optionen</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="234"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="242"/>
         <source>Edit with Inkscape</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="244"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="252"/>
         <source>Edit with Gimp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="254"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="262"/>
         <source>Edit with Krita</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="264"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="272"/>
         <source>Edit with MyPaint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="275"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="283"/>
         <source>Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="278"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="286"/>
         <source>Export</source>
         <translation type="unfinished">Exportieren</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="281"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="232"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="289"/>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="284"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="235"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="292"/>
         <source>Delete</source>
         <translation type="unfinished">Löschen</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="295"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="347"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="354"/>
         <source>Create new raster item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="355"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="309"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="359"/>
         <source>Create new svg item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2925,7 +3052,7 @@
 <context>
     <name>TupItemPreview</name>
     <message>
-        <location filename="../src/libtupi/tupitempreview.cpp" line="64"/>
+        <location filename="../src/libtupi/tupitempreview.cpp" line="56"/>
         <source>Library is empty :(</source>
         <translation>Bibliothek ist leer :(</translation>
     </message>
@@ -2933,40 +3060,45 @@
 <context>
     <name>TupItemTweener</name>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="551"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="610"/>
         <source>Position Tween</source>
         <translation type="unfinished">Positions Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="554"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="613"/>
         <source>Rotation Tween</source>
         <translation type="unfinished">Rotations Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="557"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="616"/>
         <source>Scale Tween</source>
         <translation type="unfinished">Skalierungs Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="560"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="619"/>
         <source>Shear Tween</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="563"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="622"/>
         <source>Opacity Tween</source>
         <translation type="unfinished">Deckkraft Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="566"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="625"/>
         <source>Coloring Tween</source>
         <translation type="unfinished">Farb Tween</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="569"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="628"/>
         <source>Compound Tween</source>
         <translation type="unfinished">Verbindungs Tween</translation>
     </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="631"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupLayer</name>
@@ -2979,7 +3111,7 @@
 <context>
     <name>TupLayerIndex</name>
     <message>
-        <location filename="../src/components/timeline/tuplayerindex.cpp" line="178"/>
+        <location filename="../src/components/timeline/tuplayerindex.cpp" line="169"/>
         <source>Layers</source>
         <translation type="unfinished">Bildebenen</translation>
     </message>
@@ -2987,17 +3119,17 @@
 <context>
     <name>TupLibraryDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="58"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="47"/>
         <source>Library Object</source>
         <translation>Bibliotheksobjekt</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="92"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="81"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="84"/>
         <source>Item %1</source>
         <translation>Element %1</translation>
     </message>
@@ -3005,238 +3137,238 @@
 <context>
     <name>TupLibraryWidget</name>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="125"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="95"/>
         <source>Library</source>
         <translation>Bibliothek</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="189"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1327"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="162"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1445"/>
         <source>Image</source>
         <translation>Bild</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="191"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1332"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="164"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1450"/>
         <source>Image Array</source>
         <translation>Bildfolge</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="190"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="163"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1455"/>
         <source>Svg File</source>
         <translation>SVG Datei</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="192"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1342"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="165"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1460"/>
         <source>Svg Array</source>
         <translation>SVG Folge</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="198"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="171"/>
         <source>Add an object to library</source>
         <translation>Ein Objekt zur Bibliothek hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="213"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="186"/>
         <source>Inserts the selected object into the drawing area</source>
         <translation>Das gewählte Objekt in die Zeichenebene einfügen</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="206"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="179"/>
         <source>Adds a folder to the object&apos;s list</source>
         <translation>Einen Ordner zur Objektliste hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="518"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="550"/>
         <source>Export object...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Item exported successfully!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
         <source>Couldn&apos;t create images directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
         <source>Couldn&apos;t create vector directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="708"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="781"/>
         <source>Tupi library item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="789"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="878"/>
         <source>Image is bigger than workspace.</source>
         <translation>Das Bild ist grösser als der Arbeitsbereich.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="790"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="879"/>
         <source>Do you want to resize it?</source>
         <translation>Möchten Sie es skalieren?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="505"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="753"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="836"/>
         <source>Images</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Cannot open file: %1</source>
         <translation>Folgende Datei kann nicht geöffnet werden: %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="887"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="986"/>
         <source>Choose the images directory...</source>
         <translation>Wählen Sie ein Bildverzeichnis...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1033"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
         <source>Choose the SVG files directory...</source>
         <translation>Wählen Sie das SVG Datei Verzeichnis...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="787"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="928"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1062"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="876"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1026"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1159"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="911"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
         <source>Image files found: %1.</source>
         <translation>Folgende Bildateien wurden gefunden: %1.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1059"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1156"/>
         <source>%1 SVG files will be loaded.</source>
         <translation>%1 SVG Datei wird geladen.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="921"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1019"/>
         <source>Files are too big, so they will be resized.</source>
         <translation>Die Dateien sind zu gross, sie werden verkleinert.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="840"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="930"/>
         <source>Vector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="922"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1020"/>
         <source>Note: This task can take a while.</source>
         <translation>Achtung: Bearbeitung kann einen Moment dauern.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="931"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1065"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1029"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1162"/>
         <source>Do you want to continue?</source>
         <translation>Möchten Sie fortfahren?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="953"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1051"/>
         <source>Loading images...</source>
         <translation>Bilder werden geladen...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1086"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1182"/>
         <source>Loading SVG files...</source>
         <translation>SVG-Dateien werden geladen...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1107"/>
         <source>Loading image #%1</source>
         <translation>Lade Bild #%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1126"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1221"/>
         <source>Loading SVG file #%1</source>
         <translation>Lade SVG Datei #%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR!</source>
         <translation>FEHLER!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="278"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1374"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="269"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1493"/>
         <source>Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="289"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="286"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="339"/>
         <source>No preview available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="752"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="835"/>
         <source>Import images...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="839"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="929"/>
         <source>Import SVG files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR: Can&apos;t open file %1. Please, check file permissions and try again.</source>
         <translation>FEHLER: Folgende Datei kann nicht geöffnet werden: %1. Bitte überprüfen Sie die Nutzerechte und versuchen es erneut.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
         <source>No image files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Es wurden keine Bilddateien gefunden.&lt;br/&gt;Bitte wählen Sie ein anderes Verzeichnis</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
         <source>No SVG files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Es wurden keine SVG Dateien gefunden.&lt;br/&gt;Bitte wählen Sie ein anderes Verzeichnis</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1149"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1244"/>
         <source>Import audio file...</source>
         <translation>Importiere Audiodatei...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1150"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1245"/>
         <source>Sound file</source>
         <translation>Audiodatei</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1001"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1118"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1099"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1213"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
@@ -3244,45 +3376,45 @@
 <context>
     <name>TupListProjectDialog</name>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="64"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="54"/>
         <source>Projects List from Server</source>
         <translation>Liste der Projekte von Server</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="89"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="79"/>
         <source>My works:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="90"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="80"/>
         <source>My contributions:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Author</source>
         <translation type="unfinished">Autor</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Description</source>
         <translation type="unfinished">Beschreibung</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="126"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="116"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -3290,583 +3422,618 @@
 <context>
     <name>TupMainWindow</name>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
         <source>[ by %1 | net mode ]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
         <source>Opening a new document...</source>
         <translation type="unfinished">Öffnen eines neuen Dokumentes...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="263"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1135"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="306"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="273"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1218"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="277"/>
         <source>Animation</source>
         <translation type="unfinished">Animation</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="317"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="327"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="285"/>
         <source>Player</source>
         <translation type="unfinished">Player</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; opened!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="434"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="484"/>
         <source>Question</source>
         <translation type="unfinished">Frage</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="436"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="486"/>
         <source>The document has been modified.</source>
         <translation type="unfinished">Das Dokument wurde verändert.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="487"/>
         <source>Do you want to save the project?</source>
         <translation type="unfinished">Wollen sie das Projekt speichern?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="489"/>
         <source>Save</source>
         <translation type="unfinished">Speichern</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="440"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="490"/>
         <source>Discard</source>
         <translation type="unfinished">Verwerfen</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="441"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="491"/>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="746"/>
         <source>Open Tupi project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Import Gimp palettes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Gimp Palette (*.gpl *.txt *.css)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
         <source>Gimp palette import was successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
         <source>Gimp palette import was unsuccessful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1013"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1092"/>
         <source>Save Project As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
         <source>Directory does not exist! Please, choose another path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1340"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1428"/>
         <source>Import project package</source>
         <translation type="unfinished">Importieren des Projektpaketes</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
         <source>Can&apos;t import project. File is empty!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
         <source>Can&apos;t save the project. File doesn&apos;t exist!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1369"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1457"/>
         <source>Fatal Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1371"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1459"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1372"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1460"/>
         <source>Please, try to connect again in a while</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
         <source>Cannot open project!</source>
         <translation type="unfinished">Projekt kann nicht geöffnet werden!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="689"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1014"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1341"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="747"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1093"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1429"/>
         <source>Tupi Project Package (*.tup)</source>
         <translation type="unfinished">Tupi Projekt Paket (*.tup)</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="108"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="581"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="111"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="635"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>Tupi: Open 2D Magic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Tip of the day</source>
         <translation type="unfinished">Tipp des Tages</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Ctrl+T</source>
         <translation type="unfinished">Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Show on start</source>
         <translation type="unfinished">Beim Start anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Previous tip</source>
         <translation type="unfinished">Vorheriger Tipp</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Next tip</source>
         <translation type="unfinished">Nächster Tipp</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1374"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1462"/>
         <source>Close</source>
         <translation type="unfinished">Schliessen</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation type="unfinished">Sie haben keine Rechte diese Datei zu erstellen. Bitte wählen sie einen anderen Verzeichnispfad.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
         <source>Cannot save the project!</source>
         <translation type="unfinished">Das Projekt kann nicht gespeichert werden!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1136"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1219"/>
         <source>New camera</source>
         <translation type="unfinished">Neue Kamera</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="70"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="64"/>
         <source>Shift+P</source>
         <translation type="unfinished">Shift+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="81"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="75"/>
         <source>Shift+B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="92"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="86"/>
         <source>Shift+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Bitmap</source>
         <translation type="unfinished">Bild</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Alt+B</source>
         <translation type="unfinished">Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Bitmap Array</source>
         <translation type="unfinished">Bildfolge</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Alt+Shift+B</source>
         <translation type="unfinished">Alt+Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>SVG File</source>
         <translation type="unfinished">SVG Datei</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>Alt+S</source>
         <translation type="unfinished">Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>SVG Array</source>
         <translation type="unfinished">SVG Folge</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>Alt+Shift+S</source>
         <translation type="unfinished">Alt+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="121"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="115"/>
         <source>Shift+C</source>
         <translation type="unfinished">Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="130"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="124"/>
         <source>Shift+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="140"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="139"/>
         <source>Shift+H</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="155"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="154"/>
         <source>Shift+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="165"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="164"/>
         <source>Shift+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="196"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="195"/>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="204"/>
         <source>Recents</source>
         <translation type="unfinished">Aktuelle</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="243"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="225"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="280"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="252"/>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Fenster</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="272"/>
         <source>Modules</source>
         <translation type="unfinished">Module</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="330"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
         <source>News</source>
         <translation type="unfinished">Neuigkeiten</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="432"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="409"/>
         <source>Shift+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="322"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="293"/>
         <source>Help</source>
         <translation type="unfinished">Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="257"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="235"/>
         <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="343"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>New project</source>
         <translation type="unfinished">Neues Projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>Ctrl+N</source>
         <translation type="unfinished">Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="392"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="363"/>
         <source>Open new project</source>
         <translation type="unfinished">Öffne neues Projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Open project</source>
         <translation type="unfinished">Öffne Project</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Ctrl+O</source>
         <translation type="unfinished">Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="398"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="369"/>
         <source>Load existent project</source>
         <translation type="unfinished">Lade existierendes Projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="411"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="382"/>
         <source>Save project</source>
         <translation type="unfinished">Speichere Projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="412"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="383"/>
         <source>Ctrl+S</source>
         <translation type="unfinished">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="385"/>
         <source>Save current project in current location</source>
         <translation type="unfinished">Speichere aktuelles Projekt in aktuellem Ordner</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="416"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
         <source>Save project &amp;As...</source>
         <translation type="unfinished">Speichere &amp;Projekt als...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="417"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="391"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished">Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="420"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="394"/>
         <source>Open dialog box to save current project in any location</source>
         <translation type="unfinished">Öffne Dialogfenster um aktuelles Projekt an einem Speicherort zu sichern</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="423"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Cl&amp;ose project</source>
         <translation type="unfinished">Schliesse Pr&amp;ojekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="424"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Ctrl+W</source>
         <translation type="unfinished">Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="426"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="403"/>
         <source>Close active project</source>
         <translation type="unfinished">Schliesse aktuelles Projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="431"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="408"/>
         <source>&amp;Import GIMP palettes</source>
         <translation type="unfinished">Importiere &amp;GIMP Paletten</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="433"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="410"/>
         <source>Import palettes</source>
         <translation type="unfinished">Importiere Paletten</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="413"/>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="415"/>
+        <source>Import Papagayo lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>&amp;Export Project</source>
         <translation type="unfinished">&amp;Exportiere Projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>Ctrl+R</source>
         <translation type="unfinished">Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="421"/>
         <source>Export project to several video formats</source>
         <translation type="unfinished">Exportiere Projekt in verschiedene Video Formate</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">E&amp;xit</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="445"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="427"/>
         <source>Close application</source>
         <translation type="unfinished">Schliesse Anwendung</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="469"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="451"/>
         <source>Pr&amp;eferences...</source>
         <translation type="unfinished">Ein&amp;stellungen...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="452"/>
         <source>Ctrl+P</source>
         <translation type="unfinished">Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="472"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="454"/>
         <source>Opens the preferences dialog box</source>
         <translation type="unfinished">Öffne den Einstellungsdialog</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>About Tupi</source>
         <translation type="unfinished">Über Tupi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>Ctrl+K</source>
         <translation type="unfinished">Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="544"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="526"/>
         <source>Actions Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="685"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="666"/>
         <source>Undo</source>
         <translation type="unfinished">Rückgängig</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="669"/>
         <source>Ctrl+Z</source>
         <translation type="unfinished">Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="672"/>
         <source>Redo</source>
         <translation type="unfinished">Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="694"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="675"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished">Ctrl+Y</translation>
     </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Import Papagayo project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
+        <source>Papagayo project is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupNetProjectManagerHandler</name>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="111"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="80"/>
         <source>Communications</source>
         <translation>Kommunikation</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="115"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="84"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="120"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="89"/>
         <source>Notices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="462"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="507"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
         <source>Unable to connect to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="310"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="319"/>
         <source>Fatal Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="312"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="321"/>
         <source>User &quot;%1&quot; is disabled.
 Please, contact the animation server admin to get access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="491"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="536"/>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
         <source>User has no available projects in the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="460"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="505"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="484"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="529"/>
         <source>Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3874,61 +4041,61 @@
 <context>
     <name>TupNewItemDialog</name>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="76"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="66"/>
         <source>Create new raster item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="83"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="192"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="196"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="215"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="219"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="73"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="182"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="186"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="205"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="209"/>
         <source>Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="84"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="74"/>
         <source>White</source>
         <translation type="unfinished">Weiss</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="85"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="75"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="97"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="87"/>
         <source>Create new vector item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="123"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="134"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="124"/>
         <source>&amp;Extension:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="135"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="125"/>
         <source>&amp;Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="136"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="126"/>
         <source>&amp;Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="139"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="129"/>
         <source>&amp;Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="143"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
         <source>&amp;Open it with:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3936,175 +4103,175 @@
 <context>
     <name>TupNewProject</name>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="84"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="75"/>
         <source>Create a new project</source>
         <translation type="unfinished">Erstelle neues Projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="90"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="81"/>
         <source>Project Name</source>
         <translation type="unfinished">Projektname</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="94"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="85"/>
         <source>my_project</source>
         <translation type="unfinished">mein_projekt</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="97"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="88"/>
         <source>Author</source>
         <translation type="unfinished">Autor</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="136"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="127"/>
         <source>Click here to change background color</source>
         <translation type="unfinished">Hier klicken um Hintergrundfarbe anzupassen</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="235"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="226"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="242"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="233"/>
         <source>Store password</source>
         <translation type="unfinished">Passwort sichern</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
         <source>Please, set a name for the project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
         <source>Please, fill in your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
         <source>Please, fill in your password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Please, fill in the server name or IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="334"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="325"/>
         <source>White</source>
         <translation type="unfinished">Weiss</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="154"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="145"/>
         <source>Dimension</source>
         <translation type="unfinished">Abmessung</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="101"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="92"/>
         <source>Your name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="104"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="95"/>
         <source>Description</source>
         <translation type="unfinished">Beschreibung</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="99"/>
         <source>Just for fun!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="103"/>
         <source>Presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="115"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="106"/>
         <source>Free format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="116"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="107"/>
         <source>520x380 - 24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="117"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
         <source>640x480 - 24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="118"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="109"/>
         <source>480p (PAL DV/DVD) - 25</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="110"/>
         <source>576p (PAL DV/DVD) - 25</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="120"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="111"/>
         <source>720p (HD) - 25</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="121"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
         <source>1280p (Full HD) - 25</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="128"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
         <source>Options</source>
         <translation type="unfinished">Optionen</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="126"/>
         <source>Background</source>
         <translation type="unfinished">Hintergrund</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="144"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
         <source>FPS</source>
         <translation type="unfinished">FPS</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="170"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="161"/>
         <source>Tupitube project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="176"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="167"/>
         <source>Project info</source>
         <translation type="unfinished">Projektinformation</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Server</source>
         <translation type="unfinished">Server</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Port</source>
         <translation type="unfinished">Port</translation>
     </message>
@@ -4112,7 +4279,7 @@
 <context>
     <name>TupNotice</name>
     <message>
-        <location filename="../src/net/tupnotice.cpp" line="65"/>
+        <location filename="../src/net/tupnotice.cpp" line="58"/>
         <source>Notices</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4120,27 +4287,27 @@
 <context>
     <name>TupOnionOpacityDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="50"/>
         <source>Onion Paper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="103"/>
         <source>-0.05</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="107"/>
         <source>-0.01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="119"/>
         <source>+0.01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="123"/>
         <source>+0.05</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4148,162 +4315,163 @@
 <context>
     <name>TupPaintArea</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="196"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="199"/>
         <source>Drawing area</source>
         <translation>Zeichenebene</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Ctrl+X</source>
         <translation type="unfinished">Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
         <source>Paste in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
         <source>next 5 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="207"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
         <source>next 10 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="211"/>
         <source>next 20 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="212"/>
         <source>next 50 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="213"/>
         <source>next 100 frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="220"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="235"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="238"/>
         <source>Add to library...</source>
         <translation>Zur Bibliothek hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="174"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="521"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1145"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="591"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1364"/>
         <source>PolyLine</source>
         <translation type="unfinished">PolyLinie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
         <source>Send</source>
         <translation type="unfinished">Abschicken</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
         <source>To back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="227"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="230"/>
         <source>To front</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="228"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="231"/>
         <source>One level to back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="232"/>
         <source>One level to front</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1151"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1370"/>
         <source>Rectangle</source>
         <translation type="unfinished">Rechteck</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1152"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1371"/>
         <source>Ellipse</source>
         <translation type="unfinished">Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1153"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1372"/>
         <source>Line</source>
         <translation type="unfinished">Linie</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="922"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1211"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1085"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1430"/>
         <source>Frame %1</source>
         <translation type="unfinished">Frame %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="181"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="564"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1160"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="182"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="644"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1379"/>
         <source>Object Selection</source>
         <translation>Objekte auswählen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="109"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1159"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1378"/>
         <source>Pencil</source>
         <translation type="unfinished">Stift</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="166"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <source>Nodes Selection</source>
         <translation type="unfinished">Auswahl Kontur</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>No items selected</source>
         <translation>Es sind keine Objekte ausgewählt</translation>
     </message>
@@ -4311,27 +4479,22 @@
 <context>
     <name>TupPaintAreaBase</name>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="201"/>
-        <source>OpenGL isn&apos;t supported</source>
-        <translation>OpenGL wird nicht unterstützt</translation>
-    </message>
-    <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="372"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="393"/>
         <source>No Scene!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="379"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="400"/>
         <source>Locked!</source>
         <translation>Gesperrt!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="448"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="469"/>
         <source>No Frames!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="451"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="472"/>
         <source>No Layers!</source>
         <translation>Keine Bildebenen!</translation>
     </message>
@@ -4339,27 +4502,27 @@
 <context>
     <name>TupPaintAreaConfig</name>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="67"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="59"/>
         <source>Grid color</source>
         <translation>Farbe des Hilfsgitters</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="73"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="65"/>
         <source>Grid separation</source>
         <translation>Aufteilung des Hilfsgitters</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="82"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="74"/>
         <source>Background color</source>
         <translation>Hintergrundfarbe</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="88"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="80"/>
         <source>Onion skin color</source>
         <translation>Farbe der Onion Skin</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="94"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="86"/>
         <source>Onion skin background </source>
         <translation>Onion Skin Hintergrund</translation>
     </message>
@@ -4367,82 +4530,82 @@
 <context>
     <name>TupPaintAreaStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="93"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="76"/>
         <source>Action Safe Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="77"/>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="85"/>
         <source>Show grid</source>
         <translation type="unfinished">Zeige Hilfsgitter</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="103"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="86"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="95"/>
         <source>F11</source>
         <translation type="unfinished">F11</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="106"/>
         <source>Current Frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="113"/>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="127"/>
         <source>Zoom</source>
         <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="164"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="147"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="159"/>
         <source>Rotate Workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="182"/>
         <source>Antialiasing</source>
         <translation>Antialiasing</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="191"/>
         <source>Background Color</source>
         <translation type="unfinished">Hintergrundfarbe</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="192"/>
         <source>Click here to change background color</source>
         <translation type="unfinished">Hier klicken um Hintergrundfarbe anzupassen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="215"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="198"/>
         <source>Brush Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="216"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
         <source>Click here to change brush color</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4450,27 +4613,27 @@
 <context>
     <name>TupPenDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="60"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="50"/>
         <source>Pen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="102"/>
         <source>-5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="116"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="106"/>
         <source>-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="114"/>
         <source>+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="128"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="118"/>
         <source>+5</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4478,83 +4641,83 @@
 <context>
     <name>TupPenWidget</name>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="60"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="52"/>
         <source>Pen Properties</source>
         <translation>Stift Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="71"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="63"/>
         <source>Thickness</source>
         <translation>Durchmesser</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="84"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="76"/>
         <source>Dashes</source>
         <translation>Gestrichelt</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="90"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="83"/>
         <source>Solid</source>
         <translation>Solid</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="85"/>
         <source>Dash</source>
         <translation>Strich</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="92"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="87"/>
         <source>Dot</source>
         <translation>Punkt</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="93"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="89"/>
         <source>Dash dot</source>
         <translation>Strich Punkt</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="94"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
         <source>Dash dot dot</source>
         <translation>Strich Punkt Punkt</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="103"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="108"/>
         <source>Cap</source>
         <translation>Deckrand</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="109"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="114"/>
         <source>Flat</source>
         <translation>Breite</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="110"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="115"/>
         <source>Square</source>
         <translation>Quadrat</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="111"/>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="127"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="116"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="132"/>
         <source>Round</source>
         <translation>Rund</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="120"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
         <source>Join</source>
         <translation>Verbindung</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="130"/>
         <source>Miter</source>
         <translation>Krümmung</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="126"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="131"/>
         <source>Bevel</source>
         <translation>Kante</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="136"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="141"/>
         <source>Brush</source>
         <translation>Pinsel</translation>
     </message>
@@ -4562,27 +4725,27 @@
 <context>
     <name>TupPreferences</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="202"/>
         <source>Application TupPreferences</source>
         <translation>Tupi Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
         <source>Theme</source>
         <translation>Benutzeroberfläche</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="217"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
         <source>Workspace</source>
         <translation>Arbeitsplatz</translation>
     </message>
@@ -4590,27 +4753,27 @@
 <context>
     <name>TupPreferences::GeneralPage</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Tupi Home</source>
         <translation>Tupi Installationsverzeichnis</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Cache</source>
         <translation>Cache</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Browser</source>
         <translation>Browser</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Open last project</source>
         <translation>Öffne letztes Projekt</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Auto save (minutes)</source>
         <translation>Automatisches Speichern (Minuten)</translation>
     </message>
@@ -4618,126 +4781,126 @@
 <context>
     <name>TupProjectActionBar</name>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="148"/>
         <source>Insert frame</source>
         <translation>Frame einfügen</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="170"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
         <source>Remove the frame</source>
         <translation>Frame entfernen</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="188"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="177"/>
         <source>Move frame up</source>
         <translation>Frame nach oben senden</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="122"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="197"/>
         <source>F9</source>
         <translation>F9</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="196"/>
         <source>Move frame down</source>
         <translation>Frame nach unten senden</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="144"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="219"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
         <source>F10</source>
         <translation>F10</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
         <source>Lock frame</source>
         <translation>Frame sperren</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="108"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="97"/>
         <source>Insert a layer</source>
         <translation>Bildebene einfügen</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="98"/>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="120"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
         <source>Remove the layer</source>
         <translation>Bildebene entfernen</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="110"/>
         <source>F6</source>
         <translation>F6</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
         <source>Move layer up</source>
         <translation>Bildebene nach oben senden</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="143"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
         <source>Move layer down</source>
         <translation>Bildebene nach unten senden</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="189"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="178"/>
         <source>F8</source>
         <translation type="unfinished">F8</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="229"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
         <source>Lock layer</source>
         <translation>Bildebene sperren</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="239"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="228"/>
         <source>Insert a scene</source>
         <translation>Szene einfügen</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="249"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="238"/>
         <source>Remove the scene</source>
         <translation>Szene entfernen</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="259"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="248"/>
         <source>Move scene up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="269"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="258"/>
         <source>Move scene down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="279"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="268"/>
         <source>Lock scene</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
         <source>Do you want to remove this frame?</source>
         <translation>Wollen Sie dieses Frame entfernen?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Remove?</source>
         <translation>Entfernen?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
         <source>Do you want to remove this layer?</source>
         <translation>Diese Bildebene entfernen?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Do you want to remove this scene?</source>
         <translation>Wollen Sie diese Szene entfernen?</translation>
     </message>
@@ -4745,17 +4908,17 @@
 <context>
     <name>TupProjectManager</name>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="190"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="207"/>
         <source>Scene %1</source>
         <translation>Szene %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="193"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="210"/>
         <source>Layer %1</source>
         <translation>Bildebene %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="196"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="213"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
@@ -4763,17 +4926,17 @@
 <context>
     <name>TupScene</name>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="634"/>
+        <location filename="../src/store/tupscene.cpp" line="648"/>
         <source>Layer %1</source>
         <translation>Bildebene %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="635"/>
+        <location filename="../src/store/tupscene.cpp" line="649"/>
         <source>Frame %1</source>
         <translation type="unfinished">Frame %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="185"/>
+        <location filename="../src/store/tupscene.cpp" line="190"/>
         <source>Sound layer %1</source>
         <translation>Tonebene %1</translation>
     </message>
@@ -4781,7 +4944,7 @@
 <context>
     <name>TupSceneTabWidget</name>
     <message>
-        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="84"/>
+        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="77"/>
         <source>Layers</source>
         <translation>Bildebenen</translation>
     </message>
@@ -4789,29 +4952,29 @@
 <context>
     <name>TupScenesWidget</name>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="69"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="57"/>
         <source>Scenes Manager</source>
         <translation>Szenenverwaltung</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="101"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="94"/>
         <source>Filter here...</source>
         <translation>Filter hier...</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="154"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="158"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="185"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="155"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="159"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="190"/>
         <source>Scene %1</source>
         <translation>Szene %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="164"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="165"/>
         <source>Layer %1</source>
         <translation>Bildebene %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="167"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="168"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
@@ -4819,7 +4982,7 @@
 <context>
     <name>TupScreen</name>
     <message>
-        <location filename="../src/components/animation/tupscreen.cpp" line="421"/>
+        <location filename="../src/components/animation/tupscreen.cpp" line="482"/>
         <source>Rendering...</source>
         <translation type="unfinished">Rendern...</translation>
     </message>
@@ -4827,7 +4990,7 @@
 <context>
     <name>TupSplash</name>
     <message>
-        <location filename="../src/shell/tupsplash.cpp" line="55"/>
+        <location filename="../src/shell/tupsplash.cpp" line="53"/>
         <source>Version </source>
         <translation type="unfinished">Version </translation>
     </message>
@@ -4835,137 +4998,137 @@
 <context>
     <name>TupStoryBoardDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="117"/>
         <source>Storyboard Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="158"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="128"/>
         <source>&amp;PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="129"/>
         <source>Export as PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="132"/>
         <source>&amp;HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="133"/>
         <source>Export as HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="167"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="137"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="146"/>
         <source>&amp;Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="232"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="202"/>
         <source>Storyboard General Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="299"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="269"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="242"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="212"/>
         <source>Author</source>
         <translation type="unfinished">Autor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="247"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="217"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="266"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
         <source>Topics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="295"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="265"/>
         <source>Scene Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="304"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="274"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="309"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="279"/>
         <source>Description</source>
         <translation type="unfinished">Beschreibung</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="344"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="364"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="314"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="334"/>
         <source>Cover</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="358"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="328"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="411"/>
         <source>Storyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="390"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="360"/>
         <source>Scene</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="404"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="374"/>
         <source>Scene No %1 - Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="559"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="570"/>
         <source>Choose a directory...</source>
         <translation type="unfinished">Wählen Sie ein Verzeichnis...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Storyboard exported successfully!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>Save PDF file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>PDF file (*.pdf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="684"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="700"/>
         <source>PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="686"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="702"/>
         <source>Html</source>
         <translation type="unfinished">Html</translation>
     </message>
@@ -4973,27 +5136,27 @@
 <context>
     <name>TupSymbolEditor</name>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="85"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="74"/>
         <source>Symbol editor</source>
         <translation>Symboleditor</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="95"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="84"/>
         <source>Brushes</source>
         <translation>Pinsel</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="98"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="87"/>
         <source>Selection</source>
         <translation>Auswahl</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="101"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="90"/>
         <source>Fill</source>
         <translation>Füllung</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="104"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="93"/>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
@@ -5001,138 +5164,138 @@
 <context>
     <name>TupThemeSelector</name>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="75"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="73"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Base</source>
         <translation>Basis</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Foreground</source>
         <translation>Vordergrund</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Background</source>
         <translation>Hintergrund</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button</source>
         <translation>Knopf</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button Text</source>
         <translation>Knopftext</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="103"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="101"/>
         <source>Effects</source>
         <translation>Effekte</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Light</source>
         <translation>Hell</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Midlight</source>
         <translation>Mittelton</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Dark</source>
         <translation>Dunkel</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Mid</source>
         <translation>Mittel</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="129"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="127"/>
         <source>Selections</source>
         <translation>Auswahlen</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlight</source>
         <translation>Hervorgehobenes</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlighted Text</source>
         <translation>Hervorgehobener Text</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="150"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="148"/>
         <source>Text effects</source>
         <translation>Text Effekte</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Bright Text</source>
         <translation>Heller Text</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link</source>
         <translation>Link</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link Visited</source>
         <translation>Besuchter Link</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="171"/>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="169"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Schema</source>
         <translation>Schema</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Owner</source>
         <translation>Besitzer</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="183"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="182"/>
         <source>Save schema</source>
         <translation>Speicherungsschema</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="190"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="189"/>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="194"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="193"/>
         <source>Use this colors</source>
         <translation>Diese Farben benutzen</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Please choose a theme name</source>
         <translation>Bitte einen Namen für das Thema wählen</translation>
     </message>
@@ -5140,25 +5303,25 @@
 <context>
     <name>TupTimeLine</name>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="75"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="60"/>
         <source>Time Line</source>
         <translation>Zeitleiste</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="598"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="613"/>
         <source>Scene %1</source>
         <translation>Szene %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="538"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="553"/>
         <source>Layer %1</source>
         <translation>Bildebene %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="461"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="471"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="543"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="549"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="476"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="486"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="558"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="564"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
@@ -5166,8 +5329,8 @@
 <context>
     <name>TupToolStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="52"/>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="55"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="46"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="49"/>
         <source>Current Tool</source>
         <translation>Aktuelles Werkzeug</translation>
     </message>
@@ -5175,60 +5338,88 @@
 <context>
     <name>TupToolsDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="59"/>
         <source>Pencil</source>
         <translation type="unfinished">Stift</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="67"/>
         <source>Ink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="82"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="75"/>
         <source>Polyline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="83"/>
         <source>Ellipse</source>
         <translation type="unfinished">Ellipse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="91"/>
         <source>Rectangle</source>
         <translation type="unfinished">Rechteck</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="106"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="99"/>
         <source>Object Selection</source>
         <translation type="unfinished">Objekte auswählen</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="115"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="108"/>
+        <source>Nodes Selection</source>
         <translation type="unfinished">Auswahl Kontur</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="116"/>
         <source>Color Palette</source>
         <translation type="unfinished">Farbpalette</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="124"/>
         <source>Pen Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="132"/>
         <source>Opacity Value</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TupTwitter</name>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="270"/>
+        <source>Latest version</source>
+        <translation type="unfinished">Aktuellste Version</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="271"/>
+        <source>Revision</source>
+        <translation type="unfinished">Revision</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="272"/>
+        <source>Code Name</source>
+        <translation type="unfinished">Code Name</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="275"/>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="279"/>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupTwitterWidget</name>
     <message>
-        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="52"/>
+        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="47"/>
         <source>News!</source>
         <translation type="unfinished">Neuigkeiten!</translation>
     </message>
@@ -5236,32 +5427,32 @@
 <context>
     <name>TupViewColorCells</name>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="109"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="111"/>
         <source>Default Palette</source>
         <translation>Vordefinierte Palette</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="118"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="120"/>
         <source>Named Colors</source>
         <translation>Benannte Farben</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="125"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="127"/>
         <source>Custom Color Palette</source>
         <translation>Benutzerdefinierte Palette</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="130"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="132"/>
         <source>Custom Gradient Palette</source>
         <translation>Benutzerdefinierte Farbverlaufspalette</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="342"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="373"/>
         <source>Add Color</source>
         <translation>Farbe hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="349"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="380"/>
         <source>Remove Color</source>
         <translation>Farbe entfernen</translation>
     </message>
@@ -5269,88 +5460,40 @@
 <context>
     <name>TupWebHunter</name>
     <message>
-        <location filename="../src/libbase/tupwebhunter.cpp" line="108"/>
+        <location filename="../src/libbase/tupwebhunter.cpp" line="101"/>
         <source>Information Temporarily Unavailable</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Tupwitter</name>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Latest version</source>
-        <translation>Aktuellste Version</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Revision</source>
-        <translation>Revision</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Code Name</source>
-        <translation>Code Name</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="333"/>
-        <source>Update here!</source>
-        <translation>Aktualisieren!</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="341"/>
-        <source>This is what&apos;s happening</source>
-        <translation>Das passiert gerade</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="356"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="357"/>
-        <source>Description</source>
-        <translation>Beschreibung</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="358"/>
-        <source>Website</source>
-        <translation>Webseite</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="359"/>
-        <source>Followers</source>
-        <translation>Follower</translation>
-    </message>
-</context>
-<context>
     <name>TweenManager</name>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="66"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="56"/>
         <source>Create a new Tween</source>
         <translation>Einen neuen Tween erstellen</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Tween name already exists!</source>
         <translation>Der Tween Name existiert schon!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="189"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="179"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="191"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="181"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="194"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="184"/>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
@@ -5358,161 +5501,161 @@
 <context>
     <name>Tweener</name>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="169"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="362"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="752"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="161"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="359"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="363"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="768"/>
         <source>Position Tween</source>
         <translation>Positions Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="140"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="253"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="257"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="134"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="257"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="261"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="555"/>
         <source>Rotation Tween</source>
         <translation>Rotations Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="250"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="546"/>
         <source>Scale Tween</source>
         <translation>Skalierungs Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="126"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="227"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="231"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="503"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="117"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="230"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="502"/>
         <source>Opacity Tween</source>
         <translation>Deckkraft Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="130"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="260"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="264"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="101"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="239"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="243"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="527"/>
         <source>Coloring Tween</source>
         <translation>Farb Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
         <source>Coloring Tween can&apos;t be applied to raster images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="156"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="373"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="377"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="759"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="144"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="379"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="383"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="758"/>
         <source>Compound Tween</source>
         <translation>Verbindungs Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="375"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="381"/>
         <source>Shift+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="360"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="361"/>
         <source>Shift+W</source>
         <translation>Shift+W</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="255"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="259"/>
         <source>Shift+R</source>
         <translation>Shift+R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="252"/>
         <source>Shift+S</source>
         <translation>Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="229"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="228"/>
         <source>Shift+O</source>
         <translation>Shift+O</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="262"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="241"/>
         <source>Shift+C</source>
         <translation>Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
         <source>Coloring Tween can&apos;t be applied to SVG files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Tween name is missing!</source>
         <translation>Tween Name fehlt!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="528"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="614"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="481"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="647"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="525"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="505"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="619"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="480"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="654"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="523"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="540"/>
         <source>Frame %1</source>
         <translation>Frame %1</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Tween %1 applied!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="555"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="133"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="256"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="260"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="562"/>
         <source>Shear Tween</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="258"/>
         <source>Shift+H</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5520,88 +5663,88 @@
 <context>
     <name>TweenerPanel</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="84"/>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="127"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="119"/>
         <source>Options</source>
         <translation type="unfinished">Optionen</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="128"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="120"/>
         <source>Select object</source>
         <translation type="unfinished">Wähle Objekt</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="129"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="121"/>
         <source>Set Tweeners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="153"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="145"/>
         <source>Tweeners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Shear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Coloring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="283"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="275"/>
         <source>Save Tween</source>
         <translation type="unfinished">Speichere Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="285"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="277"/>
         <source>Cancel Tween</source>
         <translation type="unfinished">Abbrechen Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="377"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="369"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
         <source>Select objects for Tweening first!</source>
         <translation type="unfinished">Wählen Sie erst die Objekte fürs Tweening aus!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="429"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="421"/>
         <source>Update Tween</source>
         <translation type="unfinished">Aktualisiere Tween</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="431"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="423"/>
         <source>Close Tween properties</source>
         <translation type="unfinished">Schliesse Tween Einstellungen</translation>
     </message>
@@ -5609,32 +5752,32 @@
 <context>
     <name>TweenerTable</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Shear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Coloring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5642,49 +5785,49 @@
 <context>
     <name>VideoProperties</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="848"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="877"/>
         <source>Set Animation Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="860"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="889"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="861"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="890"/>
         <source>My Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="866"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="895"/>
         <source>Topics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="867"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="896"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="872"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="901"/>
         <source>Description</source>
         <translation type="unfinished">Beschreibung</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="878"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="907"/>
         <source>Just a little taste of my style :)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="939"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="959"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="968"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="988"/>
         <source>Set a title for the picture here!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="946"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="970"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="975"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="999"/>
         <source>Set some topic tags for the picture here!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5692,53 +5835,52 @@
 <context>
     <name>ViewTool</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="104"/>
         <source>Z</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="114"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="147"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="189"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="308"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="338"/>
-        <source>Hand</source>
-        <translation>Hand</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="100"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="105"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="149"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="250"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="271"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="340"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="96"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="143"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="184"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="288"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="304"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="334"/>
+        <source>Shift</source>
+        <translation>Shift</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="103"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="145"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="241"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="263"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="336"/>
         <source>Zoom In</source>
         <translation type="unfinished">Vergrössern</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="107"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="112"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="254"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="273"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="342"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="110"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="245"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="338"/>
         <source>Zoom Out</source>
         <translation type="unfinished">Verkleinern</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="111"/>
         <source>Shift+Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="97"/>
         <source>H</source>
         <translation>H</translation>
     </message>
@@ -5746,22 +5888,22 @@
 <context>
     <name>ZoomConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="54"/>
         <source>Scale Factor</source>
         <translation>Zoomfaktor</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="67"/>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Zoom Square mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Press Ctrl key + Mouse left button</source>
         <translation type="unfinished"></translation>
     </message>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_es.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_es.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_es.ts tupi-0.2+git05/src/shell/data/translations/tupi_es.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_es.ts	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_es.ts	2014-12-15 14:21:34.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es">
+<TS version="2.1" language="es">
 <context>
     <name>ButtonsPanel</name>
     <message>
@@ -82,16 +82,9 @@
         <source>Run simulation</source>
         <translation>Ejecutar Simulación</translation>
     </message>
-</context>
-<context>
-    <name>ContourSelection</name>
     <message>
-        <source>Line Selection</source>
-        <translation>Selección de Contorno</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation>N</translation>
+        <source>Papagayo LipSync Files</source>
+        <translation>Archivos de LipSync</translation>
     </message>
 </context>
 <context>
@@ -202,12 +195,13 @@
         <source>B</source>
         <translation>B</translation>
     </message>
-</context>
-<context>
-    <name>GenericExportPlugin</name>
     <message>
-        <source>Image Array</source>
-        <translation>Arreglo de Imágenes</translation>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Sorry, Groups can&apos;t be filled yet</source>
+        <translation>Los grupos de items aún no pueden ser rellenados</translation>
     </message>
 </context>
 <context>
@@ -238,6 +232,13 @@
     </message>
 </context>
 <context>
+    <name>ImagePlugin</name>
+    <message>
+        <source>Image Array</source>
+        <translation>Arreglo de Imágenes</translation>
+    </message>
+</context>
+<context>
     <name>InfoPanel</name>
     <message>
         <source>Shift + Left Mouse Button</source>
@@ -256,10 +257,6 @@
         <translation>Aplicar dimensiones de ancho/altura proporcionales</translation>
     </message>
     <message>
-        <source>Mouse Double Click</source>
-        <translation>Doble Clic</translation>
-    </message>
-    <message>
         <source>Close the line path</source>
         <translation>Terminar trazo</translation>
     </message>
@@ -275,6 +272,10 @@
         <source>Shift</source>
         <translation>Desplazamiento</translation>
     </message>
+    <message>
+        <source>Mouse Right Click</source>
+        <translation>Botón derecho del ratón</translation>
+    </message>
 </context>
 <context>
     <name>InkTool</name>
@@ -295,6 +296,58 @@
     </message>
 </context>
 <context>
+    <name>LibavPlugin</name>
+    <message>
+        <source>Video Formats</source>
+        <translation>Formatos de Vídeo</translation>
+    </message>
+</context>
+<context>
+    <name>LipSyncManager</name>
+    <message>
+        <source>Import LipSync</source>
+        <translation>Importar LipSync</translation>
+    </message>
+    <message>
+        <source>Edit LipSync</source>
+        <translation>Editar LipSync</translation>
+    </message>
+    <message>
+        <source>Remove LipSync</source>
+        <translation>Remover LipSync</translation>
+    </message>
+</context>
+<context>
+    <name>NodesTool</name>
+    <message>
+        <source>Nodes Selection</source>
+        <translation>Selección de Contorno</translation>
+    </message>
+    <message>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation>Papagayo Lip-sync</translation>
+    </message>
+    <message>
+        <source>Frame %1</source>
+        <translation>Marco %1</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>lipsync:</source>
+        <translation>lipsync:</translation>
+    </message>
+</context>
+<context>
     <name>PencilTool</name>
     <message>
         <source>Pencil</source>
@@ -306,7 +359,7 @@
     </message>
 </context>
 <context>
-    <name>PolyLine</name>
+    <name>PolyLineTool</name>
     <message>
         <source>PolyLine</source>
         <translation>Polilínea</translation>
@@ -515,6 +568,10 @@
         <source>Image Array</source>
         <translation>Arreglo de Imágenes</translation>
     </message>
+    <message>
+        <source>Video Formats</source>
+        <translation>Formatos de Vídeo</translation>
+    </message>
 </context>
 <context>
     <name>SelectScenes</name>
@@ -524,10 +581,10 @@
     </message>
 </context>
 <context>
-    <name>SelectTool</name>
+    <name>SelectionTool</name>
     <message>
-        <source>Select</source>
-        <translation>Select</translation>
+        <source>Selection</source>
+        <translation>Selección</translation>
     </message>
     <message>
         <source>Object Selection</source>
@@ -537,6 +594,14 @@
         <source>O</source>
         <translation>O</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>SVG objects can&apos;t be grouped/ungrouped yet</source>
+        <translation>Objetos SVG no pueden ser agrupados aún</translation>
+    </message>
 </context>
 <context>
     <name>Settings</name>
@@ -800,6 +865,49 @@
         <source>Options panel for the Selection tool</source>
         <translation>Panel de opciones para la herramienta de Selección</translation>
     </message>
+    <message>
+        <source>Editing</source>
+        <translation>Editando</translation>
+    </message>
+    <message>
+        <source>Mouths</source>
+        <translation>Bocas</translation>
+    </message>
+    <message>
+        <source>Close properties</source>
+        <translation>Cerrar propiedades</translation>
+    </message>
+    <message>
+        <source>Lip-Sync FPS</source>
+        <translation>FPS</translation>
+    </message>
+    <message>
+        <source>mouth</source>
+        <translation>boca</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Agrupar</translation>
+    </message>
+    <message>
+        <source>Group Objects</source>
+        <translation>Agrupar Objetos</translation>
+    </message>
+    <message>
+        <source>Ungroup Objects</source>
+        <translation>Desagrupar Objetos</translation>
+    </message>
+</context>
+<context>
+    <name>ShiftTool</name>
+    <message>
+        <source>Shift</source>
+        <translation>Desplazar</translation>
+    </message>
+    <message>
+        <source>H</source>
+        <translation>H</translation>
+    </message>
 </context>
 <context>
     <name>SpinControl</name>
@@ -1076,6 +1184,10 @@
         <source>Can&apos;t create pictures directory</source>
         <translation>No se puede crear el directorio de imágenes</translation>
     </message>
+    <message>
+        <source>Close manager</source>
+        <translation>Cerrar interfaz</translation>
+    </message>
 </context>
 <context>
     <name>TupCameraBar</name>
@@ -1205,6 +1317,10 @@
         <source>Can&apos;t create pictures directory</source>
         <translation>No se puede crear el directorio de imágenes</translation>
     </message>
+    <message>
+        <source>Close manager</source>
+        <translation>Cerrar interfaz</translation>
+    </message>
 </context>
 <context>
     <name>TupCameraStatus</name>
@@ -1253,6 +1369,25 @@
     </message>
 </context>
 <context>
+    <name>TupCameraWindow</name>
+    <message>
+        <source>General Camera error</source>
+        <translation>Error general de cámara</translation>
+    </message>
+    <message>
+        <source>Camera invalid request error</source>
+        <translation>Error de solicitud invalida</translation>
+    </message>
+    <message>
+        <source>Camera service missing error</source>
+        <translation>Error de servicio ausente</translation>
+    </message>
+    <message>
+        <source>Camera not supported error</source>
+        <translation>Error de camara no soportada</translation>
+    </message>
+</context>
+<context>
     <name>TupCanvas</name>
     <message>
         <source>Sketch Tools</source>
@@ -1283,8 +1418,8 @@
         <translation>Alejar</translation>
     </message>
     <message>
-        <source>Hand</source>
-        <translation>Mano</translation>
+        <source>Shift</source>
+        <translation>Desplazar</translation>
     </message>
     <message>
         <source>Pen Properties</source>
@@ -1351,7 +1486,7 @@
         <translation>Selección de Objetos</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selección de Contorno</translation>
     </message>
     <message>
@@ -1412,6 +1547,10 @@
         <source>Fill</source>
         <translation>Relleno</translation>
     </message>
+    <message>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
 </context>
 <context>
     <name>TupColorValue</name>
@@ -1523,22 +1662,6 @@
         <translation>Eliminar</translation>
     </message>
     <message>
-        <source>&amp;Group</source>
-        <translation>&amp;Agrupar</translation>
-    </message>
-    <message>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <source>&amp;Ungroup</source>
-        <translation>&amp;Desagrupar</translation>
-    </message>
-    <message>
-        <source>Ctrl+Shift+G</source>
-        <translation>Ctrl+Shift+G</translation>
-    </message>
-    <message>
         <source>Onion Skin</source>
         <translation>Papel cebolla</translation>
     </message>
@@ -1567,18 +1690,6 @@
         <translation>Brochas</translation>
     </message>
     <message>
-        <source>Selection</source>
-        <translation>Selección</translation>
-    </message>
-    <message>
-        <source>Fill</source>
-        <translation>Relleno</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
         <source>Tweening</source>
         <translation>Tweening</translation>
     </message>
@@ -1595,10 +1706,6 @@
         <translation>Tinta</translation>
     </message>
     <message>
-        <source>Eraser</source>
-        <translation>Borrador</translation>
-    </message>
-    <message>
         <source>PolyLine</source>
         <translation>Polilínea</translation>
     </message>
@@ -1651,20 +1758,12 @@
         <translation>Relleno Interno</translation>
     </message>
     <message>
-        <source>Zoom In</source>
-        <translation>Acercar</translation>
-    </message>
-    <message>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <source>Zoom Out</source>
-        <translation>Alejar</translation>
-    </message>
-    <message>
-        <source>Hand</source>
-        <translation>Mano</translation>
+        <source>Shift</source>
+        <translation>Desplazar</translation>
     </message>
     <message>
         <source>Paint area actions</source>
@@ -1770,6 +1869,47 @@
         <source>Frame %1</source>
         <translation>Marco %1</translation>
     </message>
+    <message>
+        <source>Nodes Selection</source>
+        <translation>Selección de Contorno</translation>
+    </message>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation>Papagayo Lip-sync</translation>
+    </message>
+    <message>
+        <source>Papagayo file has been imported successfully</source>
+        <translation>El archivo PGO ha sido importado satisfactoriamente</translation>
+    </message>
+    <message>
+        <source>Papagayo Lip-sync Files</source>
+        <translation>Archivos de Lip-sync</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Line fill</source>
+        <translation>Relleno de Contorno</translation>
+    </message>
+    <message>
+        <source>Papagayo project already exists!
+Please, rename the project&apos;s file</source>
+        <translation>El proyecto de Lip-sync ya existe! Por favor, renombre el archivo</translation>
+    </message>
+    <message>
+        <source>Papagayo file is invalid!</source>
+        <translation>Archivo de Lip-sync es invalido!</translation>
+    </message>
+    <message>
+        <source>Images directory is empty!</source>
+        <translation>Directorio de imágenes está vacio!</translation>
+    </message>
+    <message>
+        <source>Papagayo project is invalid!</source>
+        <translation>Proyecto Papagayo es inválido!</translation>
+    </message>
 </context>
 <context>
     <name>TupExportWidget</name>
@@ -1890,10 +2030,6 @@
         <translation>Pegar en marco</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation>Expandir</translation>
-    </message>
-    <message>
         <source>1 frame</source>
         <translation>1 marco</translation>
     </message>
@@ -2000,12 +2136,8 @@
         <translation>/Paso: </translation>
     </message>
     <message>
-        <source>Zoom In</source>
-        <translation>Acercar</translation>
-    </message>
-    <message>
-        <source>Zoom Out</source>
-        <translation>Alejar</translation>
+        <source>lipsync:</source>
+        <translation>lipsync:</translation>
     </message>
 </context>
 <context>
@@ -2200,6 +2332,10 @@
         <source>Compound Tween</source>
         <translation>Tween Compuesto</translation>
     </message>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation>Papagayo Lip-sync</translation>
+    </message>
 </context>
 <context>
     <name>TupLayer</name>
@@ -2404,6 +2540,34 @@
         <source>Import SVG files...</source>
         <translation>Importar archivos SVG...</translation>
     </message>
+    <message>
+        <source>Sound File</source>
+        <translation>Archivo de Sonido</translation>
+    </message>
+    <message>
+        <source>Library is empty!</source>
+        <translation>Biblioteca está vacía!</translation>
+    </message>
+    <message>
+        <source>There&apos;s no current selection!</source>
+        <translation>No hay selección activa!</translation>
+    </message>
+    <message>
+        <source>It&apos;s a directory! Please, pick a graphic object</source>
+        <translation>Es un directorio! Por favor, escoja un objeto gráfico</translation>
+    </message>
+    <message>
+        <source>It&apos;s a sound file! Please, pick a graphic object</source>
+        <translation>Es un archivo de sonido! Por favor, escoja un objeto gráfico</translation>
+    </message>
+    <message>
+        <source>Sounds</source>
+        <translation>Sonidos</translation>
+    </message>
+    <message>
+        <source>Error while opening file: %1</source>
+        <translation>Error mientras se abría el archivo: %1</translation>
+    </message>
 </context>
 <context>
     <name>TupListProjectDialog</name>
@@ -2842,6 +3006,18 @@
         <source>Gimp Palette (*.gpl *.txt *.css)</source>
         <translation>Paleta Gimp (*.gpl *.txt *.css)</translation>
     </message>
+    <message>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation>&amp;Importar Papagayo Lip-sync</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Import Papagayo lip-sync</source>
+        <translation>Importar Papagayo lip-sync</translation>
+    </message>
 </context>
 <context>
     <name>TupNetProjectManagerHandler</name>
@@ -3159,7 +3335,7 @@
         <translation>Lapiz</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selección de Contorno</translation>
     </message>
     <message>
@@ -3234,10 +3410,6 @@
 <context>
     <name>TupPaintAreaBase</name>
     <message>
-        <source>OpenGL isn&apos;t supported</source>
-        <translation>OpenGL no es soportado</translation>
-    </message>
-    <message>
         <source>Locked!</source>
         <translation>Bloqueado!</translation>
     </message>
@@ -3343,6 +3515,65 @@
         <source>F11</source>
         <translation>F11</translation>
     </message>
+    <message>
+        <source>Reset WorkSpace</source>
+        <translation>Reiniciar Área de Trabajo</translation>
+    </message>
+</context>
+<context>
+    <name>TupPapagayoDialog</name>
+    <message>
+        <source>Import Papagayo project</source>
+        <translation>Importar proyecto Papagayo</translation>
+    </message>
+    <message>
+        <source>&amp;Load PGO File</source>
+        <translation>&amp;Cargar Archivo PGO</translation>
+    </message>
+    <message>
+        <source>Load &amp;Images</source>
+        <translation>Cargar &amp;Imágenes</translation>
+    </message>
+    <message>
+        <source>Load &amp;Sound</source>
+        <translation>Cargar&amp;Sonido</translation>
+    </message>
+    <message>
+        <source>Load Papagayo project</source>
+        <translation>Cargar proyecto de Papagayo</translation>
+    </message>
+    <message>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation>Proyecto Papagayo (*.pgo)</translation>
+    </message>
+    <message>
+        <source>Choose the images directory...</source>
+        <translation>Escoge el directorio de imágenes...</translation>
+    </message>
+    <message>
+        <source>Load sound file</source>
+        <translation>Cargar archivo de sonido</translation>
+    </message>
+    <message>
+        <source>Sound file (*.ogg *.wav *.mp3)</source>
+        <translation>Archivo de Sonido (*.ogg *.wav *.mp3)</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>PGO path is unset!</source>
+        <translation>La ruta del archivo PGO no ha sido definido!</translation>
+    </message>
+    <message>
+        <source>Images directory is unset!</source>
+        <translation>El directorio de imágenes no ha sido definido!</translation>
+    </message>
+    <message>
+        <source>Sound path is unset!</source>
+        <translation>La ruta del archivo de sonido no ha sido definido!</translation>
+    </message>
 </context>
 <context>
     <name>TupPenDialog</name>
@@ -3487,22 +3718,10 @@
         <translation>Insertar marco</translation>
     </message>
     <message>
-        <source>Remove the frame</source>
-        <translation>Remueve el marco</translation>
-    </message>
-    <message>
-        <source>Move frame up</source>
-        <translation>Mover marco hacia arriba</translation>
-    </message>
-    <message>
         <source>F9</source>
         <translation>F9</translation>
     </message>
     <message>
-        <source>Move frame down</source>
-        <translation>Mover marco hacia abajo</translation>
-    </message>
-    <message>
         <source>F10</source>
         <translation>F10</translation>
     </message>
@@ -3511,18 +3730,10 @@
         <translation>Bloquear marco</translation>
     </message>
     <message>
-        <source>Insert a layer</source>
-        <translation>Adiciona una capa</translation>
-    </message>
-    <message>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <source>Remove the layer</source>
-        <translation>Remueve una capa</translation>
-    </message>
-    <message>
         <source>F6</source>
         <translation>F6</translation>
     </message>
@@ -3539,14 +3750,6 @@
         <translation>Bloquea capa</translation>
     </message>
     <message>
-        <source>Insert a scene</source>
-        <translation>Adiciona una escena</translation>
-    </message>
-    <message>
-        <source>Remove the scene</source>
-        <translation>Remueve una escena</translation>
-    </message>
-    <message>
         <source>Do you want to remove this frame?</source>
         <translation>Desea eliminar este marco?</translation>
     </message>
@@ -3578,6 +3781,34 @@
         <source>Lock scene</source>
         <translation>Bloquear escena</translation>
     </message>
+    <message>
+        <source>Insert layer</source>
+        <translation>Insertar capa</translation>
+    </message>
+    <message>
+        <source>Remove layer</source>
+        <translation>Eliminar capa</translation>
+    </message>
+    <message>
+        <source>Remove frame</source>
+        <translation>Remover marco</translation>
+    </message>
+    <message>
+        <source>Move frame backward</source>
+        <translation>Mover marco hacia adelante</translation>
+    </message>
+    <message>
+        <source>Move frame forward</source>
+        <translation>Mover marco hacia atrás</translation>
+    </message>
+    <message>
+        <source>Insert scene</source>
+        <translation>Insertar escena</translation>
+    </message>
+    <message>
+        <source>Remove scene</source>
+        <translation>Remover escena</translation>
+    </message>
 </context>
 <context>
     <name>TupProjectManager</name>
@@ -3640,10 +3871,10 @@
     </message>
 </context>
 <context>
-    <name>TupScreen</name>
+    <name>TupSoundPlayer</name>
     <message>
-        <source>Rendering...</source>
-        <translation>Renderizando...</translation>
+        <source>Play</source>
+        <translation>Reproducir</translation>
     </message>
 </context>
 <context>
@@ -3947,7 +4178,7 @@
         <translation>Selección de Objetos</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selección de Contorno</translation>
     </message>
     <message>
@@ -3964,6 +4195,29 @@
     </message>
 </context>
 <context>
+    <name>TupTwitter</name>
+    <message>
+        <source>Latest version</source>
+        <translation>Última versión</translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation>Revisión</translation>
+    </message>
+    <message>
+        <source>Code Name</source>
+        <translation>Nombre código</translation>
+    </message>
+    <message>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation>Es momento de actulizar! Haga clic aquí!</translation>
+    </message>
+    <message>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation>Quiere ayudarnos a mejorar? Haga clic aquí!</translation>
+    </message>
+</context>
+<context>
     <name>TupTwitterWidget</name>
     <message>
         <source>News!</source>
@@ -4005,45 +4259,6 @@
     </message>
 </context>
 <context>
-    <name>Tupwitter</name>
-    <message>
-        <source>Latest version</source>
-        <translation>Última versión</translation>
-    </message>
-    <message>
-        <source>Revision</source>
-        <translation>Revisión</translation>
-    </message>
-    <message>
-        <source>Code Name</source>
-        <translation>Nombre código</translation>
-    </message>
-    <message>
-        <source>Update here!</source>
-        <translation>Actualiza aquí!</translation>
-    </message>
-    <message>
-        <source>This is what&apos;s happening</source>
-        <translation>Esto es lo que está sucediendo</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation>Descripción</translation>
-    </message>
-    <message>
-        <source>Website</source>
-        <translation>Sitio Web</translation>
-    </message>
-    <message>
-        <source>Followers</source>
-        <translation>Seguidores</translation>
-    </message>
-</context>
-<context>
     <name>TweenManager</name>
     <message>
         <source>Create a new Tween</source>
@@ -4295,33 +4510,6 @@
     </message>
 </context>
 <context>
-    <name>ViewTool</name>
-    <message>
-        <source>Z</source>
-        <translation>Z</translation>
-    </message>
-    <message>
-        <source>Hand</source>
-        <translation>Mano</translation>
-    </message>
-    <message>
-        <source>H</source>
-        <translation>H</translation>
-    </message>
-    <message>
-        <source>Zoom In</source>
-        <translation>Acercar</translation>
-    </message>
-    <message>
-        <source>Zoom Out</source>
-        <translation>Alejar</translation>
-    </message>
-    <message>
-        <source>Shift+Z</source>
-        <translation>Shift+Z</translation>
-    </message>
-</context>
-<context>
     <name>ZoomConfigurator</name>
     <message>
         <source>Scale Factor</source>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_gl.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_gl.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_gl.ts tupi-0.2+git05/src/shell/data/translations/tupi_gl.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_gl.ts	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_gl.ts	2014-12-15 14:21:34.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="gl">
+<TS version="2.1" language="gl">
 <context>
     <name>ButtonsPanel</name>
     <message>
@@ -84,17 +84,6 @@
     </message>
 </context>
 <context>
-    <name>ContourSelection</name>
-    <message>
-        <source>Line Selection</source>
-        <translation>Selección de contorno</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-</context>
-<context>
     <name>EraserTool</name>
     <message>
         <source>Eraser</source>
@@ -204,13 +193,6 @@
     </message>
 </context>
 <context>
-    <name>GenericExportPlugin</name>
-    <message>
-        <source>Image Array</source>
-        <translation>Contedor de imaxes</translation>
-    </message>
-</context>
-<context>
     <name>GeometricTool</name>
     <message>
         <source>Rectangle</source>
@@ -238,16 +220,19 @@
     </message>
 </context>
 <context>
+    <name>ImagePlugin</name>
+    <message>
+        <source>Image Array</source>
+        <translation type="unfinished">Contedor de imaxes</translation>
+    </message>
+</context>
+<context>
     <name>InfoPanel</name>
     <message>
         <source>Tips</source>
         <translation>Consellos</translation>
     </message>
     <message>
-        <source>Mouse Double Click</source>
-        <translation>Premer dúas veces co rato</translation>
-    </message>
-    <message>
         <source>Close the line path</source>
         <translation>Pechar a liña de ruta</translation>
     </message>
@@ -275,6 +260,10 @@
         <source>X key or Right mouse button</source>
         <translation>Tecla X ou botón dereito do rato</translation>
     </message>
+    <message>
+        <source>Mouse Right Click</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InkTool</name>
@@ -295,6 +284,48 @@
     </message>
 </context>
 <context>
+    <name>NodesTool</name>
+    <message>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Selección de contorno</translation>
+    </message>
+    <message>
+        <source>N</source>
+        <translation type="unfinished">N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift+R</source>
+        <translation type="unfinished">Maiús+R</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Produciuse un erro</translation>
+    </message>
+    <message>
+        <source>Tween name is missing!</source>
+        <translation type="unfinished">Non se atopa o nome da interpolación!</translation>
+    </message>
+    <message>
+        <source>Frame %1</source>
+        <translation type="unfinished">Fotograma %1</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished">Información</translation>
+    </message>
+    <message>
+        <source>Tween %1 applied!</source>
+        <translation type="unfinished">Aplicouse a interpolación %1!</translation>
+    </message>
+</context>
+<context>
     <name>PencilTool</name>
     <message>
         <source>Pencil</source>
@@ -306,14 +337,14 @@
     </message>
 </context>
 <context>
-    <name>PolyLine</name>
+    <name>PolyLineTool</name>
     <message>
         <source>PolyLine</source>
-        <translation>Poliliña</translation>
+        <translation type="unfinished">Poliliña</translation>
     </message>
     <message>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished">S</translation>
     </message>
 </context>
 <context>
@@ -524,18 +555,18 @@
     </message>
 </context>
 <context>
-    <name>SelectTool</name>
+    <name>SelectionTool</name>
     <message>
-        <source>Select</source>
-        <translation>Seleccionar</translation>
+        <source>Selection</source>
+        <translation type="unfinished">Selección</translation>
     </message>
     <message>
         <source>Object Selection</source>
-        <translation>Selección de obxectos</translation>
+        <translation type="unfinished">Selección de obxectos</translation>
     </message>
     <message>
         <source>O</source>
-        <translation>O</translation>
+        <translation type="unfinished">O</translation>
     </message>
 </context>
 <context>
@@ -1076,6 +1107,10 @@
         <source>Can&apos;t create pictures directory</source>
         <translation>Non foi posíbel crear o directorio de imaxes!</translation>
     </message>
+    <message>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupCameraBar</name>
@@ -1205,6 +1240,10 @@
         <source>Can&apos;t create pictures directory</source>
         <translation>Non foi posíbel crear o directorio de imaxes!</translation>
     </message>
+    <message>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupCameraStatus</name>
@@ -1253,6 +1292,25 @@
     </message>
 </context>
 <context>
+    <name>TupCameraWindow</name>
+    <message>
+        <source>General Camera error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera invalid request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera service missing error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera not supported error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupCanvas</name>
     <message>
         <source>Tupi: Open 2D Magic</source>
@@ -1291,7 +1349,7 @@
         <translation>Afastar</translation>
     </message>
     <message>
-        <source>Hand</source>
+        <source>Shift</source>
         <translation>Man</translation>
     </message>
     <message>
@@ -1363,7 +1421,7 @@
         <translation>Selección de obxectos</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selección de contorno</translation>
     </message>
     <message>
@@ -1575,10 +1633,6 @@
         <translation>Recheo</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
         <source>Tweening</source>
         <translation>Interpolación</translation>
     </message>
@@ -1663,7 +1717,7 @@
         <translation>Afastar</translation>
     </message>
     <message>
-        <source>Hand</source>
+        <source>Shift</source>
         <translation>Man</translation>
     </message>
     <message>
@@ -1770,6 +1824,18 @@
         <source>Frame %1</source>
         <translation>Fotograma %1</translation>
     </message>
+    <message>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Selección de contorno</translation>
+    </message>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo file has been imported successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupExportWidget</name>
@@ -2200,6 +2266,10 @@
         <source>Compound Tween</source>
         <translation>Composición da interpolación</translation>
     </message>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupLayer</name>
@@ -2843,6 +2913,30 @@
         <source>Shift+G</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Papagayo lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Papagayo project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo project is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupNetProjectManagerHandler</name>
@@ -3148,7 +3242,7 @@
         <translation>Lapis</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selección de contorno</translation>
     </message>
     <message>
@@ -3235,10 +3329,6 @@
 <context>
     <name>TupPaintAreaBase</name>
     <message>
-        <source>OpenGL isn&apos;t supported</source>
-        <translation>Sen compatibilidade con OpenGL</translation>
-    </message>
-    <message>
         <source>Locked!</source>
         <translation>Bloqueado!</translation>
     </message>
@@ -3948,7 +4038,7 @@
         <translation>Selección de obxectos</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selección de contorno</translation>
     </message>
     <message>
@@ -3965,6 +4055,29 @@
     </message>
 </context>
 <context>
+    <name>TupTwitter</name>
+    <message>
+        <source>Latest version</source>
+        <translation type="unfinished">Última versión</translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished">Revisión</translation>
+    </message>
+    <message>
+        <source>Code Name</source>
+        <translation type="unfinished">Nome en clave</translation>
+    </message>
+    <message>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupTwitterWidget</name>
     <message>
         <source>News!</source>
@@ -4006,45 +4119,6 @@
     </message>
 </context>
 <context>
-    <name>Tupwitter</name>
-    <message>
-        <source>Latest version</source>
-        <translation>Última versión</translation>
-    </message>
-    <message>
-        <source>Revision</source>
-        <translation>Revisión</translation>
-    </message>
-    <message>
-        <source>Code Name</source>
-        <translation>Nome en clave</translation>
-    </message>
-    <message>
-        <source>Update here!</source>
-        <translation>Actualizar de aquí!</translation>
-    </message>
-    <message>
-        <source>This is what&apos;s happening</source>
-        <translation>Isto é o que está a acontecer</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation>Descrición</translation>
-    </message>
-    <message>
-        <source>Website</source>
-        <translation>Páxina web</translation>
-    </message>
-    <message>
-        <source>Followers</source>
-        <translation>Seguidores</translation>
-    </message>
-</context>
-<context>
     <name>TweenManager</name>
     <message>
         <source>Create a new Tween</source>
@@ -4298,7 +4372,7 @@
 <context>
     <name>ViewTool</name>
     <message>
-        <source>Hand</source>
+        <source>Shift</source>
         <translation>Man</translation>
     </message>
     <message>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_it.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_it.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_it.ts tupi-0.2+git05/src/shell/data/translations/tupi_it.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_it.ts	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_it.ts	2014-12-15 14:21:34.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="it_IT" sourcelanguage="en_US">
+<TS version="2.1" language="it_IT" sourcelanguage="en_US">
 <context>
     <name>ButtonsPanel</name>
     <message>
@@ -84,17 +84,6 @@
     </message>
 </context>
 <context>
-    <name>ContourSelection</name>
-    <message>
-        <source>Line Selection</source>
-        <translation>Selezione di una linea</translation>
-    </message>
-    <message>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-</context>
-<context>
     <name>EraserTool</name>
     <message>
         <source>Eraser</source>
@@ -204,13 +193,6 @@
     </message>
 </context>
 <context>
-    <name>GenericExportPlugin</name>
-    <message>
-        <source>Image Array</source>
-        <translation type="unfinished">Serie di immagini</translation>
-    </message>
-</context>
-<context>
     <name>GeometricTool</name>
     <message>
         <source>Rectangle</source>
@@ -238,6 +220,13 @@
     </message>
 </context>
 <context>
+    <name>ImagePlugin</name>
+    <message>
+        <source>Image Array</source>
+        <translation type="unfinished">Serie di immagini</translation>
+    </message>
+</context>
+<context>
     <name>InfoPanel</name>
     <message>
         <source>Tips</source>
@@ -248,10 +237,6 @@
         <translation>Shift + Pulsante sinistro del mouse</translation>
     </message>
     <message>
-        <source>Mouse Double Click</source>
-        <translation>Doppio clic</translation>
-    </message>
-    <message>
         <source>Close the line path</source>
         <translation>Chiudi percorso</translation>
     </message>
@@ -275,6 +260,10 @@
         <source>X key or Right mouse button</source>
         <translation>Tasto X o pulsante destro del mouse</translation>
     </message>
+    <message>
+        <source>Mouse Right Click</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InkTool</name>
@@ -295,6 +284,48 @@
     </message>
 </context>
 <context>
+    <name>NodesTool</name>
+    <message>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Selezione di una linea</translation>
+    </message>
+    <message>
+        <source>N</source>
+        <translation type="unfinished">N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift+R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Errore</translation>
+    </message>
+    <message>
+        <source>Tween name is missing!</source>
+        <translation type="unfinished">Manca il nome dell&apos;intercalazione!</translation>
+    </message>
+    <message>
+        <source>Frame %1</source>
+        <translation type="unfinished">Fotogramma %1</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tween %1 applied!</source>
+        <translation type="unfinished">Intercalazione %1 applicata!</translation>
+    </message>
+</context>
+<context>
     <name>PencilTool</name>
     <message>
         <source>Pencil</source>
@@ -306,14 +337,14 @@
     </message>
 </context>
 <context>
-    <name>PolyLine</name>
+    <name>PolyLineTool</name>
     <message>
         <source>PolyLine</source>
-        <translation>Polilinea</translation>
+        <translation type="unfinished">Polilinea</translation>
     </message>
     <message>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished">S</translation>
     </message>
 </context>
 <context>
@@ -524,18 +555,18 @@
     </message>
 </context>
 <context>
-    <name>SelectTool</name>
+    <name>SelectionTool</name>
     <message>
-        <source>Select</source>
-        <translation>Seleziona</translation>
+        <source>Selection</source>
+        <translation type="unfinished">Selezione</translation>
     </message>
     <message>
         <source>Object Selection</source>
-        <translation>Selezione di un oggetto</translation>
+        <translation type="unfinished">Selezione di un oggetto</translation>
     </message>
     <message>
         <source>O</source>
-        <translation>O</translation>
+        <translation type="unfinished">O</translation>
     </message>
 </context>
 <context>
@@ -1076,6 +1107,10 @@
         <source>Can&apos;t create pictures directory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupCameraBar</name>
@@ -1205,6 +1240,10 @@
         <source>Can&apos;t create pictures directory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupCameraStatus</name>
@@ -1253,6 +1292,25 @@
     </message>
 </context>
 <context>
+    <name>TupCameraWindow</name>
+    <message>
+        <source>General Camera error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera invalid request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera service missing error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera not supported error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupCanvas</name>
     <message>
         <source>Sketch Tools</source>
@@ -1283,7 +1341,7 @@
         <translation>Riduci</translation>
     </message>
     <message>
-        <source>Hand</source>
+        <source>Shift</source>
         <translation type="unfinished">Mano</translation>
     </message>
     <message>
@@ -1363,7 +1421,7 @@
         <translation type="unfinished">Selezione di un oggetto</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation type="unfinished">Selezione di una linea</translation>
     </message>
     <message>
@@ -1575,10 +1633,6 @@
         <translation type="unfinished">Riempimento</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished">Vista</translation>
-    </message>
-    <message>
         <source>Tweening</source>
         <translation type="unfinished">Intercalazione</translation>
     </message>
@@ -1663,7 +1717,7 @@
         <translation type="unfinished">Riduci</translation>
     </message>
     <message>
-        <source>Hand</source>
+        <source>Shift</source>
         <translation type="unfinished">Mano</translation>
     </message>
     <message>
@@ -1770,6 +1824,18 @@
         <source>Frame %1</source>
         <translation type="unfinished">Fotogramma %1</translation>
     </message>
+    <message>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Selezione di una linea</translation>
+    </message>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo file has been imported successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupExportWidget</name>
@@ -2200,6 +2266,10 @@
         <source>Compound Tween</source>
         <translation>Intercalazione composta</translation>
     </message>
+    <message>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupLayer</name>
@@ -2838,6 +2908,30 @@
         <source>Shift+G</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Papagayo lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Papagayo project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Papagayo project is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupNetProjectManagerHandler</name>
@@ -3111,7 +3205,7 @@
         <translation>Matita</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selezione di una linea</translation>
     </message>
     <message>
@@ -3230,10 +3324,6 @@
 <context>
     <name>TupPaintAreaBase</name>
     <message>
-        <source>OpenGL isn&apos;t supported</source>
-        <translation>OpenGL non supportato</translation>
-    </message>
-    <message>
         <source>No Scene!</source>
         <translation>Nessuna scena!</translation>
     </message>
@@ -3943,7 +4033,7 @@
         <translation>Selezione di un oggetto</translation>
     </message>
     <message>
-        <source>Line Selection</source>
+        <source>Nodes Selection</source>
         <translation>Selezione di una linea</translation>
     </message>
     <message>
@@ -3960,6 +4050,29 @@
     </message>
 </context>
 <context>
+    <name>TupTwitter</name>
+    <message>
+        <source>Latest version</source>
+        <translation type="unfinished">Ultima versione</translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished">Revisione</translation>
+    </message>
+    <message>
+        <source>Code Name</source>
+        <translation type="unfinished">Nome in codice</translation>
+    </message>
+    <message>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupTwitterWidget</name>
     <message>
         <source>News!</source>
@@ -4001,45 +4114,6 @@
     </message>
 </context>
 <context>
-    <name>Tupwitter</name>
-    <message>
-        <source>Latest version</source>
-        <translation>Ultima versione</translation>
-    </message>
-    <message>
-        <source>Revision</source>
-        <translation>Revisione</translation>
-    </message>
-    <message>
-        <source>Code Name</source>
-        <translation>Nome in codice</translation>
-    </message>
-    <message>
-        <source>Update here!</source>
-        <translation>Aggiorna qui!</translation>
-    </message>
-    <message>
-        <source>This is what&apos;s happening</source>
-        <translation>Questo è ciò che sta accadendo</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation>Descrizione</translation>
-    </message>
-    <message>
-        <source>Website</source>
-        <translation>Sito web</translation>
-    </message>
-    <message>
-        <source>Followers</source>
-        <translation>Seguaci</translation>
-    </message>
-</context>
-<context>
     <name>TweenManager</name>
     <message>
         <source>Create a new Tween</source>
@@ -4301,7 +4375,7 @@
         <translation>Riduci</translation>
     </message>
     <message>
-        <source>Hand</source>
+        <source>Shift</source>
         <translation>Mano</translation>
     </message>
     <message>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_ja.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_ja.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_ja.ts tupi-0.2+git05/src/shell/data/translations/tupi_ja.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_ja.ts	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_ja.ts	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,5777 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ja_JP" sourcelanguage="en_US">
+<context>
+    <name>ButtonsPanel</name>
+    <message>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="41"/>
+        <source>Edit Tween</source>
+        <translation>トゥイーンを編集</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="45"/>
+        <source>Remove Tween</source>
+        <translation>トゥイーンを削除</translation>
+    </message>
+</context>
+<context>
+    <name>Configurator</name>
+    <message>
+        <location filename="../src/plugins/tools/position/configurator.cpp" line="80"/>
+        <source>Position Tween</source>
+        <translation>位置トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/configurator.cpp" line="70"/>
+        <source>Rotation Tween</source>
+        <translation>回転トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/configurator.cpp" line="70"/>
+        <source>Scale Tween</source>
+        <translation>拡大/縮小トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/configurator.cpp" line="70"/>
+        <source>Opacity Tween</source>
+        <translation>不透明度トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/configurator.cpp" line="66"/>
+        <source>Coloring Tween</source>
+        <translation>彩色トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/configurator.cpp" line="71"/>
+        <source>Compound Tween</source>
+        <translation>複合トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="121"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="112"/>
+        <source>Smoothness</source>
+        <translation>なめらかさ</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="48"/>
+        <source>This tool is just a &lt;b&gt;proof-of-concept&lt;/b&gt; of the basic algorithm for the Tupi&apos;s free-tracing vectorial brushes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="58"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="52"/>
+        <source>Parameters</source>
+        <translation>パラメータ</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="58"/>
+        <source>Structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="63"/>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="64"/>
+        <source>Axial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="65"/>
+        <source>Organic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="80"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="72"/>
+        <source>Dot Spacing</source>
+        <translation>ドットの間隔</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="96"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="88"/>
+        <source>Size Tolerance</source>
+        <translation>サイズの変化範囲</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="104"/>
+        <source>Run simulation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/shear/configurator.cpp" line="70"/>
+        <source>Shear Tween</source>
+        <translation>せん断変形トゥイーン</translation>
+    </message>
+</context>
+<context>
+    <name>EraserTool</name>
+    <message>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="49"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="54"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="58"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="79"/>
+        <source>Eraser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="55"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+</context>
+<context>
+    <name>ExportTo</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="469"/>
+        <source>Image name prefix: </source>
+        <translation>画像名の接頭辞: </translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="477"/>
+        <source>File: </source>
+        <translation>ファイル: </translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="474"/>
+        <source>Directory: </source>
+        <translation>ディレクトリ: </translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="459"/>
+        <source>Enable background transparency</source>
+        <translation>背景を透過させる</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="516"/>
+        <source>i.e. &lt;B&gt;%1&lt;/B&gt;01.png / &lt;B&gt;%1&lt;/B&gt;01.jpg</source>
+        <translation>例: &lt;B&gt;%1&lt;/B&gt;01.png / &lt;B&gt;%1&lt;/B&gt;01.jpg</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="530"/>
+        <source>Size</source>
+        <translation>サイズ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="541"/>
+        <source>Configuration</source>
+        <translation>構成設定</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="555"/>
+        <source>FPS</source>
+        <translation>フレーム/秒</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="649"/>
+        <source>Choose a file name...</source>
+        <translation>ファイル名を入力...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="663"/>
+        <source>Choose a directory...</source>
+        <translation>ディレクトリを選択...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="741"/>
+        <source>Warning!</source>
+        <translation>警告！</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="742"/>
+        <source>File exists. Overwrite it?</source>
+        <translation>ファイルが存在します。上書きしますか？</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
+        <source>Images name prefix can&apos;t be empty! Please, type a prefix.</source>
+        <translation>画像名の接頭辞を空白にすることはできません！接頭辞を入力してください。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
+        <source>Directory doesn&apos;t exist! Please, choose another path.</source>
+        <translation>ディレクトリが存在しません！他の場所を指定してください。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
+        <source>You have no permission to create this file. Please, choose another path.</source>
+        <translation>このファイルを作成する権限がありません。他の場所を指定してください。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
+        <source>Format problem. Tupi Internal error.</source>
+        <translation>Tupi の内部エラーによりフォーマットの問題が発生しました。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="825"/>
+        <source>Information</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="829"/>
+        <source>ERROR!</source>
+        <translation>エラー！</translation>
+    </message>
+</context>
+<context>
+    <name>FillTool</name>
+    <message>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="80"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="84"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="177"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="278"/>
+        <source>Internal fill</source>
+        <translation>内側を塗りつぶす</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="86"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="90"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="179"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="280"/>
+        <source>Line fill</source>
+        <translation>線を塗りつぶす</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="81"/>
+        <source>I</source>
+        <translation>I</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="87"/>
+        <source>B</source>
+        <translation>B</translation>
+    </message>
+</context>
+<context>
+    <name>GeometricTool</name>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="113"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="118"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="149"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="209"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="222"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="285"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="308"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="339"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="386"/>
+        <source>Rectangle</source>
+        <translation>矩形</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="125"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="311"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="341"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="388"/>
+        <source>Ellipse</source>
+        <translation>楕円</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="132"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="163"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="315"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="390"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="460"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="467"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="474"/>
+        <source>Line</source>
+        <translation>直線</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="114"/>
+        <source>R</source>
+        <translation>R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="121"/>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="128"/>
+        <source>L</source>
+        <translation>L</translation>
+    </message>
+</context>
+<context>
+    <name>ImagePlugin</name>
+    <message>
+        <location filename="../src/plugins/export/imageplugin/imageplugin.cpp" line="48"/>
+        <source>Image Array</source>
+        <translation>連番画像</translation>
+    </message>
+</context>
+<context>
+    <name>InfoPanel</name>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="43"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="51"/>
+        <source>Tips</source>
+        <translation>ヒント</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
+        <source>Shift + Left Mouse Button</source>
+        <translation>Shift + 左マウスボタン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
+        <source>Close line</source>
+        <translation>線の編集を終了</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
+        <source>X key or Right mouse button</source>
+        <translation>X キーまたは右マウスボタン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Close the line path</source>
+        <translation>線の編集を終了</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Mouse Right Click</source>
+        <translation>マウス右クリック</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
+        <source>Shift</source>
+        <translation>Shift</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
+        <source>Align line to horizontal/vertical axis</source>
+        <translation>線を水平/垂直方向に固定</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
+        <source>Set width/height proportional dimensions</source>
+        <translation>幅と高さの比率を 1:1 に固定</translation>
+    </message>
+</context>
+<context>
+    <name>InkTool</name>
+    <message>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="605"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="609"/>
+        <source>Ink</source>
+        <translation>インク</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="606"/>
+        <source>K</source>
+        <translation>K</translation>
+    </message>
+</context>
+<context>
+    <name>KinasWidget</name>
+    <message>
+        <location filename="../src/components/kinas/kinaswidget.cpp" line="42"/>
+        <source>Tupi Script</source>
+        <translation>Tupi スクリプト</translation>
+    </message>
+</context>
+<context>
+    <name>NodesTool</name>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="341"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="344"/>
+        <source>Line Selection</source>
+        <translation>線分を選択</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="342"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+</context>
+<context>
+    <name>PencilTool</name>
+    <message>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="78"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="83"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="129"/>
+        <source>Pencil</source>
+        <translation>鉛筆</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="79"/>
+        <source>P</source>
+        <translation>P</translation>
+    </message>
+</context>
+<context>
+    <name>PolyLineTool</name>
+    <message>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="95"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="120"/>
+        <source>PolyLine</source>
+        <translation>折れ線</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="92"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+</context>
+<context>
+    <name>PositionSettings</name>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="68"/>
+        <source>Component</source>
+        <translation>コンポーネント</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="71"/>
+        <source>Position</source>
+        <translation>位置</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="82"/>
+        <source>Starting at frame</source>
+        <translation>開始フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="202"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="233"/>
+        <source>Frames Total</source>
+        <translation>フレームの総数</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="154"/>
+        <source>Cancel Tween</source>
+        <translation>トゥイーンをキャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
+        <source>Info</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
+        <source>You must define a path for this Tween!</source>
+        <translation>このトゥイーンを使用するには軌跡を定義してください！</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="225"/>
+        <source>Position Tween is set!</source>
+        <translation>位置トゥイーンが設定されました！</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="250"/>
+        <source>Close Tween properties</source>
+        <translation>トゥイーンのプロパティを閉じる</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="50"/>
+        <source>Fatal Error</source>
+        <translation>致命的なエラー</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="51"/>
+        <source>Well, Tupi has crashed...</source>
+        <translation>Tupi がクラッシュしました...</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="52"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="53"/>
+        <source>Re-launch Tupi</source>
+        <translation>Tupi を再起動</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="54"/>
+        <source>This is a general failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="159"/>
+        <source>add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="164"/>
+        <source>remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="169"/>
+        <source>move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="174"/>
+        <source>lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="179"/>
+        <source>rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="184"/>
+        <source>select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="189"/>
+        <source>edit node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="194"/>
+        <source>view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="199"/>
+        <source>transform</source>
+        <translation>変形</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="204"/>
+        <source>convert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="229"/>
+        <source>Information</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="235"/>
+        <source>Warning</source>
+        <translation>警告</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="241"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="247"/>
+        <source>Critical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="535"/>
+        <source>Wall from</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SchemeTool</name>
+    <message>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="682"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="686"/>
+        <source>Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="683"/>
+        <source>M</source>
+        <translation>M</translation>
+    </message>
+</context>
+<context>
+    <name>SelectPlugin</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="77"/>
+        <source>Select plugin</source>
+        <translation>プラグインを選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="142"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
+        <source>WEBM Video</source>
+        <translation>WEBM 動画</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="147"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="211"/>
+        <source>OGV Video</source>
+        <translation>OGV 動画</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="152"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="214"/>
+        <source>MPEG Video</source>
+        <translation>MPEG 動画</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="217"/>
+        <source>Macromedia flash</source>
+        <translation>Macromedia Flash</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="162"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="220"/>
+        <source>AVI Video</source>
+        <translation>AVI 動画</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="241"/>
+        <source>Animated PNG (APNG)</source>
+        <translation>アニメーション PNG (APNG)</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="223"/>
+        <source>RealMedia Video</source>
+        <translation>RealMedia 動画</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="259"/>
+        <source>Animated Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
+        <source>Image Array</source>
+        <translation>連番画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="167"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="226"/>
+        <source>ASF Video</source>
+        <translation>ASF 動画</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="172"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="229"/>
+        <source>QuickTime Video</source>
+        <translation>QuickTime 動画</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="232"/>
+        <source>Gif Image</source>
+        <translation>GIF 画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="235"/>
+        <source>PNG Image Array</source>
+        <translation>連番 PNG 画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="238"/>
+        <source>JPEG Image Array</source>
+        <translation>連番 JPEG 画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="201"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="244"/>
+        <source>SMIL</source>
+        <translation>SMIL</translation>
+    </message>
+</context>
+<context>
+    <name>SelectScenes</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="304"/>
+        <source>Select Scenes</source>
+        <translation>シーンを選択</translation>
+    </message>
+</context>
+<context>
+    <name>SelectionTool</name>
+    <message>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="161"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="369"/>
+        <source>Selection</source>
+        <translation>選択</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="366"/>
+        <source>Object Selection</source>
+        <translation>オブジェクトを選択</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="367"/>
+        <source>O</source>
+        <translation>O</translation>
+    </message>
+</context>
+<context>
+    <name>Settings</name>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="85"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="72"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="87"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="88"/>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="133"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="137"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="124"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="140"/>
+        <source>Starting at frame</source>
+        <translation>開始フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="91"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="95"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="82"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="98"/>
+        <source>Options</source>
+        <translation>オプション</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="99"/>
+        <source>Select object</source>
+        <translation>オブジェクトを選択</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="93"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="84"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="99"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="100"/>
+        <source>Set Properties</source>
+        <translation>プロパティを設定</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="565"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="168"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="516"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="200"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="538"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="171"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="544"/>
+        <source>Frames Total</source>
+        <translation>フレームの総数</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="275"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="281"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="281"/>
+        <source>Cancel Tween</source>
+        <translation>トゥイーンをキャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
+        <source>Info</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
+        <source>You must select at least one object!</source>
+        <translation>最低 1 個のオブジェクトを選択してください！</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
+        <source>You must define a path for this Tween!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="178"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="279"/>
+        <source>Save Tween</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
+        <source>Select objects for Tweening first!</source>
+        <translation>トゥイーンを適用するオブジェクトを先に選択してください！</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="343"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="333"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="347"/>
+        <source>Update Tween</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="347"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="335"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="349"/>
+        <source>Close Tween properties</source>
+        <translation>トゥイーンのプロパティを閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="141"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="145"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="147"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="148"/>
+        <source>Ending at frame</source>
+        <translation>終了フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="185"/>
+        <source>Continuous</source>
+        <translation>連続的</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="186"/>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="190"/>
+        <source>Type</source>
+        <translation>種類</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="199"/>
+        <source>Speed (Degrees/Frame)</source>
+        <translation>速さ (度/フレーム)</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="265"/>
+        <source>Direction</source>
+        <translation>方向</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="269"/>
+        <source>Clockwise</source>
+        <translation>時計回り</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="270"/>
+        <source>Counterclockwise</source>
+        <translation>反時計回り</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="294"/>
+        <source>Degrees Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="297"/>
+        <source>Start at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="313"/>
+        <source>Finish at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="217"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="221"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="221"/>
+        <source>Loop</source>
+        <translation>ループ</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="230"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="230"/>
+        <source>Loop with Reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
+        <source>You must set Tween properties first!</source>
+        <translation>トゥイーンのプロパティを先に設定してください！</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="179"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="180"/>
+        <source>Width &amp; Height</source>
+        <translation>幅と高さ</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="181"/>
+        <source>Only Width</source>
+        <translation>幅のみ</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="181"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="182"/>
+        <source>Only Height</source>
+        <translation>高さのみ</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="182"/>
+        <source>Scale in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="199"/>
+        <source>Scaling Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="212"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="211"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="212"/>
+        <source>Iterations</source>
+        <translation>反復</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="183"/>
+        <source>Shear in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="183"/>
+        <source>Initial Opacity</source>
+        <translation>開始時の不透明度</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="199"/>
+        <source>Ending Opacity</source>
+        <translation>終了時の不透明度</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="190"/>
+        <source>White</source>
+        <translation>白</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="179"/>
+        <source>Initial Color</source>
+        <translation>開始時の色</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="195"/>
+        <source>Ending Color</source>
+        <translation>終了時の色</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/pencil/settings.cpp" line="53"/>
+        <source>Smoothness</source>
+        <translation>なめらかさ</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="59"/>
+        <source>Flips</source>
+        <translation>反転</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="70"/>
+        <source>Horizontal Flip</source>
+        <translation>水平方向に反転</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="73"/>
+        <source>Vertical Flip</source>
+        <translation>垂直方向に反転</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="76"/>
+        <source>Crossed Flip</source>
+        <translation>水平方向と垂直方向に同時に反転</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="89"/>
+        <source>Order</source>
+        <translation>順序</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="99"/>
+        <source>Send object to back</source>
+        <translation>オブジェクトを最背面に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="102"/>
+        <source>Send object to back one level</source>
+        <translation>オブジェクトを 1 レベル背面に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="105"/>
+        <source>Send object to front</source>
+        <translation>オブジェクトを最前面に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="108"/>
+        <source>Send object to front one level</source>
+        <translation>オブジェクトを 1 レベル前面に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="124"/>
+        <source>Position</source>
+        <translation>位置</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="229"/>
+        <source>Show Tips</source>
+        <translation>ヒントを表示</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="151"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="230"/>
+        <source>A little help for the Selection tool</source>
+        <translation>選択ツールの小さなヘルプを表示します</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
+        <source>Rotation mode</source>
+        <translation>回転モード</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
+        <source>Double click on any node or shortcut Alt + R</source>
+        <translation>ノード上でダブルクリック、またはショートカット Alt + R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
+        <source>Arrows</source>
+        <translation>矢印キー</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
+        <source>Movement on selection</source>
+        <translation>選択したものを移動</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
+        <source>Shift + Arrows</source>
+        <translation>Shift + 矢印キー</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
+        <source>Slow movement on selection</source>
+        <translation>選択したものをゆっくり移動</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
+        <source>Ctrl + Arrows</source>
+        <translation>Ctrl + 矢印キー</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
+        <source>Fast movement on selection</source>
+        <translation>選択したものを素早く移動</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
+        <source>Shift + Left Mouse Button</source>
+        <translation>Shift + 左マウスボタン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
+        <source>Proportional scaling on selection</source>
+        <translation>選択したものを、比率を維持して拡大/縮小</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="224"/>
+        <source>Show Tools</source>
+        <translation>ツールを表示</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="225"/>
+        <source>Options panel for the Selection tool</source>
+        <translation>選択ツールのオプションパネルを表示します</translation>
+    </message>
+</context>
+<context>
+    <name>SpinControl</name>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="221"/>
+        <source>Radius</source>
+        <translation>半径</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="230"/>
+        <source>Angle</source>
+        <translation>角度</translation>
+    </message>
+</context>
+<context>
+    <name>StepsViewer</name>
+    <message>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
+        <source>Interval</source>
+        <translation>間隔</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
+        <source>Frames</source>
+        <translation>フレーム</translation>
+    </message>
+</context>
+<context>
+    <name>TButtonBar</name>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="47"/>
+        <source>Left button bar</source>
+        <translation>左ボタンバー</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="52"/>
+        <source>Right button bar</source>
+        <translation>右ボタンバー</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="57"/>
+        <source>Bottom button bar</source>
+        <translation>下ボタンバー</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="62"/>
+        <source>Top button bar</source>
+        <translation>上ボタンバー</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="88"/>
+        <source>Only icons</source>
+        <translation>アイコンのみ</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="91"/>
+        <source>Only texts</source>
+        <translation>テキストのみ</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="96"/>
+        <source>Exclusive space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
+        <source>Auto hide</source>
+        <translation>自動的に隠す</translation>
+    </message>
+</context>
+<context>
+    <name>TCommandHistory</name>
+    <message>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="41"/>
+        <source>Undo</source>
+        <translation>元に戻す</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="42"/>
+        <source>Redo</source>
+        <translation>やり直す</translation>
+    </message>
+</context>
+<context>
+    <name>TFontChooser</name>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="45"/>
+        <source>Family</source>
+        <translation>ファミリ</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="49"/>
+        <source>Style</source>
+        <translation>スタイル</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="53"/>
+        <source>Size</source>
+        <translation>サイズ</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="73"/>
+        <source>Normal</source>
+        <translation>標準</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="74"/>
+        <source>Italic</source>
+        <translation>イタリック体</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="75"/>
+        <source>Oblique</source>
+        <translation>斜体</translation>
+    </message>
+</context>
+<context>
+    <name>TOptionalDialog</name>
+    <message>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="56"/>
+        <source>Don&apos;t show again</source>
+        <translation>再び表示しない</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="59"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
+        <source>Accept</source>
+        <translation>承諾</translation>
+    </message>
+</context>
+<context>
+    <name>TRulerBase</name>
+    <message>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="102"/>
+        <source>Change scale to 5...</source>
+        <translation>スケールを 5 に変更...</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="103"/>
+        <source>Change scale to 10...</source>
+        <translation>スケールを 10 に変更...</translation>
+    </message>
+</context>
+<context>
+    <name>TViewButton</name>
+    <message>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="265"/>
+        <source>Menu</source>
+        <translation>メニュー</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="266"/>
+        <source>Only icon</source>
+        <translation>アイコンのみ</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="267"/>
+        <source>Only text</source>
+        <translation>テキストのみ</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="270"/>
+        <source>Mouse sensibility</source>
+        <translation>マウス感度</translation>
+    </message>
+</context>
+<context>
+    <name>TWizard</name>
+    <message>
+        <location filename="../src/framework/tgui/twizard.cpp" line="40"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/twizard.cpp" line="41"/>
+        <source>&lt; &amp;Back</source>
+        <translation>&lt; 戻る(&amp;B)</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/twizard.cpp" line="42"/>
+        <source>Next &gt;</source>
+        <translation>進む &gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/twizard.cpp" line="43"/>
+        <source>&amp;Finish</source>
+        <translation>完了(&amp;F)</translation>
+    </message>
+</context>
+<context>
+    <name>TabDialog</name>
+    <message>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="89"/>
+        <source>Help</source>
+        <translation>ヘルプ</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="96"/>
+        <source>Apply</source>
+        <translation>適用</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="103"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="110"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>TextConfigurator</name>
+    <message>
+        <location filename="../src/plugins/tools/text/textconfigurator.cpp" line="49"/>
+        <source>Html</source>
+        <translation>HTML</translation>
+    </message>
+</context>
+<context>
+    <name>TextTool</name>
+    <message>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="57"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="160"/>
+        <source>Text</source>
+        <translation>テキスト</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="157"/>
+        <source>T</source>
+        <translation>T</translation>
+    </message>
+</context>
+<context>
+    <name>TreeWidgetSearchLine</name>
+    <message>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="63"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="78"/>
+        <source>Search</source>
+        <translation>検索</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="266"/>
+        <source>Search Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="268"/>
+        <source>All Visible Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TreeWidgetSearchLineWidget</name>
+    <message>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="564"/>
+        <source>Clear</source>
+        <translation>クリア</translation>
+    </message>
+</context>
+<context>
+    <name>TupAbout</name>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="152"/>
+        <source>About</source>
+        <translation>このアプリケーションについて</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="115"/>
+        <source>Credits</source>
+        <translation>クレジット</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="48"/>
+        <source>About Tupi</source>
+        <translation>Tupi について</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="136"/>
+        <source>Thanks</source>
+        <translation>謝辞</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="167"/>
+        <source>License Agreement</source>
+        <translation>ライセンス条項</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="168"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+</context>
+<context>
+    <name>TupBasicCameraInterface</name>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
+        <source>Tupi Camera Manager</source>
+        <translation>Tupi カメラマネージャ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
+        <source>Current resolution:</source>
+        <translation>現在の解像度:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="122"/>
+        <source>Cameras</source>
+        <translation>カメラ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="124"/>
+        <source>Camera</source>
+        <translation>カメラ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
+        <source>Take picture</source>
+        <translation>写真を撮影</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="147"/>
+        <source>Close manager</source>
+        <translation>マネージャを閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
+        <source>Can&apos;t create pictures directory</source>
+        <translation>写真用のディレクトリを作成できません</translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraBar</name>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="59"/>
+        <source>Rewind</source>
+        <translation>巻き戻し</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="64"/>
+        <source>Play in reverse</source>
+        <translation>逆再生</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="69"/>
+        <source>Play</source>
+        <translation>再生</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="74"/>
+        <source>Stop</source>
+        <translation>停止</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="79"/>
+        <source>Forward</source>
+        <translation>早送り</translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="56"/>
+        <source>Camera Settings</source>
+        <translation>カメラ設定</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="72"/>
+        <source>Available Camera Devices:</source>
+        <translation>利用可能なカメラデバイス:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="77"/>
+        <source>Camera Detected:</source>
+        <translation>検出済みのカメラ:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="89"/>
+        <source>Available Camera Resolutions:</source>
+        <translation>利用可能なカメラ解像度:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="101"/>
+        <source>Resize my project to fit camera resolution</source>
+        <translation>プロジェクトのサイズをカメラ解像度に合わせて変更する</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="104"/>
+        <source>Use the basic camera interface (low resources)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="110"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraInterface</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
+        <source>Tupi Camera Manager</source>
+        <translation>Tupi カメラマネージャ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
+        <source>Current resolution:</source>
+        <translation>現在の解像度:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="125"/>
+        <source>Cameras</source>
+        <translation>カメラ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="127"/>
+        <source>Camera</source>
+        <translation>カメラ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="133"/>
+        <source>Take picture</source>
+        <translation>写真を撮影</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="138"/>
+        <source>Show safe area</source>
+        <translation>セーフエリアを表示</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="139"/>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
+        <source>Show grid</source>
+        <translation>グリッドを表示</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="156"/>
+        <source>Grid spacing</source>
+        <translation>グリッドの間隔</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="167"/>
+        <source>Grid color</source>
+        <translation>グリッドの色</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="183"/>
+        <source>Show previous images</source>
+        <translation>前の画像を表示</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="184"/>
+        <source>P</source>
+        <translation>P</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="194"/>
+        <source>Image opacity level</source>
+        <translation>画像の不透明度レベル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="204"/>
+        <source>Amount of images to show</source>
+        <translation>表示する画像の数</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="231"/>
+        <source>Close manager</source>
+        <translation>マネージャを閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
+        <source>Can&apos;t create pictures directory</source>
+        <translation>写真用のディレクトリを作成できません</translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraStatus</name>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="71"/>
+        <source>Scene name</source>
+        <translation>シーン名</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="84"/>
+        <source>Frames total</source>
+        <translation>フレームの総数</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="95"/>
+        <source>FPS</source>
+        <translation>フレーム/秒</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="112"/>
+        <source>Loop</source>
+        <translation>ループ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="116"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="129"/>
+        <source>Export</source>
+        <translation>エクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="139"/>
+        <source>Post</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraWidget</name>
+    <message>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="91"/>
+        <source>Scene Preview</source>
+        <translation>シーンのプレビュー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="159"/>
+        <source>Scale</source>
+        <translation>スケール</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="182"/>
+        <source>Size</source>
+        <translation>サイズ</translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraWindow</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="95"/>
+        <source>General Camera error</source>
+        <translation>カメラの一般エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="100"/>
+        <source>Camera invalid request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="105"/>
+        <source>Camera service missing error</source>
+        <translation>カメラサービスが見つからないことによるエラー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="110"/>
+        <source>Camera not supported error</source>
+        <translation>カメラがサポートされていないことによるエラー</translation>
+    </message>
+</context>
+<context>
+    <name>TupCanvas</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="71"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="78"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="79"/>
+        <source>Tupi: Open 2D Magic</source>
+        <translation>Tupi: オープン 2D マジック</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="101"/>
+        <source>Sketch Tools</source>
+        <translation>スケッチツール</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="105"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="118"/>
+        <source>Images</source>
+        <translation>画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="109"/>
+        <source>Selection Tools</source>
+        <translation>選択ツール</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="146"/>
+        <source>Undo</source>
+        <translation>元に戻す</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="149"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="150"/>
+        <source>Redo</source>
+        <translation>やり直す</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="130"/>
+        <source>Delete Selection</source>
+        <translation>選択したものを削除</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="134"/>
+        <source>Zoom In</source>
+        <translation>ズームイン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="137"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="138"/>
+        <source>Zoom Out</source>
+        <translation>ズームアウト</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="142"/>
+        <source>Shift</source>
+        <translation>手のひら</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="137"/>
+        <source>Pen Properties</source>
+        <translation>ペンのプロパティ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="162"/>
+        <source>Exposure Sheet</source>
+        <translation>タイムシート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="424"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="293"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="295"/>
+        <source>Import a SVG file...</source>
+        <translation>SVG ファイルをインポート...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="425"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="294"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
+        <source>Vector</source>
+        <translation>ベクター</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="462"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="331"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="333"/>
+        <source>Information</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="464"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="335"/>
+        <source>Image is bigger than workspace.</source>
+        <translation>画像が作業スペースよりも大きいです。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="465"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
+        <source>Do you want to resize it?</source>
+        <translation>サイズを変更しますか？</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="612"/>
+        <source>Scene %1</source>
+        <translation>シーン %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="615"/>
+        <source>Layer 1</source>
+        <translation>レイヤー 1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="618"/>
+        <source>Frame 1</source>
+        <translation>フレーム 1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="631"/>
+        <source>Layer %1</source>
+        <translation>レイヤー %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="638"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="650"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="96"/>
+        <source>Pencil</source>
+        <translation>鉛筆</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="99"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="100"/>
+        <source>Ink</source>
+        <translation>インク</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="109"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="110"/>
+        <source>Ellipse</source>
+        <translation>楕円</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="114"/>
+        <source>Rectangle</source>
+        <translation>矩形</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="122"/>
+        <source>Object Selection</source>
+        <translation>オブジェクトを選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="126"/>
+        <source>Line Selection</source>
+        <translation>線分を選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="154"/>
+        <source>Color Palette</source>
+        <translation>カラーパレット</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="158"/>
+        <source>Pen Size</source>
+        <translation>ペンのサイズ</translation>
+    </message>
+</context>
+<context>
+    <name>TupChat</name>
+    <message>
+        <location filename="../src/net/tupchat.cpp" line="75"/>
+        <source>Send</source>
+        <translation>送信</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupchat.cpp" line="164"/>
+        <source>Error:</source>
+        <translation>エラー:</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupchat.cpp" line="165"/>
+        <source>Invalid Message. It won&apos;t be sent. Please, don&apos;t use HTML tags</source>
+        <translation>無効なメッセージです。送信できません。HTML タグを使用しないでください</translation>
+    </message>
+</context>
+<context>
+    <name>TupColorPalette</name>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="77"/>
+        <source>Color Palette</source>
+        <translation>カラーパレット</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="127"/>
+        <source>Contour</source>
+        <translation>輪郭線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="128"/>
+        <source>Fill</source>
+        <translation>塗りつぶし</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="207"/>
+        <source>Color Mixer</source>
+        <translation>カラーミキサー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="215"/>
+        <source>Gradients</source>
+        <translation>グラデーション</translation>
+    </message>
+</context>
+<context>
+    <name>TupColorValue</name>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="180"/>
+        <source>Percent</source>
+        <translation>パーセント</translation>
+    </message>
+</context>
+<context>
+    <name>TupConfigurationArea</name>
+    <message>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="296"/>
+        <source>Cursor here for expand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="339"/>
+        <source>Properties</source>
+        <translation>プロパティ</translation>
+    </message>
+</context>
+<context>
+    <name>TupConnectDialog</name>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="60"/>
+        <source>Connection Dialog</source>
+        <translation>接続ダイアログ</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
+        <source>Login</source>
+        <translation>ログイン</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
+        <source>Server</source>
+        <translation>サーバ</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
+        <source>Port</source>
+        <translation>ポート</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
+        <source>Store password</source>
+        <translation>パスワードを保存</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
+        <source>Please, fill in your password</source>
+        <translation>パスワードを入力してください</translation>
+    </message>
+</context>
+<context>
+    <name>TupCrashWidget</name>
+    <message>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="112"/>
+        <source>What&apos;s happening?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="140"/>
+        <source>Executable information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="146"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="153"/>
+        <source>Backtrace</source>
+        <translation>バックトレース</translation>
+    </message>
+</context>
+<context>
+    <name>TupDebugWidget</name>
+    <message>
+        <location filename="../src/components/debug/tupdebugwidget.cpp" line="44"/>
+        <source>Debug Console</source>
+        <translation>デバッグコンソール</translation>
+    </message>
+</context>
+<context>
+    <name>TupDocumentView</name>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="324"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="585"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="875"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="913"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1184"/>
+        <source>Object Selection</source>
+        <translation>オブジェクトを選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="342"/>
+        <source>Copy</source>
+        <translation>コピー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="342"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="345"/>
+        <source>Paste</source>
+        <translation>貼り付け</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="345"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="348"/>
+        <source>Cut</source>
+        <translation>切り取り</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="348"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="351"/>
+        <source>Delete</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="354"/>
+        <source>&amp;Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="354"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="358"/>
+        <source>&amp;Ungroup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="363"/>
+        <source>Onion Skin</source>
+        <translation>オニオンスキン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="363"/>
+        <source>Ctrl+Shift+O</source>
+        <translation>Ctrl+Shift+O</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="366"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1074"/>
+        <source>Onion Skin Factor</source>
+        <translation>オニオンスキンの不透明度</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="366"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <source>Ctrl+Shift+S</source>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="369"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="376"/>
+        <source>@</source>
+        <translation>@</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="369"/>
+        <source>Export Current Frame As Image</source>
+        <translation>現在のフレームを画像としてエクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="376"/>
+        <source>Export Current Frame To Gallery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <source>Storyboard Settings</source>
+        <translation>ストーリーボードの設定</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
+        <source>Camera</source>
+        <translation>カメラ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
+        <source>Draw tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
+        <source>Brushes</source>
+        <translation>ブラシ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
+        <source>Selection</source>
+        <translation>選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="410"/>
+        <source>Fill</source>
+        <translation>塗りつぶし</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="417"/>
+        <source>View</source>
+        <translation>表示</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="424"/>
+        <source>Tweening</source>
+        <translation>トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="439"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="450"/>
+        <source>Image Array</source>
+        <translation>連番画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="504"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="840"/>
+        <source>Pencil</source>
+        <translation>鉛筆</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="510"/>
+        <source>Ink</source>
+        <translation>インク</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="514"/>
+        <source>Eraser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="519"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="844"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1600"/>
+        <source>PolyLine</source>
+        <translation>折れ線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="526"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="845"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1603"/>
+        <source>Line</source>
+        <translation>直線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="533"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="844"/>
+        <source>Rectangle</source>
+        <translation>矩形</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="536"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="845"/>
+        <source>Ellipse</source>
+        <translation>楕円</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="539"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="842"/>
+        <source>Text</source>
+        <translation>テキスト</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="547"/>
+        <source>Position Tween</source>
+        <translation>位置トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="552"/>
+        <source>Rotation Tween</source>
+        <translation>回転トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="556"/>
+        <source>Scale Tween</source>
+        <translation>拡大/縮小トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="561"/>
+        <source>Shear Tween</source>
+        <translation>せん断変形トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="566"/>
+        <source>Opacity Tween</source>
+        <translation>不透明度トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="571"/>
+        <source>Coloring Tween</source>
+        <translation>彩色トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="576"/>
+        <source>Compound Tween</source>
+        <translation>複合トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="592"/>
+        <source>Internal fill</source>
+        <translation>内側を塗りつぶす</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="599"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="887"/>
+        <source>Zoom In</source>
+        <translation>ズームイン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="774"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="815"/>
+        <source>%1</source>
+        <translation>%1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="887"/>
+        <source>Zoom Out</source>
+        <translation>ズームアウト</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="890"/>
+        <source>Shift</source>
+        <translation>手のひら</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1011"/>
+        <source>Paint area actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1014"/>
+        <source>Dynamic Background Properties</source>
+        <translation>動的背景のプロパティ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1019"/>
+        <source>Frames Mode</source>
+        <translation>フレーム編集モード</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1020"/>
+        <source>Static BG Mode</source>
+        <translation>静止背景モード</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1021"/>
+        <source>Dynamic BG Mode</source>
+        <translation>動的背景モード</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1046"/>
+        <source>Previous Frames</source>
+        <translation>前のフレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1058"/>
+        <source>Next Frames</source>
+        <translation>次のフレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1093"/>
+        <source>Direction</source>
+        <translation>方向</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1096"/>
+        <source>Left to Right</source>
+        <translation>左から右へ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1097"/>
+        <source>Right to Left</source>
+        <translation>右から左へ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1098"/>
+        <source>Top to Bottom</source>
+        <translation>上から下へ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1099"/>
+        <source>Bottom to Top</source>
+        <translation>下から上へ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1102"/>
+        <source>Shift Length</source>
+        <translation>移動の長さ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1471"/>
+        <source>Export Frame As</source>
+        <translation>フレームに名前を付けてエクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1472"/>
+        <source>Images</source>
+        <translation>画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1477"/>
+        <source>Information</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1477"/>
+        <source>Frame has been exported successfully</source>
+        <translation>フレームのエクスポートに成功しました</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1479"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1686"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1479"/>
+        <source>Can&apos;t export frame as image</source>
+        <translation>フレームを画像としてエクスポートできません</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1686"/>
+        <source>No cameras detected</source>
+        <translation>カメラを検出できません</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1749"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupExportWidget</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1030"/>
+        <source>Export to Video</source>
+        <translation>動画にエクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1041"/>
+        <source>Export to Video File</source>
+        <translation>動画ファイルにエクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1044"/>
+        <source>Export to Images Array</source>
+        <translation>連番画像にエクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1047"/>
+        <source>Export to Animated Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1063"/>
+        <source>Post Animation in Tupitube</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1097"/>
+        <source>Video Formats</source>
+        <translation>動画フォーマット</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1099"/>
+        <source>Open Video Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1101"/>
+        <source>Image Array</source>
+        <translation>連番画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1103"/>
+        <source>Animated Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupExportWizard</name>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="54"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="55"/>
+        <source>Back</source>
+        <translation>戻る</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="56"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="149"/>
+        <source>Next</source>
+        <translation>進む</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="179"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="206"/>
+        <source>Export</source>
+        <translation>エクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="208"/>
+        <source>Post</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupExposureDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="57"/>
+        <source>Exposure Sheet</source>
+        <translation>タイムシート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="264"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="279"/>
+        <source>Scene</source>
+        <translation>シーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="144"/>
+        <source>Work Team</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupExposureScene</name>
+    <message>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="65"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="110"/>
+        <source>Layer</source>
+        <translation>レイヤー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="72"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="154"/>
+        <source>Frame</source>
+        <translation>フレーム</translation>
+    </message>
+</context>
+<context>
+    <name>TupExposureSheet</name>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="60"/>
+        <source>Exposure Sheet</source>
+        <translation>タイムシート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="96"/>
+        <source>actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="100"/>
+        <source>Insert</source>
+        <translation>挿入</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="117"/>
+        <source>20 frames</source>
+        <translation>20 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="122"/>
+        <source>50 frames</source>
+        <translation>50 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="127"/>
+        <source>100 frames</source>
+        <translation>100 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="134"/>
+        <source>Remove frame</source>
+        <translation>フレームを削除</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="139"/>
+        <source>Clear frame</source>
+        <translation>フレームをクリア</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="144"/>
+        <source>Lock/Unlock frame</source>
+        <translation>フレームのロック/ロックを解除</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="149"/>
+        <source>Copy frame</source>
+        <translation>フレームをコピー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="154"/>
+        <source>Paste in frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="159"/>
+        <source>Expand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
+        <source>1 frame</source>
+        <translation>1 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="107"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="161"/>
+        <source>5 frames</source>
+        <translation>5 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="112"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="162"/>
+        <source>10 frames</source>
+        <translation>10 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
+        <source>Copy TL forward</source>
+        <translation>タイムライン全体を前方にコピー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="169"/>
+        <source>1 time</source>
+        <translation>1 回</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="170"/>
+        <source>2 times</source>
+        <translation>2 回</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="171"/>
+        <source>3 times</source>
+        <translation>3 回</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="172"/>
+        <source>4 times</source>
+        <translation>4 回</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
+        <source>5 times</source>
+        <translation>5 回</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="254"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="501"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="674"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="247"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="671"/>
+        <source>Layer %1</source>
+        <translation>レイヤー %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupGradientCreator</name>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
+        <source>Linear</source>
+        <translation>線形</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
+        <source>Radial</source>
+        <translation>放射状</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
+        <source>Conical</source>
+        <translation>円錐形</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
+        <source>Pad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
+        <source>Reflect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
+        <source>Repeat</source>
+        <translation>反復</translation>
+    </message>
+</context>
+<context>
+    <name>TupGraphicsScene</name>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="155"/>
+        <source>PolyLine</source>
+        <translation>折れ線</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="585"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="773"/>
+        <source>/Step: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="655"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="805"/>
+        <source>/Step: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1216"/>
+        <source>Line</source>
+        <translation>直線</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1301"/>
+        <source>Zoom In</source>
+        <translation>ズームイン</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1301"/>
+        <source>Zoom Out</source>
+        <translation>ズームアウト</translation>
+    </message>
+</context>
+<context>
+    <name>TupHelpBrowser</name>
+    <message>
+        <location filename="../src/components/help/tuphelpbrowser.cpp" line="42"/>
+        <source>Help</source>
+        <translation>ヘルプ</translation>
+    </message>
+</context>
+<context>
+    <name>TupHelpWidget</name>
+    <message>
+        <location filename="../src/components/help/tuphelpwidget.cpp" line="40"/>
+        <source>Help</source>
+        <translation>ヘルプ</translation>
+    </message>
+</context>
+<context>
+    <name>TupImageDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="48"/>
+        <source>Image Properties</source>
+        <translation>画像のプロパティ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="53"/>
+        <source>Title</source>
+        <translation>タイトル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="54"/>
+        <source>My Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="60"/>
+        <source>Topics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
+        <source>#topic1 #topic2 #topic3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
+        <source>Description</source>
+        <translation>説明</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="72"/>
+        <source>Just a little taste of my style :)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="89"/>
+        <source>Post Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="128"/>
+        <source>Set a title for the picture here!</source>
+        <translation>画像のタイトルをここに入力してください！</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="139"/>
+        <source>Set some topic tags for the picture here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupInfoWidget</name>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="124"/>
+        <source>Currency Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="128"/>
+        <source>Currency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="228"/>
+        <source>%1</source>
+        <translation>%1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="143"/>
+        <source>Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="152"/>
+        <source>Update data every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
+        <source>minute</source>
+        <translation>分</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
+        <source>minutes</source>
+        <translation>分</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="246"/>
+        <source>Link file to Object</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="247"/>
+        <source>All files (*.*)</source>
+        <translation>すべてのファイル (*.*)</translation>
+    </message>
+</context>
+<context>
+    <name>TupItemManager</name>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="70"/>
+        <source>New folder %1</source>
+        <translation>新しいフォルダ %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="227"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="339"/>
+        <source>Options</source>
+        <translation>オプション</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="230"/>
+        <source>Edit with Inkscape</source>
+        <translation>Inkscape で編集</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="240"/>
+        <source>Edit with Gimp</source>
+        <translation>Gimp で編集</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="250"/>
+        <source>Edit with Krita</source>
+        <translation>Krita で編集</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="260"/>
+        <source>Edit with MyPaint</source>
+        <translation>MyPaint で編集</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="271"/>
+        <source>Clone</source>
+        <translation>複製</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="274"/>
+        <source>Export</source>
+        <translation>エクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="277"/>
+        <source>Rename</source>
+        <translation>名前を変更</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="280"/>
+        <source>Delete</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="291"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="343"/>
+        <source>Create new raster item</source>
+        <translation>新しいラスターアイテムを作成</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="299"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="351"/>
+        <source>Create new svg item</source>
+        <translation>新しい SVG アイテムを作成</translation>
+    </message>
+</context>
+<context>
+    <name>TupItemPreview</name>
+    <message>
+        <location filename="../src/libtupi/tupitempreview.cpp" line="56"/>
+        <source>Library is empty :(</source>
+        <translation>ライブラリが空です :(</translation>
+    </message>
+</context>
+<context>
+    <name>TupItemTweener</name>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="610"/>
+        <source>Position Tween</source>
+        <translation>位置トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="613"/>
+        <source>Rotation Tween</source>
+        <translation>回転トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="616"/>
+        <source>Scale Tween</source>
+        <translation>拡大/縮小トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="619"/>
+        <source>Shear Tween</source>
+        <translation>せん断変形トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="622"/>
+        <source>Opacity Tween</source>
+        <translation>不透明度トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="625"/>
+        <source>Coloring Tween</source>
+        <translation>彩色トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="628"/>
+        <source>Compound Tween</source>
+        <translation>複合トゥイーン</translation>
+    </message>
+</context>
+<context>
+    <name>TupLayer</name>
+    <message>
+        <location filename="../src/store/tuplayer.cpp" line="54"/>
+        <source>Layer</source>
+        <translation>レイヤー</translation>
+    </message>
+</context>
+<context>
+    <name>TupLayerIndex</name>
+    <message>
+        <location filename="../src/components/timeline/tuplayerindex.cpp" line="169"/>
+        <source>Layers</source>
+        <translation>レイヤー</translation>
+    </message>
+</context>
+<context>
+    <name>TupLibraryDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="47"/>
+        <source>Library Object</source>
+        <translation>ライブラリオブジェクト</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="81"/>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="84"/>
+        <source>Item %1</source>
+        <translation>アイテム %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupLibraryWidget</name>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="94"/>
+        <source>Library</source>
+        <translation>ライブラリ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="158"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1428"/>
+        <source>Image</source>
+        <translation>画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="160"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1433"/>
+        <source>Image Array</source>
+        <translation>連番画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="159"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1438"/>
+        <source>Svg File</source>
+        <translation>SVG ファイル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="161"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1443"/>
+        <source>Svg Array</source>
+        <translation>連番 SVG</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="167"/>
+        <source>Add an object to library</source>
+        <translation>オブジェクトをライブラリに追加</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="182"/>
+        <source>Inserts the selected object into the drawing area</source>
+        <translation>選択したオブジェクトを描画エリアに挿入</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="175"/>
+        <source>Adds a folder to the object&apos;s list</source>
+        <translation>フォルダをオブジェクトの一覧に追加</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="536"/>
+        <source>Export object...</source>
+        <translation>オブジェクトをエクスポート...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="565"/>
+        <source>Info</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="565"/>
+        <source>Item exported successfully!</source>
+        <translation>アイテムのエクスポートに成功しました！</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="639"/>
+        <source>Couldn&apos;t create images directory!</source>
+        <translation>画像用のディレクトリを作成できませんでした！</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="748"/>
+        <source>Couldn&apos;t create vector directory!</source>
+        <translation>ベクター用のディレクトリを作成できませんでした！</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="767"/>
+        <source>Tupi library item</source>
+        <translation>Tupi ライブラリアイテム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="864"/>
+        <source>Image is bigger than workspace.</source>
+        <translation>画像が作業スペースよりも大きいです。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="865"/>
+        <source>Do you want to resize it?</source>
+        <translation>サイズを変更しますか？</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="523"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="822"/>
+        <source>Images</source>
+        <translation>画像</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="909"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="965"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1248"/>
+        <source>Cannot open file: %1</source>
+        <translation>ファイルを開けません: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="972"/>
+        <source>Choose the images directory...</source>
+        <translation>画像用のディレクトリを選択...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1117"/>
+        <source>Choose the SVG files directory...</source>
+        <translation>SVG ファイル用のディレクトリを選択...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="862"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1012"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1145"/>
+        <source>Information</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="995"/>
+        <source>Image files found: %1.</source>
+        <translation>%1 個の画像ファイルが見つかりました。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1142"/>
+        <source>%1 SVG files will be loaded.</source>
+        <translation>%1 個の SVG ファイルが読み込まれます。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1005"/>
+        <source>Files are too big, so they will be resized.</source>
+        <translation>ファイルが大きすぎます。サイズは変更されます。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="916"/>
+        <source>Vector</source>
+        <translation>ベクター</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1006"/>
+        <source>Note: This task can take a while.</source>
+        <translation>注: このタスクの実行には時間がかかる場合があります。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1015"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1148"/>
+        <source>Do you want to continue?</source>
+        <translation>続けますか？</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1037"/>
+        <source>Loading images...</source>
+        <translation>画像を読み込み中...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1168"/>
+        <source>Loading SVG files...</source>
+        <translation>SVG ファイルを読み込み中...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1093"/>
+        <source>Loading image #%1</source>
+        <translation>画像 #%1 を読み込み中</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1207"/>
+        <source>Loading SVG file #%1</source>
+        <translation>SVG ファイル #%1 を読み込み中</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1097"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1212"/>
+        <source>ERROR!</source>
+        <translation>エラー！</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="255"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1475"/>
+        <source>Directory</source>
+        <translation>ディレクトリ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="272"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="325"/>
+        <source>No preview available</source>
+        <translation>プレビューを利用できません</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="639"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="748"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="909"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="965"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1109"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1224"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1248"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="821"/>
+        <source>Import images...</source>
+        <translation>画像をインポート...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="915"/>
+        <source>Import SVG files...</source>
+        <translation>SVG ファイルをインポート...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1097"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1212"/>
+        <source>ERROR: Can&apos;t open file %1. Please, check file permissions and try again.</source>
+        <translation>エラー: ファイル %1 を開けません。ファイルの操作権限を確認し、再試行してください。</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1109"/>
+        <source>No image files were found.&lt;br/&gt;Please, try another directory</source>
+        <translation>画像ファイルが見つかりませんでした。&lt;br/&gt;他のディレクトリを選択してください</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1224"/>
+        <source>No SVG files were found.&lt;br/&gt;Please, try another directory</source>
+        <translation>SVG ファイルが見つかりませんでした。&lt;br/&gt;他のディレクトリを選択してください</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1230"/>
+        <source>Import audio file...</source>
+        <translation>音声ファイルをインポート...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1231"/>
+        <source>Sound file</source>
+        <translation>音声ファイル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1085"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1199"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupListProjectDialog</name>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="54"/>
+        <source>Projects List from Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="79"/>
+        <source>My works:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="80"/>
+        <source>My contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
+        <source>Author</source>
+        <translation>作者</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
+        <source>Description</source>
+        <translation>説明</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="116"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>TupMainWindow</name>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
+        <source>[ by %1 | net mode ]</source>
+        <translation>[ 作: %1 | ネットワークモード ]</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
+        <source>Information</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
+        <source>Opening a new document...</source>
+        <translation>新しいドキュメントを開いています...</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="273"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1218"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="274"/>
+        <source>Animation</source>
+        <translation>アニメーション</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="327"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="282"/>
+        <source>Player</source>
+        <translation>プレーヤー</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
+        <source>Project &lt;b&gt;%1&lt;/b&gt; opened!</source>
+        <translation>プロジェクト &lt;b&gt;%1&lt;/b&gt; を開きました！</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="484"/>
+        <source>Question</source>
+        <translation>確認</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="486"/>
+        <source>The document has been modified.</source>
+        <translation>ドキュメントの内容が変更されました。</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="487"/>
+        <source>Do you want to save the project?</source>
+        <translation>プロジェクトを保存しますか？</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="489"/>
+        <source>Save</source>
+        <translation>保存</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="490"/>
+        <source>Discard</source>
+        <translation>破棄</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="491"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
+        <source>by</source>
+        <translation>作:</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="746"/>
+        <source>Open Tupi project</source>
+        <translation>Tupi プロジェクトを開く</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
+        <source>Import Gimp palettes</source>
+        <translation>Gimp パレットをインポート</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
+        <source>Gimp Palette (*.gpl *.txt *.css)</source>
+        <translation>Gimp パレット (*.gpl *.txt *.css)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
+        <source>Gimp palette import was successful</source>
+        <translation>Gimp パレットのインポートに成功しました</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
+        <source>Gimp palette import was unsuccessful</source>
+        <translation>Gimp パレットのインポートに失敗しました</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1092"/>
+        <source>Save Project As</source>
+        <translation>プロジェクトに名前を付けて保存</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
+        <source>Directory does not exist! Please, choose another path.</source>
+        <translation>ディレクトリが存在しません！他の場所を指定してください。</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
+        <source>Project &lt;b&gt;%1&lt;/b&gt; saved</source>
+        <translation>プロジェクト &lt;b&gt;%1&lt;/b&gt; を保存しました</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1428"/>
+        <source>Import project package</source>
+        <translation>プロジェクトパッケージをインポート</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
+        <source>Can&apos;t import project. File is empty!</source>
+        <translation>プロジェクトをインポートできません。ファイルが空です！</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
+        <source>Can&apos;t save the project. File doesn&apos;t exist!</source>
+        <translation>プロジェクトを保存できません。ファイルが存在しません！</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1457"/>
+        <source>Fatal Error</source>
+        <translation>致命的なエラー</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1459"/>
+        <source>The connection to the server has been lost.</source>
+        <translation>サーバとの接続が切断されました。</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1460"/>
+        <source>Please, try to connect again in a while</source>
+        <translation>しばらく待ってから接続を再試行してください</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
+        <source>Cannot open project!</source>
+        <translation>プロジェクトを開けません！</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="747"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1093"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1429"/>
+        <source>Tupi Project Package (*.tup)</source>
+        <translation>Tupi プロジェクトパッケージ (*.tup)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="111"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="635"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
+        <source>Tupi: Open 2D Magic</source>
+        <translation>Tupi: オープン 2D マジック</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="462"/>
+        <source>Tip of the day</source>
+        <translation>今日のヒント</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="462"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <source>Show on start</source>
+        <translation>起動時に表示</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <source>Previous tip</source>
+        <translation>前のヒント</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <source>Next tip</source>
+        <translation>次のヒント</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1462"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
+        <source>You have no permission to create this file. Please, choose another path.</source>
+        <translation>このファイルを作成する権限がありません。他の場所を指定してください。</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
+        <source>Cannot save the project!</source>
+        <translation>プロジェクトを保存できません！</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1219"/>
+        <source>New camera</source>
+        <translation>新しいカメラ</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="64"/>
+        <source>Shift+P</source>
+        <translation>Shift+P</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="75"/>
+        <source>Shift+B</source>
+        <translation>Shift+B</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="86"/>
+        <source>Shift+L</source>
+        <translation>Shift+L</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
+        <source>Bitmap</source>
+        <translation>ビットマップ</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
+        <source>Bitmap Array</source>
+        <translation>連番ビットマップ</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
+        <source>Alt+Shift+B</source>
+        <translation>Alt+Shift+B</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <source>SVG File</source>
+        <translation>SVG ファイル</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <source>SVG Array</source>
+        <translation>連番 SVG</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <source>Alt+Shift+S</source>
+        <translation>Alt+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="115"/>
+        <source>Shift+C</source>
+        <translation>Shift+C</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="124"/>
+        <source>Shift+E</source>
+        <translation>Shift+E</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="139"/>
+        <source>Shift+H</source>
+        <translation>Shift+H</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="154"/>
+        <source>Shift+T</source>
+        <translation>Shift+T</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="164"/>
+        <source>Shift+D</source>
+        <translation>Shift+D</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="195"/>
+        <source>&amp;File</source>
+        <translation>ファイル(&amp;F)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="204"/>
+        <source>Recents</source>
+        <translation>最近のプロジェクト</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="225"/>
+        <source>&amp;Edit</source>
+        <translation>編集(&amp;E)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="249"/>
+        <source>&amp;Window</source>
+        <translation>ウィンドウ(&amp;W)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="269"/>
+        <source>Modules</source>
+        <translation>モジュール</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="298"/>
+        <source>News</source>
+        <translation>ニュース</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="406"/>
+        <source>Shift+G</source>
+        <translation>Shift+G</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="290"/>
+        <source>Help</source>
+        <translation>ヘルプ</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="235"/>
+        <source>&amp;Import</source>
+        <translation>インポート(&amp;I)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="311"/>
+        <source>&amp;Help</source>
+        <translation>ヘルプ(&amp;H)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="358"/>
+        <source>New project</source>
+        <translation>新しいプロジェクト</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="358"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="360"/>
+        <source>Open new project</source>
+        <translation>新しいプロジェクトを開く</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="363"/>
+        <source>Open project</source>
+        <translation>プロジェクトを開く</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="363"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
+        <source>Load existent project</source>
+        <translation>既存のプロジェクトを読み込み</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="379"/>
+        <source>Save project</source>
+        <translation>プロジェクトを保存</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="380"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="382"/>
+        <source>Save current project in current location</source>
+        <translation>現在の場所に現在のプロジェクトを保存</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="387"/>
+        <source>Save project &amp;As...</source>
+        <translation>プロジェクトに名前を付けて保存(&amp;A)...</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="388"/>
+        <source>Ctrl+Shift+S</source>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="391"/>
+        <source>Open dialog box to save current project in any location</source>
+        <translation>場所を指定して現在のプロジェクトを保存するためのダイアログボックスを開く</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="397"/>
+        <source>Cl&amp;ose project</source>
+        <translation>プロジェクトを閉じる(&amp;O)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="397"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
+        <source>Close active project</source>
+        <translation>アクティブなプロジェクトを閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="405"/>
+        <source>&amp;Import GIMP palettes</source>
+        <translation>Gimp パレットをインポート(&amp;I)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="407"/>
+        <source>Import palettes</source>
+        <translation>パレットをインポート</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="411"/>
+        <source>&amp;Export Project</source>
+        <translation>プロジェクトをエクスポート(&amp;E)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="411"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="413"/>
+        <source>Export project to several video formats</source>
+        <translation>プロジェクトをいくつかの動画フォーマットにエクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="417"/>
+        <source>E&amp;xit</source>
+        <translation>終了(&amp;X)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="417"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
+        <source>Close application</source>
+        <translation>アプリケーションを閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <source>Pr&amp;eferences...</source>
+        <translation>アプリケーションの設定(&amp;E)...</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="444"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="446"/>
+        <source>Opens the preferences dialog box</source>
+        <translation>設定ダイアログボックスを開く</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="460"/>
+        <source>About Tupi</source>
+        <translation>Tupi について</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="460"/>
+        <source>Ctrl+K</source>
+        <translation>Ctrl+K</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="518"/>
+        <source>Actions Bar</source>
+        <translation>アクションバー</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="659"/>
+        <source>Undo</source>
+        <translation>元に戻す</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="662"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="665"/>
+        <source>Redo</source>
+        <translation>やり直す</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="668"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+</context>
+<context>
+    <name>TupNetProjectManagerHandler</name>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="80"/>
+        <source>Communications</source>
+        <translation>コミュニケーション</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="84"/>
+        <source>Chat</source>
+        <translation>チャット</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="89"/>
+        <source>Notices</source>
+        <translation>通知</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="507"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
+        <source>Unable to connect to server</source>
+        <translation>サーバに接続できません</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="319"/>
+        <source>Fatal Error</source>
+        <translation>致命的なエラー</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="321"/>
+        <source>User &quot;%1&quot; is disabled.
+Please, contact the animation server admin to get access.</source>
+        <translation>ユーザ &quot;%1&quot; は無効になっています。
+アクセスするには、アニメーションサーバの管理者に問い合わせてください。</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="536"/>
+        <source>Information</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
+        <source>User has no available projects in the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="505"/>
+        <source>Warning</source>
+        <translation>警告</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="529"/>
+        <source>Notice</source>
+        <translation>通知</translation>
+    </message>
+</context>
+<context>
+    <name>TupNewItemDialog</name>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="66"/>
+        <source>Create new raster item</source>
+        <translation>新しいラスターアイテムを作成</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="73"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="182"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="186"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="205"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="209"/>
+        <source>Transparent</source>
+        <translation>透明</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="74"/>
+        <source>White</source>
+        <translation>白</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="75"/>
+        <source>Black</source>
+        <translation>黒</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="87"/>
+        <source>Create new vector item</source>
+        <translation>新しいベクターアイテムを作成</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="123"/>
+        <source>&amp;Name:</source>
+        <translation>名前(&amp;N):</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="124"/>
+        <source>&amp;Extension:</source>
+        <translation>拡張子(&amp;E):</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="125"/>
+        <source>&amp;Width:</source>
+        <translation>幅(&amp;W):</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="126"/>
+        <source>&amp;Height:</source>
+        <translation>高さ(&amp;H):</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="129"/>
+        <source>&amp;Background:</source>
+        <translation>背景(&amp;B):</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
+        <source>&amp;Open it with:</source>
+        <translation>開くアプリケーション(&amp;O):</translation>
+    </message>
+</context>
+<context>
+    <name>TupNewProject</name>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="75"/>
+        <source>Create a new project</source>
+        <translation>新しいプロジェクトを作成</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="81"/>
+        <source>Project Name</source>
+        <translation>プロジェクト名</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="85"/>
+        <source>my_project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="88"/>
+        <source>Author</source>
+        <translation>作者</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="127"/>
+        <source>Click here to change background color</source>
+        <translation>背景色を変更するにはここをクリックします</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="226"/>
+        <source>Settings</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
+        <source>Username</source>
+        <translation>ユーザ名</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="233"/>
+        <source>Store password</source>
+        <translation>パスワードを保存</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
+        <source>Please, set a name for the project</source>
+        <translation>プロジェクトに名前を付けてください</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
+        <source>Please, fill in your username</source>
+        <translation>ユーザ名を入力してください</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
+        <source>Please, fill in your password</source>
+        <translation>パスワードを入力してください</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
+        <source>Please, fill in the server name or IP</source>
+        <translation>サーバ名か IP を入力してください</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="325"/>
+        <source>White</source>
+        <translation>白</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="145"/>
+        <source>Dimension</source>
+        <translation>寸法</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="92"/>
+        <source>Your name</source>
+        <translation>あなたの名前</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="95"/>
+        <source>Description</source>
+        <translation>説明</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="99"/>
+        <source>Just for fun!</source>
+        <translation>ただの落書き！</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="103"/>
+        <source>Presets</source>
+        <translation>プリセット</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="106"/>
+        <source>Free format</source>
+        <translation>自由なフォーマット</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="107"/>
+        <source>520x380 - 24</source>
+        <translation>520x380 - 24</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
+        <source>640x480 - 24</source>
+        <translation>640x480 - 24</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="109"/>
+        <source>480p (PAL DV/DVD) - 25</source>
+        <translation>480p (PAL DV/DVD) - 25</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="110"/>
+        <source>576p (PAL DV/DVD) - 25</source>
+        <translation>576p (PAL DV/DVD) - 25</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="111"/>
+        <source>720p (HD) - 25</source>
+        <translation>720p (HD) - 25</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
+        <source>1280p (Full HD) - 25</source>
+        <translation>1280p (フル HD) - 25</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
+        <source>Options</source>
+        <translation>オプション</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="126"/>
+        <source>Background</source>
+        <translation>背景</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
+        <source>FPS</source>
+        <translation>フレーム/秒</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="161"/>
+        <source>Tupitube project</source>
+        <translation>Tupitube プロジェクト</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="167"/>
+        <source>Project info</source>
+        <translation>プロジェクト情報</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
+        <source>Server</source>
+        <translation>サーバ</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
+        <source>Port</source>
+        <translation>ポート</translation>
+    </message>
+</context>
+<context>
+    <name>TupNotice</name>
+    <message>
+        <location filename="../src/net/tupnotice.cpp" line="58"/>
+        <source>Notices</source>
+        <translation>通知</translation>
+    </message>
+</context>
+<context>
+    <name>TupOnionOpacityDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="50"/>
+        <source>Onion Paper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="103"/>
+        <source>-0.05</source>
+        <translation>-0.05</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="107"/>
+        <source>-0.01</source>
+        <translation>-0.01</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="119"/>
+        <source>+0.01</source>
+        <translation>+0.01</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="123"/>
+        <source>+0.05</source>
+        <translation>+0.05</translation>
+    </message>
+</context>
+<context>
+    <name>TupPaintArea</name>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="197"/>
+        <source>Drawing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <source>Cut</source>
+        <translation>切り取り</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <source>Copy</source>
+        <translation>コピー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
+        <source>Paste</source>
+        <translation>貼り付け</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
+        <source>Paste in...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="207"/>
+        <source>next 5 frames</source>
+        <translation>次の 5 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
+        <source>next 10 frames</source>
+        <translation>次の 10 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
+        <source>next 20 frames</source>
+        <translation>次の 20 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
+        <source>next 50 frames</source>
+        <translation>次の 50 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="211"/>
+        <source>next 100 frames</source>
+        <translation>次の 100 フレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="221"/>
+        <source>Delete</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="236"/>
+        <source>Add to library...</source>
+        <translation>ライブラリに追加...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1152"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1190"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="169"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="558"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1331"/>
+        <source>PolyLine</source>
+        <translation>折れ線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="224"/>
+        <source>Send</source>
+        <translation>送信</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="227"/>
+        <source>To back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="228"/>
+        <source>To front</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
+        <source>One level to back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="230"/>
+        <source>One level to front</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1337"/>
+        <source>Rectangle</source>
+        <translation>矩形</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1338"/>
+        <source>Ellipse</source>
+        <translation>楕円</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="174"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1339"/>
+        <source>Line</source>
+        <translation>直線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1052"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1397"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="180"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="611"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="663"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1346"/>
+        <source>Object Selection</source>
+        <translation>オブジェクトを選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="78"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1345"/>
+        <source>Pencil</source>
+        <translation>鉛筆</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="663"/>
+        <source>Line Selection</source>
+        <translation>線分を選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1152"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1190"/>
+        <source>No items selected</source>
+        <translation>アイテムが選択されていません</translation>
+    </message>
+</context>
+<context>
+    <name>TupPaintAreaBase</name>
+    <message>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="393"/>
+        <source>No Scene!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="400"/>
+        <source>Locked!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="469"/>
+        <source>No Frames!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="472"/>
+        <source>No Layers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupPaintAreaConfig</name>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="59"/>
+        <source>Grid color</source>
+        <translation>グリッドの色</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="65"/>
+        <source>Grid separation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="74"/>
+        <source>Background color</source>
+        <translation>背景色</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="80"/>
+        <source>Onion skin color</source>
+        <translation>オニオンスキンの色</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="86"/>
+        <source>Onion skin background </source>
+        <translation>オニオンスキンの背景</translation>
+    </message>
+</context>
+<context>
+    <name>TupPaintAreaStatus</name>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="76"/>
+        <source>Action Safe Area</source>
+        <translation>アクションセーフエリア</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="77"/>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="85"/>
+        <source>Show grid</source>
+        <translation>グリッドを表示</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="86"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
+        <source>Full screen</source>
+        <translation>フルスクリーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="95"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="106"/>
+        <source>Current Frame</source>
+        <translation>現在のフレーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="113"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="127"/>
+        <source>Zoom</source>
+        <translation>ズーム</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="147"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="159"/>
+        <source>Rotate Workspace</source>
+        <translation>作業スペースを回転</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="182"/>
+        <source>Antialiasing</source>
+        <translation>アンチエイリアシング</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="191"/>
+        <source>Background Color</source>
+        <translation>背景色</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="192"/>
+        <source>Click here to change background color</source>
+        <translation>背景色を変更するにはここをクリックします</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="198"/>
+        <source>Brush Color</source>
+        <translation>ブラシの色</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
+        <source>Click here to change brush color</source>
+        <translation>ブラシの色を変更するにはここをクリックします</translation>
+    </message>
+</context>
+<context>
+    <name>TupPenDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="50"/>
+        <source>Pen Size</source>
+        <translation>ペンのサイズ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="102"/>
+        <source>-5</source>
+        <translation>-5</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="106"/>
+        <source>-1</source>
+        <translation>-1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="114"/>
+        <source>+1</source>
+        <translation>+1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="118"/>
+        <source>+5</source>
+        <translation>+5</translation>
+    </message>
+</context>
+<context>
+    <name>TupPenWidget</name>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="52"/>
+        <source>Pen Properties</source>
+        <translation>ペンのプロパティ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="63"/>
+        <source>Thickness</source>
+        <translation>太さ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="76"/>
+        <source>Dashes</source>
+        <translation>破線の種別</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="83"/>
+        <source>Solid</source>
+        <translation>実線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="85"/>
+        <source>Dash</source>
+        <translation>破線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="87"/>
+        <source>Dot</source>
+        <translation>点線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="89"/>
+        <source>Dash dot</source>
+        <translation>一点鎖線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
+        <source>Dash dot dot</source>
+        <translation>二点鎖線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="108"/>
+        <source>Cap</source>
+        <translation>線端</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="114"/>
+        <source>Flat</source>
+        <translation>フラット</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="115"/>
+        <source>Square</source>
+        <translation>方形</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="116"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="132"/>
+        <source>Round</source>
+        <translation>丸型</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
+        <source>Join</source>
+        <translation>結合</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="130"/>
+        <source>Miter</source>
+        <translation>マイター</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="131"/>
+        <source>Bevel</source>
+        <translation>ベベル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="141"/>
+        <source>Brush</source>
+        <translation>ブラシ</translation>
+    </message>
+</context>
+<context>
+    <name>TupPreferences</name>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="202"/>
+        <source>Application TupPreferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
+        <source>Theme</source>
+        <translation>テーマ</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
+        <source>Font</source>
+        <translation>フォント</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
+        <source>Workspace</source>
+        <translation>作業スペース</translation>
+    </message>
+</context>
+<context>
+    <name>TupPreferences::GeneralPage</name>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
+        <source>Tupi Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
+        <source>Cache</source>
+        <translation>キャッシュ</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
+        <source>Browser</source>
+        <translation>ブラウザ</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
+        <source>Open last project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
+        <source>Auto save (minutes)</source>
+        <translation>自動保存 (分)</translation>
+    </message>
+</context>
+<context>
+    <name>TupProjectActionBar</name>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="148"/>
+        <source>Insert frame</source>
+        <translation>フレームを挿入</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
+        <source>Remove the frame</source>
+        <translation>フレームを削除</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="177"/>
+        <source>Move frame up</source>
+        <translation>フレームを上に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="122"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="197"/>
+        <source>F9</source>
+        <translation>F9</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="196"/>
+        <source>Move frame down</source>
+        <translation>フレームを下に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
+        <source>F10</source>
+        <translation>F10</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
+        <source>Lock frame</source>
+        <translation>フレームをロック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="97"/>
+        <source>Insert a layer</source>
+        <translation>レイヤーを挿入</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="98"/>
+        <source>F5</source>
+        <translation>F5</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
+        <source>Remove the layer</source>
+        <translation>レイヤーを削除</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="110"/>
+        <source>F6</source>
+        <translation>F6</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
+        <source>Move layer up</source>
+        <translation>レイヤーを上に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
+        <source>Move layer down</source>
+        <translation>レイヤーを下に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="178"/>
+        <source>F8</source>
+        <translation>F8</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
+        <source>Lock layer</source>
+        <translation>レイヤーをロック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="228"/>
+        <source>Insert a scene</source>
+        <translation>シーンを挿入</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="238"/>
+        <source>Remove the scene</source>
+        <translation>シーンを削除</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="248"/>
+        <source>Move scene up</source>
+        <translation>シーンを上に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="258"/>
+        <source>Move scene down</source>
+        <translation>シーンを下に移動</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="268"/>
+        <source>Lock scene</source>
+        <translation>シーンをロック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
+        <source>Do you want to remove this frame?</source>
+        <translation>このフレームを削除しますか？</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
+        <source>Remove?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
+        <source>Do you want to remove this layer?</source>
+        <translation>このレイヤーを削除しますか？</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
+        <source>Do you want to remove this scene?</source>
+        <translation>このシーンを削除しますか？</translation>
+    </message>
+</context>
+<context>
+    <name>TupProjectManager</name>
+    <message>
+        <location filename="../src/store/tupprojectmanager.cpp" line="207"/>
+        <source>Scene %1</source>
+        <translation>シーン %1</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectmanager.cpp" line="210"/>
+        <source>Layer %1</source>
+        <translation>レイヤー %1</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectmanager.cpp" line="213"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupScene</name>
+    <message>
+        <location filename="../src/store/tupscene.cpp" line="623"/>
+        <source>Layer %1</source>
+        <translation>レイヤー %1</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupscene.cpp" line="624"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupscene.cpp" line="190"/>
+        <source>Sound layer %1</source>
+        <translation>音声レイヤー %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupSceneTabWidget</name>
+    <message>
+        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="77"/>
+        <source>Layers</source>
+        <translation>レイヤー</translation>
+    </message>
+</context>
+<context>
+    <name>TupScenesWidget</name>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="57"/>
+        <source>Scenes Manager</source>
+        <translation>シーンマネージャ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="94"/>
+        <source>Filter here...</source>
+        <translation>フィルタをここに入力...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="155"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="159"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="190"/>
+        <source>Scene %1</source>
+        <translation>シーン %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="165"/>
+        <source>Layer %1</source>
+        <translation>レイヤー %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="168"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupScreen</name>
+    <message>
+        <location filename="../src/components/animation/tupscreen.cpp" line="482"/>
+        <source>Rendering...</source>
+        <translation>レンダリング中...</translation>
+    </message>
+</context>
+<context>
+    <name>TupSplash</name>
+    <message>
+        <location filename="../src/shell/tupsplash.cpp" line="53"/>
+        <source>Version </source>
+        <translation>バージョン </translation>
+    </message>
+</context>
+<context>
+    <name>TupStoryBoardDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="117"/>
+        <source>Storyboard Settings</source>
+        <translation>ストーリーボードの設定</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="128"/>
+        <source>&amp;PDF</source>
+        <translation>&amp;PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="129"/>
+        <source>Export as PDF</source>
+        <translation>PDF としてエクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="132"/>
+        <source>&amp;HTML</source>
+        <translation>&amp;HTML</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="133"/>
+        <source>Export as HTML</source>
+        <translation>HTML としてエクスポート</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="137"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="146"/>
+        <source>&amp;Post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="202"/>
+        <source>Storyboard General Information</source>
+        <translation>ストーリーボードの一般情報</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="269"/>
+        <source>Title</source>
+        <translation>タイトル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="212"/>
+        <source>Author</source>
+        <translation>作者</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="217"/>
+        <source>Summary</source>
+        <translation>要約</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
+        <source>Topics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="265"/>
+        <source>Scene Information</source>
+        <translation>シーンの情報</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="274"/>
+        <source>Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="279"/>
+        <source>Description</source>
+        <translation>説明</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="314"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="334"/>
+        <source>Cover</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="328"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="411"/>
+        <source>Storyboard</source>
+        <translation>ストーリーボード</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="360"/>
+        <source>Scene</source>
+        <translation>シーン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="374"/>
+        <source>Scene No %1 - Information</source>
+        <translation>シーン番号 %1 - 情報</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="570"/>
+        <source>Choose a directory...</source>
+        <translation>ディレクトリを選択...</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
+        <source>Info</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
+        <source>Storyboard exported successfully!</source>
+        <translation>ストーリーボードのエクスポートに成功しました！</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
+        <source>Save PDF file</source>
+        <translation>PDF ファイルを保存</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
+        <source>PDF file (*.pdf)</source>
+        <translation>PDF ファイル (*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="700"/>
+        <source>PDF</source>
+        <translation>PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="702"/>
+        <source>Html</source>
+        <translation>HTML</translation>
+    </message>
+</context>
+<context>
+    <name>TupSymbolEditor</name>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="74"/>
+        <source>Symbol editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="84"/>
+        <source>Brushes</source>
+        <translation>ブラシ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="87"/>
+        <source>Selection</source>
+        <translation>選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="90"/>
+        <source>Fill</source>
+        <translation>塗りつぶし</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="93"/>
+        <source>View</source>
+        <translation>表示</translation>
+    </message>
+</context>
+<context>
+    <name>TupThemeSelector</name>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="73"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
+        <source>Text</source>
+        <translation>テキスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
+        <source>Base</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
+        <source>Foreground</source>
+        <translation>前景</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
+        <source>Background</source>
+        <translation>背景</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
+        <source>Button</source>
+        <translation>ボタン</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
+        <source>Button Text</source>
+        <translation>ボタンのテキスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="101"/>
+        <source>Effects</source>
+        <translation>効果</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
+        <source>Midlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
+        <source>Mid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="127"/>
+        <source>Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
+        <source>Highlight</source>
+        <translation>ハイライト</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
+        <source>Highlighted Text</source>
+        <translation>ハイライトしたテキスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="148"/>
+        <source>Text effects</source>
+        <translation>テキスト効果</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
+        <source>Bright Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
+        <source>Link</source>
+        <translation>リンク</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
+        <source>Link Visited</source>
+        <translation>訪問済みリンク</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="169"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
+        <source>Schema</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="182"/>
+        <source>Save schema</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="189"/>
+        <source>Style</source>
+        <translation>スタイル</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="193"/>
+        <source>Use this colors</source>
+        <translation>この色を使う</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
+        <source>Please choose a theme name</source>
+        <translation>テーマの名前を入力してください</translation>
+    </message>
+</context>
+<context>
+    <name>TupTimeLine</name>
+    <message>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="60"/>
+        <source>Time Line</source>
+        <translation>タイムライン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="613"/>
+        <source>Scene %1</source>
+        <translation>シーン %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="553"/>
+        <source>Layer %1</source>
+        <translation>レイヤー %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="476"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="486"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="558"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="564"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupToolStatus</name>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="46"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="49"/>
+        <source>Current Tool</source>
+        <translation>現在のツール</translation>
+    </message>
+</context>
+<context>
+    <name>TupToolsDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="59"/>
+        <source>Pencil</source>
+        <translation>鉛筆</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="67"/>
+        <source>Ink</source>
+        <translation>インク</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="75"/>
+        <source>Polyline</source>
+        <translation>折れ線</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="83"/>
+        <source>Ellipse</source>
+        <translation>楕円</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="91"/>
+        <source>Rectangle</source>
+        <translation>矩形</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="99"/>
+        <source>Object Selection</source>
+        <translation>オブジェクトを選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="108"/>
+        <source>Line Selection</source>
+        <translation>線分を選択</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="116"/>
+        <source>Color Palette</source>
+        <translation>カラーパレット</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="124"/>
+        <source>Pen Size</source>
+        <translation>ペンのサイズ</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="132"/>
+        <source>Opacity Value</source>
+        <translation>不透明度の値</translation>
+    </message>
+</context>
+<context>
+    <name>TupTwitter</name>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="270"/>
+        <source>Latest version</source>
+        <translation>最新のバージョン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="271"/>
+        <source>Revision</source>
+        <translation>リビジョン</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="272"/>
+        <source>Code Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="275"/>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupTwitterWidget</name>
+    <message>
+        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="47"/>
+        <source>News!</source>
+        <translation>ニュース！</translation>
+    </message>
+</context>
+<context>
+    <name>TupViewColorCells</name>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="111"/>
+        <source>Default Palette</source>
+        <translation>デフォルトのパレット</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="120"/>
+        <source>Named Colors</source>
+        <translation>名前のある色</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="127"/>
+        <source>Custom Color Palette</source>
+        <translation>カスタムカラーパレット</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="132"/>
+        <source>Custom Gradient Palette</source>
+        <translation>カスタムグラデーションパレット</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="373"/>
+        <source>Add Color</source>
+        <translation>色を追加</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="380"/>
+        <source>Remove Color</source>
+        <translation>色を削除</translation>
+    </message>
+</context>
+<context>
+    <name>TupWebHunter</name>
+    <message>
+        <location filename="../src/libbase/tupwebhunter.cpp" line="101"/>
+        <source>Information Temporarily Unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TweenManager</name>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="56"/>
+        <source>Create a new Tween</source>
+        <translation>新しいトゥイーンを作成</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
+        <source>Tween name already exists!</source>
+        <translation>同じ名前のトゥイーンが既に存在します！</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="179"/>
+        <source>Edit</source>
+        <translation>編集</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="181"/>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="184"/>
+        <source>Options</source>
+        <translation>オプション</translation>
+    </message>
+</context>
+<context>
+    <name>Tweener</name>
+    <message>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="161"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="359"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="363"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="768"/>
+        <source>Position Tween</source>
+        <translation>位置トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="134"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="257"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="261"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="555"/>
+        <source>Rotation Tween</source>
+        <translation>回転トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="250"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="546"/>
+        <source>Scale Tween</source>
+        <translation>拡大/縮小トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="117"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="230"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="502"/>
+        <source>Opacity Tween</source>
+        <translation>不透明度トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="101"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="239"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="243"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="527"/>
+        <source>Coloring Tween</source>
+        <translation>彩色トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
+        <source>Coloring Tween can&apos;t be applied to raster images</source>
+        <translation>彩色トゥイーンをラスター画像に適用することはできません</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="144"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="379"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="383"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="758"/>
+        <source>Compound Tween</source>
+        <translation>複合トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="381"/>
+        <source>Shift+X</source>
+        <translation>Shift+X</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="361"/>
+        <source>Shift+W</source>
+        <translation>Shift+W</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="259"/>
+        <source>Shift+R</source>
+        <translation>Shift+R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="252"/>
+        <source>Shift+S</source>
+        <translation>Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="228"/>
+        <source>Shift+O</source>
+        <translation>Shift+O</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="241"/>
+        <source>Shift+C</source>
+        <translation>Shift+C</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
+        <source>Coloring Tween can&apos;t be applied to SVG files</source>
+        <translation>彩色トゥイーンを SVG 画像に適用することはできません</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
+        <source>Tween name is missing!</source>
+        <translation>トゥイーンの名前がありません！</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="505"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="619"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="480"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="654"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="523"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="540"/>
+        <source>Frame %1</source>
+        <translation>フレーム %1</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
+        <source>Info</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
+        <source>Tween %1 applied!</source>
+        <translation>トゥイーン %1 を適用しました！</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="133"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="256"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="260"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="562"/>
+        <source>Shear Tween</source>
+        <translation>せん断変形トゥイーン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="258"/>
+        <source>Shift+H</source>
+        <translation>Shift+H</translation>
+    </message>
+</context>
+<context>
+    <name>TweenerPanel</name>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="84"/>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="119"/>
+        <source>Options</source>
+        <translation>オプション</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="120"/>
+        <source>Select object</source>
+        <translation>オブジェクトを選択</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="121"/>
+        <source>Set Tweeners</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="145"/>
+        <source>Tweeners</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Position</source>
+        <translation>位置</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Rotation</source>
+        <translation>回転</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Scale</source>
+        <translation>スケール</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Shear</source>
+        <translation>せん断変形</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Opacity</source>
+        <translation>不透明度</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Coloring</source>
+        <translation>彩色</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="275"/>
+        <source>Save Tween</source>
+        <translation>トゥイーンを保存</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="277"/>
+        <source>Cancel Tween</source>
+        <translation>トゥイーンをキャンセル</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="369"/>
+        <source>Info</source>
+        <translation>情報</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
+        <source>Select objects for Tweening first!</source>
+        <translation>トゥイーンを適用するオブジェクトを先に選択してください！</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="421"/>
+        <source>Update Tween</source>
+        <translation>トゥイーンを更新</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="423"/>
+        <source>Close Tween properties</source>
+        <translation>トゥイーンのプロパティを閉じる</translation>
+    </message>
+</context>
+<context>
+    <name>TweenerTable</name>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Position</source>
+        <translation>位置</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Rotation</source>
+        <translation>回転</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Scale</source>
+        <translation>スケール</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Shear</source>
+        <translation>せん断変形</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Opacity</source>
+        <translation>不透明度</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Coloring</source>
+        <translation>彩色</translation>
+    </message>
+</context>
+<context>
+    <name>VideoProperties</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="877"/>
+        <source>Set Animation Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="889"/>
+        <source>Title</source>
+        <translation>タイトル</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="890"/>
+        <source>My Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="895"/>
+        <source>Topics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="896"/>
+        <source>#topic1 #topic2 #topic3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="901"/>
+        <source>Description</source>
+        <translation>説明</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="907"/>
+        <source>Just a little taste of my style :)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="968"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="988"/>
+        <source>Set a title for the picture here!</source>
+        <translation>画像のタイトルをここに入力してください！</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="975"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="999"/>
+        <source>Set some topic tags for the picture here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ViewTool</name>
+    <message>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="93"/>
+        <source>Z</source>
+        <translation>Z</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="87"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="106"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="111"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="139"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="181"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="300"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="330"/>
+        <source>Shift</source>
+        <translation>手のひら</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="87"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="92"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="133"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="141"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="242"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="263"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="332"/>
+        <source>Zoom In</source>
+        <translation>ズームイン</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="87"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="99"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="104"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="133"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="246"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="334"/>
+        <source>Zoom Out</source>
+        <translation>ズームアウト</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="100"/>
+        <source>Shift+Z</source>
+        <translation>Shift+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/view/viewtool.cpp" line="107"/>
+        <source>H</source>
+        <translation>H</translation>
+    </message>
+</context>
+<context>
+    <name>ZoomConfigurator</name>
+    <message>
+        <location filename="../src/plugins/tools/view/zoomconfigurator.cpp" line="54"/>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/view/zoomconfigurator.cpp" line="67"/>
+        <source>Tips</source>
+        <translation>ヒント</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/view/zoomconfigurator.cpp" line="74"/>
+        <source>Zoom Square mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/view/zoomconfigurator.cpp" line="74"/>
+        <source>Press Ctrl key + Mouse left button</source>
+        <translation>Ctrl + 左マウスボタンを押してください</translation>
+    </message>
+</context>
+</TS>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_pt.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_pt.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_pt.ts tupi-0.2+git05/src/shell/data/translations/tupi_pt.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_pt.ts	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_pt.ts	2014-12-15 14:21:34.000000000 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_PT">
+<TS version="2.1" language="pt_PT">
 <context>
     <name>ButtonsPanel</name>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="47"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="41"/>
         <source>Edit Tween</source>
         <translation>Editar Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="51"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="45"/>
         <source>Remove Tween</source>
         <translation>Remover Intermeios</translation>
     </message>
@@ -17,122 +17,108 @@
 <context>
     <name>Configurator</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/color/configurator.cpp" line="66"/>
         <source>Coloring Tween</source>
         <translation>Intermeios de Cor</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/configurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/compound/configurator.cpp" line="71"/>
         <source>Compound Tween</source>
         <translation>Intermeios Composto</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="59"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="57"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="58"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="52"/>
         <source>Parameters</source>
         <translation>Parâmetros</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="81"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="77"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="80"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="72"/>
         <source>Dot Spacing</source>
         <translation>Espaço entre Pontos</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="97"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="93"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="96"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="88"/>
         <source>Size Tolerance</source>
         <translation>Tolerância de Tamanho</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="122"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="117"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="121"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="112"/>
         <source>Smoothness</source>
         <translation>Suavidade</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/opacity/configurator.cpp" line="70"/>
         <source>Opacity Tween</source>
         <translation>Intermeios de Opacidade</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/configurator.cpp" line="91"/>
+        <location filename="../src/plugins/tools/position/configurator.cpp" line="80"/>
         <source>Position Tween</source>
         <translation>Intermeios de Posição</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/papagayo/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/rotation/configurator.cpp" line="70"/>
         <source>Rotation Tween</source>
         <translation>Intermeios de Rotação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/scale/configurator.cpp" line="70"/>
         <source>Scale Tween</source>
         <translation>Intermeios de Escala</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="53"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="48"/>
         <source>This tool is just a &lt;b&gt;proof-of-concept&lt;/b&gt; of the basic algorithm for the Tupi&apos;s free-tracing vectorial brushes</source>
         <translation>Esta ferramenta é apenas uma &lt;b&gt;prova-de-conceito&lt;/b&gt;do algoritmo básico para os pincéis vetoriais do Tupi</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="63"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="58"/>
         <source>Structure</source>
         <translation>Estrutura</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="68"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="63"/>
         <source>Basic</source>
         <translation>Básico</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="64"/>
         <source>Axial</source>
         <translation>Axial</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="65"/>
         <source>Organic</source>
         <translation>Orgânico</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="109"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="104"/>
         <source>Run simulation</source>
         <translation>Executar simulação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/shear/configurator.cpp" line="70"/>
         <source>Shear Tween</source>
         <translation>Intermeios de Corte</translation>
     </message>
 </context>
 <context>
-    <name>ContourSelection</name>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="107"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="306"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="309"/>
-        <source>Line Selection</source>
-        <translation>Seleção de Contorno</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="307"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-</context>
-<context>
     <name>EraserTool</name>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="67"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="72"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="76"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="49"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="54"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="58"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="79"/>
         <source>Eraser</source>
         <translation>Borracha</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="73"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="55"/>
         <source>E</source>
         <translation>E</translation>
     </message>
@@ -140,17 +126,17 @@
 <context>
     <name>ExportTo</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="468"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="469"/>
         <source>Image name prefix: </source>
         <translation>Prefixo do nome da imagem: </translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="476"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="477"/>
         <source>File: </source>
         <translation>Arquivo: </translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="473"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="474"/>
         <source>Directory: </source>
         <translation>Diretório: </translation>
     </message>
@@ -180,62 +166,62 @@
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="644"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="649"/>
         <source>Choose a file name...</source>
         <translation>Escolha um nome de arquivo...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="657"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="663"/>
         <source>Choose a directory...</source>
         <translation>Escolha um diretório...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="723"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="741"/>
         <source>Warning!</source>
         <translation>Alerta!</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="724"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="742"/>
         <source>File exists. Overwrite it?</source>
         <translation>O arquivo existe. Deseja sobrescrevê-lo?</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="688"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="700"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="734"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="744"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="784"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="688"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
         <source>Images name prefix can&apos;t be empty! Please, type a prefix.</source>
         <translation>O prefixo do nome das imagens não pode ser vazio! Por favor, digite um prefixo.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="700"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="734"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
         <source>Directory doesn&apos;t exist! Please, choose another path.</source>
         <translation>Diretório não existe! Por favor, escolha outro caminho.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="744"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation>Você não tem permissão para criar este arquivo. Por favor, escolha outro caminho.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="784"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Format problem. Tupi Internal error.</source>
         <translation>Problema no formato. Erro Interno do Tupi.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="791"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="825"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="795"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="829"/>
         <source>ERROR!</source>
         <translation>ERRO!</translation>
     </message>
@@ -243,145 +229,145 @@
 <context>
     <name>FillTool</name>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="98"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="102"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="169"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="80"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="84"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="177"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="278"/>
         <source>Internal fill</source>
         <translation>Preenchimento interno</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="104"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="108"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="171"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="267"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="86"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="90"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="179"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="280"/>
         <source>Line fill</source>
         <translation>Preenchimento de Contorno</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="99"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="81"/>
         <source>I</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="105"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="87"/>
         <source>B</source>
         <translation>B</translation>
     </message>
 </context>
 <context>
-    <name>GenericExportPlugin</name>
-    <message>
-        <location filename="../src/plugins/export/genericexportplugin/genericexportplugin.cpp" line="55"/>
-        <source>Image Array</source>
-        <translation>Conjunto de Imagens</translation>
-    </message>
-</context>
-<context>
     <name>GeometricTool</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="124"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="151"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="207"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="220"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="283"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="302"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="333"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="380"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="113"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="118"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="149"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="209"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="222"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="285"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="308"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="339"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="386"/>
         <source>Rectangle</source>
         <translation>Retângulo</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="126"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="131"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="158"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="305"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="335"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="382"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="125"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="311"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="341"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="388"/>
         <source>Ellipse</source>
         <translation>Elípse</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="133"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="138"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="165"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="309"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="384"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="448"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="455"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="462"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="132"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="163"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="315"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="390"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="460"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="467"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="474"/>
         <source>Line</source>
         <translation>Linha</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="114"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="121"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="128"/>
         <source>L</source>
         <translation>L</translation>
     </message>
 </context>
 <context>
+    <name>ImagePlugin</name>
+    <message>
+        <location filename="../src/plugins/export/imageplugin/imageplugin.cpp" line="48"/>
+        <source>Image Array</source>
+        <translation type="unfinished">Sequência de Imagens</translation>
+    </message>
+</context>
+<context>
     <name>InfoPanel</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="48"/>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="52"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="43"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="51"/>
         <source>Tips</source>
         <translation>Dicas</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
-        <source>Mouse Double Click</source>
-        <translation>Duplo Clique do Mouse</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
         <source>Close the line path</source>
         <translation>Fechar o caminho da linha</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Mouse Right Click</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Shift</source>
         <translation>Deslocamento</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Align line to horizontal/vertical axis</source>
         <translation>Alinhar linha ao eixo horizontal/vertical</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Shift + Left Mouse Button</source>
         <translation>Shift + Botão Esquerdo do Mouse</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Set width/height proportional dimensions</source>
         <translation>Definir dimensões de largura/altura proporcionais</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>Close line</source>
         <translation>Fechar linha</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>X key or Right mouse button</source>
         <translation>Tecla X ou Botão direito do mouse</translation>
     </message>
@@ -389,14 +375,14 @@
 <context>
     <name>InkTool</name>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="139"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="558"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="562"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="605"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="609"/>
         <source>Ink</source>
         <translation>Tinta</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="559"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="606"/>
         <source>K</source>
         <translation>K</translation>
     </message>
@@ -404,89 +390,145 @@
 <context>
     <name>KinasWidget</name>
     <message>
-        <location filename="../src/components/kinas/kinaswidget.cpp" line="43"/>
+        <location filename="../src/components/kinas/kinaswidget.cpp" line="42"/>
         <source>Tupi Script</source>
         <translation>Tupi Script</translation>
     </message>
 </context>
 <context>
+    <name>NodesTool</name>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="88"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="351"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="354"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="352"/>
+        <source>N</source>
+        <translation type="unfinished">N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="257"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="261"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="555"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="259"/>
+        <source>Shift+R</source>
+        <translation type="unfinished">Shift+R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Error</source>
+        <translation type="unfinished">Erro</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Tween name is missing!</source>
+        <translation type="unfinished">Nome do intermeios indefinido!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="533"/>
+        <source>Frame %1</source>
+        <translation type="unfinished">Quadro %1</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Info</source>
+        <translation type="unfinished">Informação</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Tween %1 applied!</source>
+        <translation type="unfinished">Intermeios %1 aplicado!</translation>
+    </message>
+</context>
+<context>
     <name>PencilTool</name>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="88"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="135"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="78"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="83"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="129"/>
         <source>Pencil</source>
         <translation>Lápis</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="89"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="79"/>
         <source>P</source>
         <translation>P</translation>
     </message>
 </context>
 <context>
-    <name>PolyLine</name>
+    <name>PolyLineTool</name>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="100"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="104"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="129"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="93"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="122"/>
         <source>PolyLine</source>
-        <translation>Polilinha</translation>
+        <translation type="unfinished">Polilinha</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="101"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="94"/>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished">S</translation>
     </message>
 </context>
 <context>
     <name>PositionSettings</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="78"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="68"/>
         <source>Component</source>
         <translation>Componente</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="71"/>
         <source>Position</source>
         <translation>Posição</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="82"/>
         <source>Starting at frame</source>
         <translation>Iniciar no quadro</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="119"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="180"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="212"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="243"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="202"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="233"/>
         <source>Frames Total</source>
         <translation>Total de Quadros</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="154"/>
         <source>Cancel Tween</source>
         <translation>Cancelar Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>You must define a path for this Tween!</source>
         <translation>Você deve definir um caminho para este Intermeios!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="235"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="225"/>
         <source>Position Tween is set!</source>
         <translation>Intermeios de Posição está definido!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="260"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="250"/>
         <source>Close Tween properties</source>
         <translation>Fechar propriedades de Intermeios</translation>
     </message>
@@ -494,102 +536,102 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="262"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="229"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="268"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="235"/>
         <source>Warning</source>
         <translation>Alerta</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="274"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="241"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="280"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="247"/>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="70"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="51"/>
         <source>Fatal Error</source>
         <translation>Erro Fatal</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="71"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="52"/>
         <source>Well, Tupi has crashed...</source>
         <translation>Bem, o Tupi falhou...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="72"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="53"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="73"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="54"/>
         <source>Re-launch Tupi</source>
         <translation>Recarregar o Tupi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="74"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="55"/>
         <source>This is a general failure</source>
         <translation>Esta é uma falha geral</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="137"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="159"/>
         <source>add</source>
         <translation>adicionar</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="142"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="164"/>
         <source>remove</source>
         <translation>remover</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="147"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="169"/>
         <source>move</source>
         <translation>mover</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="152"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="174"/>
         <source>lock</source>
         <translation>travar</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="157"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="179"/>
         <source>rename</source>
         <translation>renomear</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="162"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="184"/>
         <source>select</source>
         <translation>selecionar</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="167"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="189"/>
         <source>edit node</source>
         <translation>editar nó</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="172"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="194"/>
         <source>view</source>
         <translation>ver</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="177"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="199"/>
         <source>transform</source>
         <translation>transformar</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="182"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="204"/>
         <source>convert</source>
         <translation>converter</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="490"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="535"/>
         <source>Wall from</source>
         <translation>Muro a partir de</translation>
     </message>
@@ -597,14 +639,14 @@
 <context>
     <name>SchemeTool</name>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="144"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="697"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="701"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="682"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="686"/>
         <source>Scheme</source>
         <translation>Esquema</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="698"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="683"/>
         <source>M</source>
         <translation>M</translation>
     </message>
@@ -612,93 +654,93 @@
 <context>
     <name>SelectPlugin</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="100"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="77"/>
         <source>Select plugin</source>
         <translation>Selecionar plugin</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="165"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="231"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="142"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
         <source>WEBM Video</source>
         <translation>Vídeo WEBM</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="170"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="234"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="147"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="211"/>
         <source>OGV Video</source>
         <translation>Vídeo OGM</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="175"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="237"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="152"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="214"/>
         <source>MPEG Video</source>
         <translation>Vídeo MPEG</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="180"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="240"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="217"/>
         <source>Macromedia flash</source>
         <translation>Macromedia flash</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="243"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="162"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="220"/>
         <source>AVI Video</source>
         <translation>Vídeo AVI</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="218"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="264"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="241"/>
         <source>Animated PNG (APNG)</source>
         <translation>PNG Animado (APNG)</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="246"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="223"/>
         <source>RealMedia Video</source>
         <translation>Vídeo RealMedia</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="282"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="259"/>
         <source>Animated Image</source>
         <translation>Imagem Animada</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="284"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
         <source>Image Array</source>
         <translation>Sequência de Imagens</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="249"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="167"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="226"/>
         <source>ASF Video</source>
         <translation>Vídeo ASF</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="252"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="172"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="229"/>
         <source>QuickTime Video</source>
         <translation>Vídeo QuickTime</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="255"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="232"/>
         <source>Gif Image</source>
         <translation>Imagem GIF</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="258"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="235"/>
         <source>PNG Image Array</source>
         <translation>Sequência de Imagens PNG</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="213"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="238"/>
         <source>JPEG Image Array</source>
         <translation>Sequência de Imagens JPEG</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="224"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="267"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="201"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="244"/>
         <source>SMIL</source>
         <translation>SMIL</translation>
     </message>
@@ -706,465 +748,495 @@
 <context>
     <name>SelectScenes</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="327"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="304"/>
         <source>Select Scenes</source>
         <translation>Selecionar Cenas</translation>
     </message>
 </context>
 <context>
-    <name>SelectTool</name>
+    <name>SelectionTool</name>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="339"/>
-        <source>Select</source>
-        <translation>Selecionar</translation>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="161"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="369"/>
+        <source>Selection</source>
+        <translation type="unfinished">Seleção</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="336"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="366"/>
         <source>Object Selection</source>
-        <translation>Seleção de Objeto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="337"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="367"/>
         <source>O</source>
-        <translation>O</translation>
+        <translation type="unfinished">O</translation>
     </message>
 </context>
 <context>
     <name>Settings</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="96"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="82"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="101"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="97"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="85"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="72"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="87"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="88"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="104"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="92"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="111"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="108"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="91"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="95"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="82"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="98"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="105"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="93"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="112"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="99"/>
         <source>Select object</source>
         <translation>Selecionar objeto</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="113"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="109"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="110"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="93"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="84"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="99"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="100"/>
         <source>Set Properties</source>
         <translation>Definir Propriedades</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="148"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="146"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="134"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="133"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="137"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="124"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="140"/>
         <source>Starting at frame</source>
         <translation>Iniciar no quadro</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="155"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="156"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="141"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="145"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="147"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="148"/>
         <source>Ending at frame</source>
         <translation>Terminar no quadro</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="177"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="573"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="175"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="524"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="185"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="210"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="184"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="670"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="178"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="546"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="179"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="552"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="565"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="168"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="516"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="200"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="538"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="171"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="544"/>
         <source>Frames Total</source>
         <translation>Total de Quadros</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="203"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="190"/>
         <source>White</source>
         <translation>Branco</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="192"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="179"/>
         <source>Initial Color</source>
         <translation>Cor Inicial</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="195"/>
         <source>Ending Color</source>
         <translation>Cor Final</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="221"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="212"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="211"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="212"/>
         <source>Iterations</source>
         <translation>Iterações</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="230"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="337"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="217"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="221"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="221"/>
         <source>Loop</source>
         <translation>Repetir</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="346"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="238"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="230"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="230"/>
         <source>Loop with Reverse</source>
         <translation>Repetir com Retorno</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="284"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="383"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="287"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="287"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="178"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="279"/>
         <source>Save Tween</source>
         <translation>Salvar Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="288"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="190"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="385"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="289"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="289"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="275"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="281"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="281"/>
         <source>Cancel Tween</source>
         <translation>Cancelar Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="350"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="343"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="459"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="359"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="343"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="333"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="347"/>
         <source>Update Tween</source>
         <translation>Atualizar Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="360"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="352"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="345"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="461"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="361"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="357"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="347"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="335"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="349"/>
         <source>Close Tween properties</source>
         <translation>Fechar propriedades de Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
         <source>You must select at least one object!</source>
         <translation>Você deve selecionar ao menos um objeto!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
         <source>You must set Tween properties first!</source>
         <translation>Você deve definir as propriedades de Intermeios primeiro!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Select objects for Tweening first!</source>
         <translation>Selecione objetos para o Intermeios primeiro!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="183"/>
         <source>Initial Opacity</source>
         <translation>Opacidade Inicial</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="206"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="199"/>
         <source>Ending Opacity</source>
         <translation>Opacidade Final</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
         <source>You must define a path for this Tween!</source>
         <translation>Você deve definir um caminho para este Intermeios!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="193"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="185"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="185"/>
         <source>Continuous</source>
         <translation>Contínuo</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="194"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="186"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="186"/>
         <source>Partial</source>
         <translation>Parcial</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="190"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="199"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="199"/>
         <source>Speed (Degrees/Frame)</source>
         <translation>Velocidade (Graus/Quadro)</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="265"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="265"/>
         <source>Direction</source>
         <translation>Direção</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="269"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="269"/>
         <source>Clockwise</source>
         <translation>Sentido horário</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="278"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="270"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="270"/>
         <source>Counterclockwise</source>
         <translation>Sentido anti-horário</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="302"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="294"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="294"/>
         <source>Degrees Range</source>
         <translation>Graus de Rotação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="305"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="297"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="297"/>
         <source>Start at</source>
         <translation>Iniciar em</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="321"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="313"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="313"/>
         <source>Finish at</source>
         <translation>Terminar em</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="188"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="179"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="180"/>
         <source>Width &amp; Height</source>
         <translation>Largura e Altura</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="189"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="181"/>
         <source>Only Width</source>
         <translation>Somente Largura</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="189"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="181"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="182"/>
         <source>Only Height</source>
         <translation>Somente Altura</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="182"/>
         <source>Scale in</source>
         <translation>Escalar em</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="206"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="199"/>
         <source>Scaling Factor</source>
         <translation>Fator de Escala</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="191"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="183"/>
         <source>Shear in</source>
         <translation>Cortar em</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/settings.cpp" line="57"/>
+        <location filename="../src/plugins/tools/pencil/settings.cpp" line="53"/>
         <source>Smoothness</source>
         <translation>Suavidade</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="66"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="59"/>
         <source>Flips</source>
         <translation>Transformações</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="77"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="70"/>
         <source>Horizontal Flip</source>
         <translation>Virar Horizontalmente</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="80"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="73"/>
         <source>Vertical Flip</source>
         <translation>Virar Verticalmente</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="76"/>
         <source>Crossed Flip</source>
         <translation>Virar para ambas as direções</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="89"/>
         <source>Order</source>
         <translation>Ordenar</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="106"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="99"/>
         <source>Send object to back</source>
         <translation>Enviar o objeto para trás</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="102"/>
         <source>Send object to back one level</source>
         <translation>Enviar o objeto para trás um nível</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="112"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="105"/>
         <source>Send object to front</source>
         <translation>Enviar o objeto para frente</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="115"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="108"/>
         <source>Send object to front one level</source>
         <translation>Enviar o objeto para frente um nível</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="131"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="124"/>
         <source>Position</source>
         <translation>Posição</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="236"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="229"/>
         <source>Show Tips</source>
         <translation>Exibir Dicas</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="158"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="237"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="151"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="230"/>
         <source>A little help for the Selection tool</source>
         <translation>Uma pequena ajuda para a ferramenta Seleção</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Rotation mode</source>
         <translation>Modo de rotação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Double click on any node or shortcut Alt + R</source>
         <translation>Clique duplo em qualquer nó ou atalho Alt + R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Arrows</source>
         <translation>Setas</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Movement on selection</source>
         <translation>Movimento da seleção</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Shift + Arrows</source>
         <translation>Shift + Setas</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Slow movement on selection</source>
         <translation>Movimento lento da seleção</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Ctrl + Arrows</source>
         <translation>Ctrl + Setas</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Fast movement on selection</source>
         <translation>Movimento rápido da seleção</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Shift + Left Mouse Button</source>
         <translation>Shift + Botão Esquerdo do Mouse</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Proportional scaling on selection</source>
         <translation>Escala proporcional da seleção</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="231"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="224"/>
         <source>Show Tools</source>
         <translation>Exibir Ferramentas</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="232"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="225"/>
         <source>Options panel for the Selection tool</source>
         <translation>Painel de opções para a ferramenta Seleção</translation>
     </message>
@@ -1172,12 +1244,12 @@
 <context>
     <name>SpinControl</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="220"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="221"/>
         <source>Radius</source>
         <translation>Raio</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="229"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="230"/>
         <source>Angle</source>
         <translation>Ângulo</translation>
     </message>
@@ -1185,12 +1257,12 @@
 <context>
     <name>StepsViewer</name>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Frames</source>
         <translation>Quadros</translation>
     </message>
@@ -1198,42 +1270,42 @@
 <context>
     <name>TButtonBar</name>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="59"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="47"/>
         <source>Left button bar</source>
         <translation>Barra de botões esquerda</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="64"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="52"/>
         <source>Right button bar</source>
         <translation>Barra de botões direita</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="69"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="57"/>
         <source>Bottom button bar</source>
         <translation>Barra de botões inferior</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="74"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="62"/>
         <source>Top button bar</source>
         <translation>Barra de botões superior</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="88"/>
         <source>Only icons</source>
         <translation>Apenas ícones</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="91"/>
         <source>Only texts</source>
         <translation>Apenas texto</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="108"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="96"/>
         <source>Exclusive space</source>
         <translation>Espaço exclusivo</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="115"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
         <source>Auto hide</source>
         <translation>Ocultar automaticamente</translation>
     </message>
@@ -1241,12 +1313,12 @@
 <context>
     <name>TCommandHistory</name>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="45"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="41"/>
         <source>Undo</source>
         <translation>Desfazer</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="46"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="42"/>
         <source>Redo</source>
         <translation>Refazer</translation>
     </message>
@@ -1254,32 +1326,32 @@
 <context>
     <name>TFontChooser</name>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="52"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="45"/>
         <source>Family</source>
         <translation>Família</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="56"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="49"/>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="60"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="53"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="80"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="73"/>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="81"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="74"/>
         <source>Italic</source>
         <translation>Itálico</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="82"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="75"/>
         <source>Oblique</source>
         <translation>Oblíquo</translation>
     </message>
@@ -1287,17 +1359,17 @@
 <context>
     <name>TOptionalDialog</name>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="60"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="56"/>
         <source>Don&apos;t show again</source>
         <translation>Não mostrar novamente</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="59"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="67"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
@@ -1305,12 +1377,12 @@
 <context>
     <name>TRulerBase</name>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="109"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="102"/>
         <source>Change scale to 5...</source>
         <translation>Alterar escala para 5...</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="110"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="103"/>
         <source>Change scale to 10...</source>
         <translation>Alterar escala para 10...</translation>
     </message>
@@ -1318,22 +1390,22 @@
 <context>
     <name>TViewButton</name>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="275"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="265"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="276"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="266"/>
         <source>Only icon</source>
         <translation>Apenas ícone</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="277"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="267"/>
         <source>Only text</source>
         <translation>Apenas texto</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="280"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="270"/>
         <source>Mouse sensibility</source>
         <translation>Sensibilidade do mouse</translation>
     </message>
@@ -1341,22 +1413,22 @@
 <context>
     <name>TWizard</name>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="48"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="40"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="49"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="41"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Voltar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="50"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="42"/>
         <source>Next &gt;</source>
         <translation>Próximo &gt;</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="51"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="43"/>
         <source>&amp;Finish</source>
         <translation>&amp;Terminar</translation>
     </message>
@@ -1364,22 +1436,22 @@
 <context>
     <name>TabDialog</name>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="93"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="89"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="96"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="107"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="103"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="114"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="110"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -1387,7 +1459,7 @@
 <context>
     <name>TextConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/textconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/text/textconfigurator.cpp" line="49"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
@@ -1395,14 +1467,14 @@
 <context>
     <name>TextTool</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="64"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="163"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="167"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="57"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="160"/>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="164"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="157"/>
         <source>T</source>
         <translation>T</translation>
     </message>
@@ -1410,18 +1482,18 @@
 <context>
     <name>TreeWidgetSearchLine</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="74"/>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="89"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="63"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="78"/>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="277"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="266"/>
         <source>Search Columns</source>
         <translation>Buscar Colunas</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="279"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="268"/>
         <source>All Visible Columns</source>
         <translation>Todas as Colunas Visíveis</translation>
     </message>
@@ -1429,7 +1501,7 @@
 <context>
     <name>TreeWidgetSearchLineWidget</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="575"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="564"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
@@ -1437,32 +1509,32 @@
 <context>
     <name>TupAbout</name>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="136"/>
+        <location filename="../src/libui/tupabout.cpp" line="152"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="111"/>
+        <location filename="../src/libui/tupabout.cpp" line="115"/>
         <source>Credits</source>
         <translation>Créditos</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="58"/>
+        <location filename="../src/libui/tupabout.cpp" line="48"/>
         <source>About Tupi</source>
         <translation>Sobre o Tupi</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="126"/>
+        <location filename="../src/libui/tupabout.cpp" line="136"/>
         <source>Thanks</source>
         <translation>Agradecimentos</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="146"/>
+        <location filename="../src/libui/tupabout.cpp" line="167"/>
         <source>License Agreement</source>
         <translation>Acordo de Licença</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="147"/>
+        <location filename="../src/libui/tupabout.cpp" line="168"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
@@ -1470,37 +1542,42 @@
 <context>
     <name>TupBasicCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Tupi Camera Manager</source>
         <translation>Gerenciador de Câmera do Tupi</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Current resolution:</source>
         <translation>Resolução atual:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="122"/>
         <source>Cameras</source>
         <translation>Câmeras</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="124"/>
         <source>Camera</source>
         <translation>Câmera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="138"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
         <source>Take picture</source>
         <translation>Tirar uma foto</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="147"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Can&apos;t create pictures directory</source>
         <translation>Não é possível criar o diretório de fotos</translation>
     </message>
@@ -1508,27 +1585,27 @@
 <context>
     <name>TupCameraBar</name>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="61"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="59"/>
         <source>Rewind</source>
         <translation>Rebobinar</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="66"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="64"/>
         <source>Play in reverse</source>
         <translation>Reproduzir em reverso</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="71"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="69"/>
         <source>Play</source>
         <translation>Reproduzir</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="76"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="74"/>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="81"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="79"/>
         <source>Forward</source>
         <translation>Avançar</translation>
     </message>
@@ -1536,42 +1613,42 @@
 <context>
     <name>TupCameraDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="56"/>
         <source>Camera Settings</source>
         <translation>Definições da Câmera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="72"/>
         <source>Available Camera Devices:</source>
         <translation>Dispositivos de Câmera Disponíveis:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="77"/>
         <source>Camera Detected:</source>
         <translation>Câmera Detectada:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="89"/>
         <source>Available Camera Resolutions:</source>
         <translation>Resoluções de Câmera Disponíveis:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="101"/>
         <source>Resize my project to fit camera resolution</source>
         <translation>Redimensionar meu projeto para caber na resolução da câmera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="104"/>
         <source>Use the basic camera interface (low resources)</source>
         <translation>Usar a interface básica de câmera (poucos recursos)</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="110"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="127"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -1579,87 +1656,92 @@
 <context>
     <name>TupCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Tupi Camera Manager</source>
         <translation>Gerenciador de Câmera do Tupi</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Current resolution:</source>
         <translation>Resolução atual:</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="125"/>
         <source>Cameras</source>
         <translation>Câmeras</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="127"/>
         <source>Camera</source>
         <translation>Câmera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="133"/>
         <source>Take picture</source>
         <translation>Tirar foto</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="138"/>
         <source>Show safe area</source>
         <translation>Mostrar área segura</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="139"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
         <source>Show grid</source>
         <translation>Mostrar grade</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="156"/>
         <source>Grid spacing</source>
         <translation>Espaçamento da grade</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="174"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="167"/>
         <source>Grid color</source>
         <translation>Cor da grade</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="190"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="183"/>
         <source>Show previous images</source>
         <translation>Exibir imagens anteriores</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="191"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="184"/>
         <source>P</source>
         <translation>P</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="194"/>
         <source>Image opacity level</source>
         <translation>Nível de opacidade da imagem</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="204"/>
         <source>Amount of images to show</source>
         <translation>Quantidade de imagens para exibir</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="231"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Can&apos;t create pictures directory</source>
         <translation>Não é possível criar o diretório de fotos</translation>
     </message>
@@ -1667,37 +1749,37 @@
 <context>
     <name>TupCameraStatus</name>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="79"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="71"/>
         <source>Scene name</source>
         <translation>Nome da cena</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="92"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="84"/>
         <source>Frames total</source>
         <translation>Total de frames</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="103"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="95"/>
         <source>FPS</source>
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="120"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="112"/>
         <source>Loop</source>
         <translation>Repetir</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="124"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="116"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="137"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="129"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="147"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="139"/>
         <source>Post</source>
         <translation>Publicar</translation>
     </message>
@@ -1705,207 +1787,230 @@
 <context>
     <name>TupCameraWidget</name>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="98"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="91"/>
         <source>Scene Preview</source>
         <translation>Pré-visualização da Cena</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="162"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="159"/>
         <source>Scale</source>
         <translation>Escala</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="185"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="182"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
 </context>
 <context>
+    <name>TupCameraWindow</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="95"/>
+        <source>General Camera error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="100"/>
+        <source>Camera invalid request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="105"/>
+        <source>Camera service missing error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="110"/>
+        <source>Camera not supported error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupCanvas</name>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="94"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="80"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="71"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="78"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="79"/>
         <source>Tupi: Open 2D Magic</source>
         <translation>Tupí: Open 2D Magic</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="101"/>
         <source>Sketch Tools</source>
         <translation>Ferramentas de Rascunho</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="128"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="119"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="119"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="105"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="118"/>
         <source>Images</source>
         <translation>Imagens</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="109"/>
         <source>Selection Tools</source>
         <translation>Ferramentas de Seleção</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="136"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="147"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="146"/>
         <source>Undo</source>
         <translation>Desfazer</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="140"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="151"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="151"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="149"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="150"/>
         <source>Redo</source>
         <translation>Refazer</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="144"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="131"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="130"/>
         <source>Delete Selection</source>
         <translation>Eliminar Seleção</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="135"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="135"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="134"/>
         <source>Zoom In</source>
         <translation>Aproximar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="139"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="137"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="138"/>
         <source>Zoom Out</source>
         <translation>Afastar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="156"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="143"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="143"/>
-        <source>Hand</source>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="142"/>
+        <source>Shift</source>
         <translation>Mão</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="160"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="137"/>
         <source>Pen Properties</source>
         <translation>Propriedades da Caneta</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="164"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="163"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="162"/>
         <source>Exposure Sheet</source>
         <translation>Tábua de Exposição</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="447"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="295"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="425"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="293"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="295"/>
         <source>Import a SVG file...</source>
         <translation>Importar um arquivo SVG...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="448"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="296"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="297"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="426"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="294"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
         <source>Vector</source>
         <translation>Vetor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="485"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="463"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="331"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="333"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="487"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="335"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="465"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="335"/>
         <source>Image is bigger than workspace.</source>
         <translation>A imagem é maior que a área de trabalho.</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="488"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="336"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="337"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="466"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
         <source>Do you want to resize it?</source>
         <translation>Deseja redimensioná-la?</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="634"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="609"/>
         <source>Scene %1</source>
         <translation>Cena %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="637"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="612"/>
         <source>Layer 1</source>
         <translation>Camada 1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="640"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="615"/>
         <source>Frame 1</source>
         <translation>Quadro 1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="653"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="628"/>
         <source>Layer %1</source>
         <translation>Camada %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="660"/>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="672"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="635"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="647"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="97"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="97"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="96"/>
         <source>Pencil</source>
         <translation>Lápis</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="101"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="101"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="99"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="100"/>
         <source>Ink</source>
         <translation>Tinta</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="111"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="109"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="110"/>
         <source>Ellipse</source>
         <translation>Elípse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="115"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="114"/>
         <source>Rectangle</source>
         <translation>Retângulo</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="122"/>
         <source>Object Selection</source>
         <translation>Seleção de Objeto</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="127"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="127"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="126"/>
+        <source>Nodes Selection</source>
         <translation>Seleção de Linha</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="155"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="155"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="154"/>
         <source>Color Palette</source>
         <translation>Paleta de Cor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="159"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="158"/>
         <source>Pen Size</source>
         <translation>Tamanho da Caneta</translation>
     </message>
@@ -1913,17 +2018,17 @@
 <context>
     <name>TupChat</name>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="85"/>
+        <location filename="../src/net/tupchat.cpp" line="75"/>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="174"/>
+        <location filename="../src/net/tupchat.cpp" line="164"/>
         <source>Error:</source>
         <translation>Erro:</translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="175"/>
+        <location filename="../src/net/tupchat.cpp" line="165"/>
         <source>Invalid Message. It won&apos;t be sent. Please, don&apos;t use HTML tags</source>
         <translation>Mensagem Inválida. Ela não será enviada. Por favor, não utilize etiquetas HTML</translation>
     </message>
@@ -1931,27 +2036,27 @@
 <context>
     <name>TupColorPalette</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="95"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="77"/>
         <source>Color Palette</source>
         <translation>Paleta de Cor</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="141"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="127"/>
         <source>Contour</source>
         <translation>Contorno</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="142"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="128"/>
         <source>Fill</source>
         <translation>Preenchimento</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="221"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="207"/>
         <source>Color Mixer</source>
         <translation>Misturador de Cores</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="229"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="215"/>
         <source>Gradients</source>
         <translation>Gradientes</translation>
     </message>
@@ -1959,7 +2064,7 @@
 <context>
     <name>TupColorValue</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="184"/>
+        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="180"/>
         <source>Percent</source>
         <translation>Porcentagem</translation>
     </message>
@@ -1967,12 +2072,12 @@
 <context>
     <name>TupConfigurationArea</name>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="286"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="296"/>
         <source>Cursor here for expand</source>
         <translation>Cursos aqui para expandir</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="329"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="339"/>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
@@ -1980,42 +2085,42 @@
 <context>
     <name>TupConnectDialog</name>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="60"/>
         <source>Connection Dialog</source>
         <translation>Diálogo de Conexão</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="84"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
         <source>Store password</source>
         <translation>Armazenar senha</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Please, fill in your password</source>
         <translation>Por favor, preencha sua senha</translation>
     </message>
@@ -2023,18 +2128,18 @@
 <context>
     <name>TupCrashWidget</name>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="129"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="112"/>
         <source>What&apos;s happening?</source>
         <translation>O que está acontecendo?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="159"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="140"/>
         <source>Executable information</source>
         <translation>Informação sobre o executável</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="165"/>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="172"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="146"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="153"/>
         <source>Backtrace</source>
         <translation>Rastros do Problema</translation>
     </message>
@@ -2042,7 +2147,7 @@
 <context>
     <name>TupDebugWidget</name>
     <message>
-        <location filename="../src/components/debug/tupdebugwidget.cpp" line="48"/>
+        <location filename="../src/components/debug/tupdebugwidget.cpp" line="44"/>
         <source>Debug Console</source>
         <translation>Console de Depuração</translation>
     </message>
@@ -2050,368 +2155,388 @@
 <context>
     <name>TupDocumentView</name>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="341"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="587"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="836"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="874"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1126"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="617"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="931"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
         <source>Object Selection</source>
         <translation>Seleção de Objetos</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Cut</source>
         <translation>Recortar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>&amp;Group</source>
         <translation>&amp;Agrupar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="375"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="378"/>
         <source>&amp;Ungroup</source>
         <translation>&amp;Desagrupar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="376"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="379"/>
         <source>Ctrl+Shift+G</source>
         <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Onion Skin</source>
         <translation>Papel Vegetal</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1016"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1123"/>
         <source>Onion Skin Factor</source>
         <translation>Fator de Transparência</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>@</source>
         <translation>@</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
         <source>Export Current Frame As Image</source>
         <translation>Exportar Quadro Atual Como Imagem</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>Export Current Frame To Gallery</source>
         <translation>Exportar Quadro Atual para a Galeria</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Storyboard Settings</source>
         <translation>Propriedades do Storyboard</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Camera</source>
         <translation>Câmera</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="406"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="409"/>
         <source>Draw tools</source>
         <translation>Ferramentas de desenho</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="416"/>
         <source>Brushes</source>
         <translation>Pincéis</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="420"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="423"/>
         <source>Selection</source>
         <translation>Seleção</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="427"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="430"/>
         <source>Fill</source>
         <translation>Preenchimento</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="434"/>
-        <source>View</source>
-        <translation>Visualização</translation>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
+        <source>Papagayo file has been imported successfully</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="444"/>
         <source>Tweening</source>
         <translation>Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="455"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="467"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="478"/>
         <source>Image Array</source>
         <translation>Sequência de Imagens</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="510"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="800"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="896"/>
         <source>Pencil</source>
         <translation>Lápis</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="516"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
         <source>Ink</source>
         <translation>Tinta</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="520"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="542"/>
         <source>Eraser</source>
         <translation>Borracha</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="525"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="804"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1537"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="547"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1648"/>
         <source>PolyLine</source>
         <translation>Polilinha</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1651"/>
         <source>Line</source>
         <translation>Linha</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="535"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="805"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="561"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
         <source>Rectangle</source>
         <translation>Retângulo</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="806"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="564"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
         <source>Ellipse</source>
         <translation>Elípse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="541"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="802"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="567"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="898"/>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="549"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="575"/>
         <source>Position Tween</source>
         <translation>Intermeio de Posição</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="580"/>
         <source>Rotation Tween</source>
         <translation>Intermeio de Rotação</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="558"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="584"/>
         <source>Scale Tween</source>
         <translation>Intermeio de Escala</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="563"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="589"/>
         <source>Shear Tween</source>
         <translation>Intermeio de Corte</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="568"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
         <source>Opacity Tween</source>
         <translation>Intermeio de Opacidade</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="573"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="599"/>
         <source>Coloring Tween</source>
         <translation>Intermeio de Cor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="578"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="604"/>
         <source>Compound Tween</source>
         <translation>Intermeio Composto</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="624"/>
         <source>Internal fill</source>
         <translation>Preenchimento interno</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="601"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom In</source>
         <translation>Aproximar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="743"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="775"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="816"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="871"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom Out</source>
         <translation>Afastar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="851"/>
-        <source>Hand</source>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="437"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="631"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="946"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1496"/>
+        <source>Shift</source>
         <translation>Mão</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="953"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="609"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1060"/>
         <source>Paint area actions</source>
         <translation>Ações da área de desenho</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="956"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1063"/>
         <source>Dynamic Background Properties</source>
         <translation>Propriedades do Fundo Dinâmico</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="961"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1068"/>
         <source>Frames Mode</source>
         <translation>Edição de Quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="962"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1069"/>
         <source>Static BG Mode</source>
         <translation>Fundo Estático</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="963"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1070"/>
         <source>Dynamic BG Mode</source>
         <translation>Fundo Dinâmico</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="988"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1095"/>
         <source>Previous Frames</source>
         <translation>Quadros Anteriores</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1000"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1107"/>
         <source>Next Frames</source>
         <translation>Próximos Quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1035"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1142"/>
         <source>Direction</source>
         <translation>Direção</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1038"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1145"/>
         <source>Left to Right</source>
         <translation>Da Esquerda para a Direita</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1146"/>
         <source>Right to Left</source>
         <translation>Da Direita para a Esquerda</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1040"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1147"/>
         <source>Top to Bottom</source>
         <translation>De Cima para Baixo</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1041"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1148"/>
         <source>Bottom to Top</source>
         <translation>De Baixo para Cima</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1044"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1151"/>
         <source>Shift Length</source>
         <translation>Comprimento do Deslocamento</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1519"/>
         <source>Export Frame As</source>
         <translation>Exportar Quadro Como</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1414"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1520"/>
         <source>Images</source>
         <translation>Imagens</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
         <source>Frame has been exported successfully</source>
         <translation>O quadro foi exportado com sucesso</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
         <source>Can&apos;t export frame as image</source>
         <translation>Não é possível exportar o quadro como imagem</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>No cameras detected</source>
         <translation>Nenhuma câmera detectada</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1668"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1797"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1870"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
@@ -2419,47 +2544,47 @@
 <context>
     <name>TupExportWidget</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="992"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1030"/>
         <source>Export to Video</source>
         <translation>Exportar para Vídeo</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1002"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1041"/>
         <source>Export to Video File</source>
         <translation>Exportar para Arquivo de Vídeo</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1005"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1044"/>
         <source>Export to Images Array</source>
         <translation>Exportar como Sequência de Imagens</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1008"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1047"/>
         <source>Export to Animated Image</source>
         <translation>Exportar como Imagem Animada</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1024"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1063"/>
         <source>Post Animation in Tupitube</source>
         <translation>Publicar Animação no Tupitube</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1053"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1097"/>
         <source>Video Formats</source>
         <translation>Formatos de Vídeo</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1055"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1099"/>
         <source>Open Video Format</source>
         <translation>Formato de Vídeo Aberto</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1057"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1101"/>
         <source>Image Array</source>
         <translation>Sequência de Imagens</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1059"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1103"/>
         <source>Animated Image</source>
         <translation>Imagem Animada</translation>
     </message>
@@ -2467,29 +2592,29 @@
 <context>
     <name>TupExportWizard</name>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="62"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="54"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="63"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="55"/>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="64"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="56"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="149"/>
         <source>Next</source>
         <translation>Próxima</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="187"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="214"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="179"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="206"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="216"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="208"/>
         <source>Post</source>
         <translation>Publicar</translation>
     </message>
@@ -2497,21 +2622,21 @@
 <context>
     <name>TupExposureDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="57"/>
         <source>Exposure Sheet</source>
         <translation>Tabela de Exposição</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="132"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="149"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="273"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="288"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="264"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="279"/>
         <source>Scene</source>
         <translation>Cena</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="144"/>
         <source>Work Team</source>
         <translation>Equipe de Trabalho</translation>
     </message>
@@ -2519,15 +2644,15 @@
 <context>
     <name>TupExposureScene</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="70"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="65"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="110"/>
         <source>Layer</source>
         <translation>Camada</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="77"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="72"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="154"/>
         <source>Frame</source>
         <translation>Quadro</translation>
     </message>
@@ -2535,123 +2660,123 @@
 <context>
     <name>TupExposureSheet</name>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="71"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="60"/>
         <source>Exposure Sheet</source>
         <translation>Tabela de Exposição</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="96"/>
         <source>actions</source>
         <translation>ações</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="106"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="100"/>
         <source>Insert</source>
         <translation>Inserir</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="108"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="166"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
         <source>1 frame</source>
         <translation>1 quadro</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="113"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="167"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="107"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="161"/>
         <source>5 frames</source>
         <translation>5 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="118"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="112"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="162"/>
         <source>10 frames</source>
         <translation>10 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="123"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="117"/>
         <source>20 frames</source>
         <translation>20 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="128"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="122"/>
         <source>50 frames</source>
         <translation>50 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="133"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="127"/>
         <source>100 frames</source>
         <translation>100 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="140"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="134"/>
         <source>Remove frame</source>
         <translation>Remover quadro</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="145"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="139"/>
         <source>Clear frame</source>
         <translation>Limpar quadro</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="150"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="144"/>
         <source>Lock/Unlock frame</source>
         <translation>Bloquear/Desbloquear quadro</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="155"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="149"/>
         <source>Copy frame</source>
         <translation>Copiar quadro</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="154"/>
         <source>Paste in frame</source>
         <translation>Colar no quadro</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="165"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="159"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
         <source>Copy TL forward</source>
         <translation>Copiar LT adiante</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="174"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="169"/>
         <source>1 time</source>
         <translation>1 vez</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="175"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="170"/>
         <source>2 times</source>
         <translation>2 vezes</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="176"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="171"/>
         <source>3 times</source>
         <translation>3 vezes</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="177"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="172"/>
         <source>4 times</source>
         <translation>4 vezes</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="178"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
         <source>5 times</source>
         <translation>5 vezes</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="239"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="632"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="247"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="671"/>
         <source>Layer %1</source>
         <translation>Camada %1</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="246"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="474"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="635"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="254"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="501"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="674"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
@@ -2659,32 +2784,32 @@
 <context>
     <name>TupGradientCreator</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Linear</source>
         <translation>Linear</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Radial</source>
         <translation>Radial</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Conical</source>
         <translation>Cônico</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Pad</source>
         <translation>Uniforme</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Reflect</source>
         <translation>Reflexo</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
@@ -2692,34 +2817,34 @@
 <context>
     <name>TupGraphicsScene</name>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="154"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="155"/>
         <source>PolyLine</source>
         <translation>Polilinha</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="533"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="727"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="583"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="771"/>
         <source>/Step: 0</source>
         <translation>/Passo: 0</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="610"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="759"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="653"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="803"/>
         <source>/Step: </source>
         <translation>/Passo: </translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1108"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1212"/>
         <source>Line</source>
         <translation>Linha</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom In</source>
         <translation>Aproximar</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom Out</source>
         <translation>Afastar</translation>
     </message>
@@ -2727,7 +2852,7 @@
 <context>
     <name>TupHelpBrowser</name>
     <message>
-        <location filename="../src/components/help/tuphelpbrowser.cpp" line="50"/>
+        <location filename="../src/components/help/tuphelpbrowser.cpp" line="42"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
@@ -2735,7 +2860,7 @@
 <context>
     <name>TupHelpWidget</name>
     <message>
-        <location filename="../src/components/help/tuphelpwidget.cpp" line="48"/>
+        <location filename="../src/components/help/tuphelpwidget.cpp" line="40"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
@@ -2743,59 +2868,59 @@
 <context>
     <name>TupImageDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="48"/>
         <source>Image Properties</source>
         <translation>Propriedades da Imagem</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="53"/>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="67"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="54"/>
         <source>My Picture</source>
         <translation>Minha Imagem</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="73"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="60"/>
         <source>Topics</source>
         <translation>Tópicos</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation>#tópico1 #tópico2 #tópico3</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="79"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="72"/>
         <source>Just a little taste of my style :)</source>
         <translation>Uma pequena amostra do meu estilo :)</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="89"/>
         <source>Post Image</source>
         <translation>Publicar Imagem</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="124"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="130"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="128"/>
         <source>Set a title for the picture here!</source>
         <translation>Defina um título para a imagem aqui!</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="139"/>
         <source>Set some topic tags for the picture here!</source>
         <translation>Defina algumas etiquetas de tópicos para a imagem aqui!</translation>
     </message>
@@ -2803,55 +2928,55 @@
 <context>
     <name>TupInfoWidget</name>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="124"/>
         <source>Currency Converter</source>
         <translation>Conversor de Moedas</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="128"/>
         <source>Currency</source>
         <translation>Moeda</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="227"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="244"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="228"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="143"/>
         <source>Source</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="168"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="152"/>
         <source>Update data every</source>
         <translation>Atualizar dados a cada</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>minute</source>
         <translation>minuto</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
         <source>minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="262"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="246"/>
         <source>Link file to Object</source>
         <translation>Vincular arquivo ao Objeto</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="263"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="247"/>
         <source>All files (*.*)</source>
         <translation>Todos os arquivos (*.*)</translation>
     </message>
@@ -2859,65 +2984,67 @@
 <context>
     <name>TupItemManager</name>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="74"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="70"/>
         <source>New folder %1</source>
         <translation>Nova pasta %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="231"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="343"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="229"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="350"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="234"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="242"/>
         <source>Edit with Inkscape</source>
         <translation>Editar com Inkscape</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="244"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="252"/>
         <source>Edit with Gimp</source>
         <translation>Editar com Gimp</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="254"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="262"/>
         <source>Edit with Krita</source>
         <translation>Editar com Krita</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="264"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="272"/>
         <source>Edit with MyPaint</source>
         <translation>Editar com MyPaint</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="275"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="283"/>
         <source>Clone</source>
         <translation>Clonar</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="278"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="286"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="281"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="232"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="289"/>
         <source>Rename</source>
         <translation>Renomear</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="284"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="235"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="292"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="295"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="347"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="354"/>
         <source>Create new raster item</source>
         <translation>Criar novo objeto raster</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="355"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="309"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="359"/>
         <source>Create new svg item</source>
         <translation>Criar novo objeto svg</translation>
     </message>
@@ -2925,7 +3052,7 @@
 <context>
     <name>TupItemPreview</name>
     <message>
-        <location filename="../src/libtupi/tupitempreview.cpp" line="64"/>
+        <location filename="../src/libtupi/tupitempreview.cpp" line="56"/>
         <source>Library is empty :(</source>
         <translation>A biblioteca está vazia :(</translation>
     </message>
@@ -2933,40 +3060,45 @@
 <context>
     <name>TupItemTweener</name>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="551"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="610"/>
         <source>Position Tween</source>
         <translation>Intermeios de Posição</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="554"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="613"/>
         <source>Rotation Tween</source>
         <translation>Intermeios de Rotação</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="557"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="616"/>
         <source>Scale Tween</source>
         <translation>Intermeios de Escala</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="560"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="619"/>
         <source>Shear Tween</source>
         <translation>Intermeios de Corte</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="563"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="622"/>
         <source>Opacity Tween</source>
         <translation>Intermeios de Opacidade</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="566"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="625"/>
         <source>Coloring Tween</source>
         <translation>Intermeios de Cor</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="569"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="628"/>
         <source>Compound Tween</source>
         <translation>Intermeios Composto</translation>
     </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="631"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupLayer</name>
@@ -2979,7 +3111,7 @@
 <context>
     <name>TupLayerIndex</name>
     <message>
-        <location filename="../src/components/timeline/tuplayerindex.cpp" line="178"/>
+        <location filename="../src/components/timeline/tuplayerindex.cpp" line="169"/>
         <source>Layers</source>
         <translation>Camadas</translation>
     </message>
@@ -2987,17 +3119,17 @@
 <context>
     <name>TupLibraryDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="58"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="47"/>
         <source>Library Object</source>
         <translation>Objeto de Biblioteca</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="92"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="81"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="84"/>
         <source>Item %1</source>
         <translation>Elemento %1</translation>
     </message>
@@ -3005,238 +3137,238 @@
 <context>
     <name>TupLibraryWidget</name>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="125"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="95"/>
         <source>Library</source>
         <translation>Biblioteca</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="189"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1327"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="162"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1445"/>
         <source>Image</source>
         <translation>Imagem</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="191"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1332"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="164"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1450"/>
         <source>Image Array</source>
         <translation>Sequência de Imagens</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="190"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="163"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1455"/>
         <source>Svg File</source>
         <translation>Arquivo Svg</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="192"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1342"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="165"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1460"/>
         <source>Svg Array</source>
         <translation>Sequência Svg</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="198"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="171"/>
         <source>Add an object to library</source>
         <translation>Adicionar um objeto à biblioteca</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="206"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="179"/>
         <source>Adds a folder to the object&apos;s list</source>
         <translation>Adiciona uma pasta à lista de objetos</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="213"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="186"/>
         <source>Inserts the selected object into the drawing area</source>
         <translation>Insere o objeto selecionado dentro da área de desenho</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="278"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1374"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="269"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1493"/>
         <source>Directory</source>
         <translation>Diretório</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="289"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="286"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="339"/>
         <source>No preview available</source>
         <translation>Nenhuma pré-visualização disponível</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="518"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="550"/>
         <source>Export object...</source>
         <translation>Exportar objeto...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Item exported successfully!</source>
         <translation>Objeto exportado com sucesso!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
         <source>Couldn&apos;t create images directory!</source>
         <translation>Não é possível criar o diretório de imagens!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
         <source>Couldn&apos;t create vector directory!</source>
         <translation>Não é possível criar o diretório de vetor!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="708"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="781"/>
         <source>Tupi library item</source>
         <translation>Objeto da biblioteca Tupi</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="505"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="753"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="836"/>
         <source>Images</source>
         <translation>Imagens</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="752"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="835"/>
         <source>Import images...</source>
         <translation>Importar imagens...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="787"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="928"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1062"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="876"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1026"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1159"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="789"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="878"/>
         <source>Image is bigger than workspace.</source>
         <translation>A imagem é maior que a área de trabalho.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="790"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="879"/>
         <source>Do you want to resize it?</source>
         <translation>Deseja redimensioná-la?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Cannot open file: %1</source>
         <translation>Não é possível abrir o arquivo: %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="839"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="929"/>
         <source>Import SVG files...</source>
         <translation>Importar arquivos SVG...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="840"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="930"/>
         <source>Vector</source>
         <translation>Vetor</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="887"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="986"/>
         <source>Choose the images directory...</source>
         <translation>Escolha o diretório de imagens...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="911"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
         <source>Image files found: %1.</source>
         <translation>Arquivos de Imagem encontrados: %1.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="921"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1019"/>
         <source>Files are too big, so they will be resized.</source>
         <translation>Os arquivos são muito grandes, por isso serão redimensionados.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="922"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1020"/>
         <source>Note: This task can take a while.</source>
         <translation>Nota: Esta tarefa pode tomar algum tempo.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="931"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1065"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1029"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1162"/>
         <source>Do you want to continue?</source>
         <translation>Deseja continuar?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="953"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1051"/>
         <source>Loading images...</source>
         <translation>Carregando imagens...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1001"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1118"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1099"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1213"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1107"/>
         <source>Loading image #%1</source>
         <translation>Carregando imagem #%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR!</source>
         <translation>ERRO!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR: Can&apos;t open file %1. Please, check file permissions and try again.</source>
         <translation>ERRO: Não é possível abrir o arquivo %1. Por favor, verifique as permissões do arquivo e tente novamente.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
         <source>No image files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Nenhum arquivo de imagem foi encontrado.&lt;br/&gt;Por favor, tente outro diretório</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1033"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
         <source>Choose the SVG files directory...</source>
         <translation>Escolha o diretório dos arquivos SVG...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1059"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1156"/>
         <source>%1 SVG files will be loaded.</source>
         <translation>%1 arquivos SVG serão carregados.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1086"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1182"/>
         <source>Loading SVG files...</source>
         <translation>Carregando arquivos SVG...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1126"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1221"/>
         <source>Loading SVG file #%1</source>
         <translation>Carregando arquivo SVG #%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
         <source>No SVG files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Nenhum arquivo SVG foi encontrado.&lt;br/&gt;Por favor, tente outro diretório</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1149"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1244"/>
         <source>Import audio file...</source>
         <translation>Importar arquivo de áudio...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1150"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1245"/>
         <source>Sound file</source>
         <translation>Arquivo de som</translation>
     </message>
@@ -3244,45 +3376,45 @@
 <context>
     <name>TupListProjectDialog</name>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="64"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="54"/>
         <source>Projects List from Server</source>
         <translation>Lista de Projetos no Servidor</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="89"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="79"/>
         <source>My works:</source>
         <translation>Meus trabalhos:</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="90"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="80"/>
         <source>My contributions:</source>
         <translation>Minhas contribuições:</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="126"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="116"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -3290,584 +3422,619 @@
 <context>
     <name>TupMainWindow</name>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
         <source>[ by %1 | net mode ]</source>
         <translation>[ por %1 | modo de rede ]</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
         <source>Opening a new document...</source>
         <translation>Abrindo um novo documento...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="263"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1135"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="306"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="273"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1218"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="277"/>
         <source>Animation</source>
         <translation>Animação</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="317"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="327"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="285"/>
         <source>Player</source>
         <translation>Reprodutor</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; opened!</source>
         <translation>Projeto &lt;b&gt;%1&lt;/b&gt; aberto!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="434"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="484"/>
         <source>Question</source>
         <translation>Pergunta</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="436"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="486"/>
         <source>The document has been modified.</source>
         <translation>O documento foi modificado.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="487"/>
         <source>Do you want to save the project?</source>
         <translation>Deseja salvar o projeto?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="489"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="440"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="490"/>
         <source>Discard</source>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="441"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="491"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>by</source>
         <translation>por</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="746"/>
         <source>Open Tupi project</source>
         <translation>Abrir projeto Tupi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Import Gimp palettes</source>
         <translation>Importar paletas do Gimp</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Gimp Palette (*.gpl *.txt *.css)</source>
         <translation>Paleta do Gimp (*.gpl *.txt *.css)</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
         <source>Gimp palette import was successful</source>
         <translation>Paleta do Gimp importada com sucesso</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
         <source>Gimp palette import was unsuccessful</source>
         <translation>Importação da paleta do Gimp falhou</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1013"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1092"/>
         <source>Save Project As</source>
         <translation>Salvar Projeto Como</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
         <source>Directory does not exist! Please, choose another path.</source>
         <translation>Diretório não existe! Por favor, escolha outro caminho.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; saved</source>
         <translation>Projeto &lt;b&gt;%1&lt;/b&gt; salvo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1340"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1428"/>
         <source>Import project package</source>
         <translation>Importar pacote do projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
         <source>Can&apos;t import project. File is empty!</source>
         <translation>Não é possível importar o projeto. O arquivo está vazio!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
         <source>Can&apos;t save the project. File doesn&apos;t exist!</source>
         <translation>Não é possível salvar o projeto. O arquivo não existe!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1369"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1457"/>
         <source>Fatal Error</source>
         <translation>Erro Fatal</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1371"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1459"/>
         <source>The connection to the server has been lost.</source>
         <translation>A conexão com o servidor foi perdida.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1372"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1460"/>
         <source>Please, try to connect again in a while</source>
         <translation>Por favor, tente conectar novamente daqui a pouco</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
         <source>Cannot open project!</source>
         <translation>Não é possível abrir o projeto!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="689"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1014"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1341"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="747"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1093"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1429"/>
         <source>Tupi Project Package (*.tup)</source>
         <translation>Pacote do Projeto Tupi (*.tup)</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="108"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="581"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="111"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="635"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>Tupi: Open 2D Magic</source>
         <translation>Tupi: Magia 2D Livre</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Tip of the day</source>
         <translation>Dica do dia</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Show on start</source>
         <translation>Mostrar no início</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Previous tip</source>
         <translation>Dica anterior</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Next tip</source>
         <translation>Próxima dica</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1374"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1462"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation>Você não tem permissão para criar este arquivo. Por favor, escolha outro caminho.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
         <source>Cannot save the project!</source>
         <translation>Não é possível salvar o projeto!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1136"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1219"/>
         <source>New camera</source>
         <translation>Nova câmera</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="70"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="64"/>
         <source>Shift+P</source>
         <translation>Shift+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="81"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="75"/>
         <source>Shift+B</source>
         <translation>Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="92"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="86"/>
         <source>Shift+L</source>
         <translation>Shift+L</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Bitmap</source>
         <translation>Mapa de bits</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Alt+B</source>
         <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Bitmap Array</source>
         <translation>Sequência de Mapa de Bits</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Alt+Shift+B</source>
         <translation>Alt+Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>SVG File</source>
         <translation>Arquivo SVG</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>SVG Array</source>
         <translation>Sequência de SVG</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>Alt+Shift+S</source>
         <translation>Alt+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="130"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="124"/>
         <source>Shift+E</source>
         <translation>Shift+E</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="140"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="139"/>
         <source>Shift+H</source>
         <translation>Shift+H</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="155"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="154"/>
         <source>Shift+T</source>
         <translation>Shift+T</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="165"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="164"/>
         <source>Shift+D</source>
         <translation>Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="196"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="195"/>
         <source>&amp;File</source>
         <translation>&amp;Arquivo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="204"/>
         <source>Recents</source>
         <translation>Recentes</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="243"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="225"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="280"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="252"/>
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="272"/>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="322"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="293"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="330"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
         <source>News</source>
         <translation>Notícias</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="343"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>New project</source>
         <translation>Novo projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="392"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="363"/>
         <source>Open new project</source>
         <translation>Abrir novo projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Open project</source>
         <translation>Abrir projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="398"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="369"/>
         <source>Load existent project</source>
         <translation>Carregar projeto existente</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="432"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="409"/>
         <source>Shift+G</source>
         <translation>Shift+G</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="121"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="115"/>
         <source>Shift+C</source>
         <translation>Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="257"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="235"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="411"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="382"/>
         <source>Save project</source>
         <translation>Salvar projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="412"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="383"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="385"/>
         <source>Save current project in current location</source>
         <translation>Salvar projeto atual no local atual</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="416"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
         <source>Save project &amp;As...</source>
         <translation>Salvar projeto &amp;Como...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="417"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="391"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="420"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="394"/>
         <source>Open dialog box to save current project in any location</source>
         <translation>Abrir caixa de diálogo para salvar o projeto atual em qualquer local</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="423"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Cl&amp;ose project</source>
         <translation>F&amp;echar o projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="424"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="426"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="403"/>
         <source>Close active project</source>
         <translation>Fechar projeto ativo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="431"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="408"/>
         <source>&amp;Import GIMP palettes</source>
         <translation>&amp;Importar paletas do GIMP</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="433"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="410"/>
         <source>Import palettes</source>
         <translation>Importar paletas</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="413"/>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="415"/>
+        <source>Import Papagayo lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>&amp;Export Project</source>
         <translation>&amp;Exportar Projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="421"/>
         <source>Export project to several video formats</source>
         <translation>Exportar projeto para vários formatos de vídeo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>E&amp;xit</source>
         <translation>S&amp;air</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="445"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="427"/>
         <source>Close application</source>
         <translation>Fechar aplicativo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="469"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="451"/>
         <source>Pr&amp;eferences...</source>
         <translation>Pr&amp;eferências...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="452"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="472"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="454"/>
         <source>Opens the preferences dialog box</source>
         <translation>Abre a caixa de diálogo de preferências</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>About Tupi</source>
         <translation>Sobre o Tupi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>Ctrl+K</source>
         <translation>Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="544"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="526"/>
         <source>Actions Bar</source>
         <translation>Barra de Ações</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="685"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="666"/>
         <source>Undo</source>
         <translation>Desfazer</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="669"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="672"/>
         <source>Redo</source>
         <translation>Refazer</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="694"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="675"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Import Papagayo project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
+        <source>Papagayo project is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupNetProjectManagerHandler</name>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="111"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="80"/>
         <source>Communications</source>
         <translation>Comunicações</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="491"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="536"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="462"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="507"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="115"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="84"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="120"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="89"/>
         <source>Notices</source>
         <translation>Notificações</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
         <source>Unable to connect to server</source>
         <translation>Não é possível conectar ao servidor</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="310"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="319"/>
         <source>Fatal Error</source>
         <translation>Erro Fatal</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="312"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="321"/>
         <source>User &quot;%1&quot; is disabled.
 Please, contact the animation server admin to get access.</source>
         <translation>Usuário &quot;%1&quot; está desabilitado.
 Por favor, contatar o administrador do servidor de animação para obter acesso.</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
         <source>User has no available projects in the server</source>
         <translation>Usuário não possui projetos disponíveis no servidor</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="460"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="505"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="484"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="529"/>
         <source>Notice</source>
         <translation>Notificação</translation>
     </message>
@@ -3875,61 +4042,61 @@
 <context>
     <name>TupNewItemDialog</name>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="76"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="66"/>
         <source>Create new raster item</source>
         <translation>Criar novo objeto raster</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="83"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="192"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="196"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="215"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="219"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="73"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="182"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="186"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="205"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="209"/>
         <source>Transparent</source>
         <translation>Transparente</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="84"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="74"/>
         <source>White</source>
         <translation>Branco</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="85"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="75"/>
         <source>Black</source>
         <translation>Preto</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="97"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="87"/>
         <source>Create new vector item</source>
         <translation>Criar novo objeto vetorial</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="123"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="134"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="124"/>
         <source>&amp;Extension:</source>
         <translation>&amp;Extensão:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="135"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="125"/>
         <source>&amp;Width:</source>
         <translation>&amp;Largura:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="136"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="126"/>
         <source>&amp;Height:</source>
         <translation>&amp;Altura:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="139"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="129"/>
         <source>&amp;Background:</source>
         <translation>&amp;Fundo:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="143"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
         <source>&amp;Open it with:</source>
         <translation>&amp;Abrir com:</translation>
     </message>
@@ -3937,175 +4104,175 @@
 <context>
     <name>TupNewProject</name>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="84"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="75"/>
         <source>Create a new project</source>
         <translation>Criar um novo projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="90"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="81"/>
         <source>Project Name</source>
         <translation>Nome do Projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="94"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="85"/>
         <source>my_project</source>
         <translation>meu_projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="97"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="88"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="101"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="92"/>
         <source>Your name</source>
         <translation>Seu nome</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="104"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="95"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="99"/>
         <source>Just for fun!</source>
         <translation>Só por diversão!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="103"/>
         <source>Presets</source>
         <translation>Formatos</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="115"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="106"/>
         <source>Free format</source>
         <translation>Formato livre</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="116"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="107"/>
         <source>520x380 - 24</source>
         <translation>520x380 - 24</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="117"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
         <source>640x480 - 24</source>
         <translation>640x480 - 24</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="118"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="109"/>
         <source>480p (PAL DV/DVD) - 25</source>
         <translation>480p (PAL DV/DVD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="110"/>
         <source>576p (PAL DV/DVD) - 25</source>
         <translation>576p (PAL DV/DVD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="120"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="111"/>
         <source>720p (HD) - 25</source>
         <translation>720p (HD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="121"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
         <source>1280p (Full HD) - 25</source>
         <translation>1280p (Full HD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="126"/>
         <source>Background</source>
         <translation>Fundo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="136"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="127"/>
         <source>Click here to change background color</source>
         <translation>Clique aqui para alterar a cor do fundo</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="154"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="145"/>
         <source>Dimension</source>
         <translation>Dimensão</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="235"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="226"/>
         <source>Settings</source>
         <translation>Definições</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
         <source>Please, set a name for the project</source>
         <translation>Por favor, defina um nome para o projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
         <source>Please, fill in your username</source>
         <translation>Por favor, preencha com seu nome de usuário</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
         <source>Please, fill in your password</source>
         <translation>Por favor, preencha com sua senha</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Please, fill in the server name or IP</source>
         <translation>Por favor, preencha com o nome do servidor ou IP</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="334"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="325"/>
         <source>White</source>
         <translation>Branco</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="128"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="144"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
         <source>FPS</source>
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="170"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="161"/>
         <source>Tupitube project</source>
         <translation>Projeto Tupitube</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="176"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="167"/>
         <source>Project info</source>
         <translation>Informação do projeto</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Username</source>
         <translation>Nome de usuário</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="242"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="233"/>
         <source>Store password</source>
         <translation>Armazenar senha</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
@@ -4113,7 +4280,7 @@
 <context>
     <name>TupNotice</name>
     <message>
-        <location filename="../src/net/tupnotice.cpp" line="65"/>
+        <location filename="../src/net/tupnotice.cpp" line="58"/>
         <source>Notices</source>
         <translation>Notificações</translation>
     </message>
@@ -4121,27 +4288,27 @@
 <context>
     <name>TupOnionOpacityDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="50"/>
         <source>Onion Paper</source>
         <translation>Papel Vegetal</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="103"/>
         <source>-0.05</source>
         <translation>-0.05</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="107"/>
         <source>-0.01</source>
         <translation>-0.01</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="119"/>
         <source>+0.01</source>
         <translation>+0.01</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="123"/>
         <source>+0.05</source>
         <translation>+0.05</translation>
     </message>
@@ -4149,162 +4316,163 @@
 <context>
     <name>TupPaintArea</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="109"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1159"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1378"/>
         <source>Pencil</source>
         <translation>Lápis</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="166"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <source>Nodes Selection</source>
         <translation>Seleção de Contorno</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="174"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="521"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1145"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="591"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1364"/>
         <source>PolyLine</source>
         <translation>Polilinha</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="181"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="564"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1160"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="182"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="644"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1379"/>
         <source>Object Selection</source>
         <translation>Seleção de Objetos</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="196"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="199"/>
         <source>Drawing area</source>
         <translation>Área de desenho</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Cut</source>
         <translation>Recortar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
         <source>Paste in...</source>
         <translation>Colar em...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
         <source>next 5 frames</source>
         <translation>próximos 5 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="207"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
         <source>next 10 frames</source>
         <translation>próximos 10 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="211"/>
         <source>next 20 frames</source>
         <translation>próximos 20 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="212"/>
         <source>next 50 frames</source>
         <translation>próximos 50 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="213"/>
         <source>next 100 frames</source>
         <translation>próximos 100 quadros</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="220"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
         <source>To back</source>
         <translation>Para trás</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="227"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="230"/>
         <source>To front</source>
         <translation>Para frente</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="228"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="231"/>
         <source>One level to back</source>
         <translation>Para trás um nível</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="232"/>
         <source>One level to front</source>
         <translation>Para frente um nível</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1151"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1370"/>
         <source>Rectangle</source>
         <translation>Retângulo</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1152"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1371"/>
         <source>Ellipse</source>
         <translation>Elípse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1153"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1372"/>
         <source>Line</source>
         <translation>Linha</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="235"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="238"/>
         <source>Add to library...</source>
         <translation>Adicionar à biblioteca...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="922"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1211"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1085"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1430"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>No items selected</source>
         <translation>Nenhum item selecionado</translation>
     </message>
@@ -4312,27 +4480,22 @@
 <context>
     <name>TupPaintAreaBase</name>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="201"/>
-        <source>OpenGL isn&apos;t supported</source>
-        <translation>OpenGL não é suportado</translation>
-    </message>
-    <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="372"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="393"/>
         <source>No Scene!</source>
         <translation>Não existem Cenas!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="379"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="400"/>
         <source>Locked!</source>
         <translation>Bloqueado!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="448"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="469"/>
         <source>No Frames!</source>
         <translation>Não existem Quadros!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="451"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="472"/>
         <source>No Layers!</source>
         <translation>Não existem Camadas!</translation>
     </message>
@@ -4340,27 +4503,27 @@
 <context>
     <name>TupPaintAreaConfig</name>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="67"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="59"/>
         <source>Grid color</source>
         <translation>Cor da grade</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="73"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="65"/>
         <source>Grid separation</source>
         <translation>Separação da grade</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="82"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="74"/>
         <source>Background color</source>
         <translation>Cor de fundo</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="88"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="80"/>
         <source>Onion skin color</source>
         <translation>Cor do papel vegetal</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="94"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="86"/>
         <source>Onion skin background </source>
         <translation>Fundo do papel vegetal</translation>
     </message>
@@ -4368,82 +4531,82 @@
 <context>
     <name>TupPaintAreaStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="93"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="76"/>
         <source>Action Safe Area</source>
         <translation>Área Segura de Ação</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="77"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="85"/>
         <source>Show grid</source>
         <translation>Mostrar grade</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="103"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="86"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
         <source>Full screen</source>
         <translation>Tela cheia</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="95"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="106"/>
         <source>Current Frame</source>
         <translation>Quadro atual</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="113"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="127"/>
         <source>Zoom</source>
         <translation>Aproximação</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="164"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="147"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="159"/>
         <source>Rotate Workspace</source>
         <translation>Rotacionar Área de Trabalho</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="191"/>
         <source>Background Color</source>
         <translation>Cor de Fundo</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="192"/>
         <source>Click here to change background color</source>
         <translation>Clique aqui para alterar a cor de fundo</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="215"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="198"/>
         <source>Brush Color</source>
         <translation>Cor do Pincel</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="216"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
         <source>Click here to change brush color</source>
         <translation>Clique aqui para alterar a cor do pincel</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="182"/>
         <source>Antialiasing</source>
         <translation>Antisserrilhamento</translation>
     </message>
@@ -4451,27 +4614,27 @@
 <context>
     <name>TupPenDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="60"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="50"/>
         <source>Pen Size</source>
         <translation>Tamanho da Caneta</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="102"/>
         <source>-5</source>
         <translation>-5</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="116"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="106"/>
         <source>-1</source>
         <translation>-1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="114"/>
         <source>+1</source>
         <translation>+1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="128"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="118"/>
         <source>+5</source>
         <translation>+5</translation>
     </message>
@@ -4479,83 +4642,83 @@
 <context>
     <name>TupPenWidget</name>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="60"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="52"/>
         <source>Pen Properties</source>
         <translation>Propriedades da Caneta</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="71"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="63"/>
         <source>Thickness</source>
         <translation>Espessura</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="84"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="76"/>
         <source>Dashes</source>
         <translation>Padrão</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="90"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="83"/>
         <source>Solid</source>
         <translation>Sólido</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="85"/>
         <source>Dash</source>
         <translation>Traço</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="92"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="87"/>
         <source>Dot</source>
         <translation>Pontos</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="93"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="89"/>
         <source>Dash dot</source>
         <translation>Traços e pontos</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="94"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
         <source>Dash dot dot</source>
         <translation>Traço ponto ponto</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="103"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="108"/>
         <source>Cap</source>
         <translation>Borda</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="109"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="114"/>
         <source>Flat</source>
         <translation>Achatado</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="110"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="115"/>
         <source>Square</source>
         <translation>Quadrado</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="111"/>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="127"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="116"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="132"/>
         <source>Round</source>
         <translation>Redondo</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="120"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
         <source>Join</source>
         <translation>Junta</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="130"/>
         <source>Miter</source>
         <translation>Ponta</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="126"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="131"/>
         <source>Bevel</source>
         <translation>Ângulo reto</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="136"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="141"/>
         <source>Brush</source>
         <translation>Pincel</translation>
     </message>
@@ -4563,27 +4726,27 @@
 <context>
     <name>TupPreferences</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="202"/>
         <source>Application TupPreferences</source>
         <translation>Preferências do Tupi</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="217"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
         <source>Workspace</source>
         <translation>Área de Trabalho</translation>
     </message>
@@ -4591,27 +4754,27 @@
 <context>
     <name>TupPreferences::GeneralPage</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Tupi Home</source>
         <translation>Diretório de Instalação</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Cache</source>
         <translation>Cache</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Browser</source>
         <translation>Navegador</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Open last project</source>
         <translation>Último projeto aberto</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Auto save (minutes)</source>
         <translation>Salvvar automaticamente (minutos)</translation>
     </message>
@@ -4619,126 +4782,126 @@
 <context>
     <name>TupProjectActionBar</name>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="108"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="97"/>
         <source>Insert a layer</source>
         <translation>Inserir uma camada</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="98"/>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="120"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
         <source>Remove the layer</source>
         <translation>Remover a camada</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="110"/>
         <source>F6</source>
         <translation>F6</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
         <source>Move layer up</source>
         <translation>Mover camada para cima</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="122"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="197"/>
         <source>F9</source>
         <translation>F9</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="143"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
         <source>Move layer down</source>
         <translation>Mover camada para baixo</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="144"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="219"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
         <source>F10</source>
         <translation>F10</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="148"/>
         <source>Insert frame</source>
         <translation>Inserir quadro</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="170"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
         <source>Remove the frame</source>
         <translation>Remover o quadro</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="188"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="177"/>
         <source>Move frame up</source>
         <translation>Mover o quadro para cima</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="189"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="178"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="196"/>
         <source>Move frame down</source>
         <translation>Mover o quadro para baixo</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
         <source>Lock frame</source>
         <translation>Bloquear quadro</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="229"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
         <source>Lock layer</source>
         <translation>Bloquear camada</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="239"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="228"/>
         <source>Insert a scene</source>
         <translation>Inserir uma cena</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="249"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="238"/>
         <source>Remove the scene</source>
         <translation>Remover a cena</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="259"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="248"/>
         <source>Move scene up</source>
         <translation>Mover a cena para cima</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="269"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="258"/>
         <source>Move scene down</source>
         <translation>Mover a cena para baixo</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="279"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="268"/>
         <source>Lock scene</source>
         <translation>Bloquear a cena</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
         <source>Do you want to remove this frame?</source>
         <translation>Deseja remover este quadro?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Remove?</source>
         <translation>Remover?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
         <source>Do you want to remove this layer?</source>
         <translation>Deseja remover esta camada?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Do you want to remove this scene?</source>
         <translation>Deseja remover esta cena?</translation>
     </message>
@@ -4746,17 +4909,17 @@
 <context>
     <name>TupProjectManager</name>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="190"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="207"/>
         <source>Scene %1</source>
         <translation>Cena %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="193"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="210"/>
         <source>Layer %1</source>
         <translation>Camada %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="196"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="213"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
@@ -4764,17 +4927,17 @@
 <context>
     <name>TupScene</name>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="634"/>
+        <location filename="../src/store/tupscene.cpp" line="648"/>
         <source>Layer %1</source>
         <translation>Camada %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="635"/>
+        <location filename="../src/store/tupscene.cpp" line="649"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="185"/>
+        <location filename="../src/store/tupscene.cpp" line="190"/>
         <source>Sound layer %1</source>
         <translation>Camada de som %1</translation>
     </message>
@@ -4782,7 +4945,7 @@
 <context>
     <name>TupSceneTabWidget</name>
     <message>
-        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="84"/>
+        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="77"/>
         <source>Layers</source>
         <translation>Camadas</translation>
     </message>
@@ -4790,29 +4953,29 @@
 <context>
     <name>TupScenesWidget</name>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="69"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="57"/>
         <source>Scenes Manager</source>
         <translation>Gerenciador de Cenas</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="101"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="94"/>
         <source>Filter here...</source>
         <translation>Filtrar aqui...</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="154"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="158"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="185"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="155"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="159"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="190"/>
         <source>Scene %1</source>
         <translation>Cena %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="164"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="165"/>
         <source>Layer %1</source>
         <translation>Camada %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="167"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="168"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
@@ -4820,7 +4983,7 @@
 <context>
     <name>TupScreen</name>
     <message>
-        <location filename="../src/components/animation/tupscreen.cpp" line="421"/>
+        <location filename="../src/components/animation/tupscreen.cpp" line="482"/>
         <source>Rendering...</source>
         <translation>Renderizando...</translation>
     </message>
@@ -4828,7 +4991,7 @@
 <context>
     <name>TupSplash</name>
     <message>
-        <location filename="../src/shell/tupsplash.cpp" line="55"/>
+        <location filename="../src/shell/tupsplash.cpp" line="53"/>
         <source>Version </source>
         <translation>Versão</translation>
     </message>
@@ -4836,137 +4999,137 @@
 <context>
     <name>TupStoryBoardDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="117"/>
         <source>Storyboard Settings</source>
         <translation>Propriedades do Storyboard</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="158"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="128"/>
         <source>&amp;PDF</source>
         <translation>&amp;PDF</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="129"/>
         <source>Export as PDF</source>
         <translation>Exportar como PDF</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="132"/>
         <source>&amp;HTML</source>
         <translation>&amp;HTML</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="133"/>
         <source>Export as HTML</source>
         <translation>Exportar como HTML</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="167"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="137"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="146"/>
         <source>&amp;Post</source>
         <translation>&amp;Publicar</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="232"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="202"/>
         <source>Storyboard General Information</source>
         <translation>Informações Gerais do Storyboard</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="299"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="269"/>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="242"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="212"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="247"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="217"/>
         <source>Summary</source>
         <translation>Sumário</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="266"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
         <source>Topics</source>
         <translation>Tópicos</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="295"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="265"/>
         <source>Scene Information</source>
         <translation>Informação da Cena</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="304"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="274"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="309"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="279"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="344"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="364"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="314"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="334"/>
         <source>Cover</source>
         <translation>Capa</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="358"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="328"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="411"/>
         <source>Storyboard</source>
         <translation>Storyboard</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="390"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="360"/>
         <source>Scene</source>
         <translation>Cena</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="404"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="374"/>
         <source>Scene No %1 - Information</source>
         <translation>Cena No %1 - Informação</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="559"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="570"/>
         <source>Choose a directory...</source>
         <translation>Escolha um diretório...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Storyboard exported successfully!</source>
         <translation>Storyboard exportado com sucesso!</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>Save PDF file</source>
         <translation>Salvar arquivo PDF</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>PDF file (*.pdf)</source>
         <translation>Arquivo PDF (*.pdf)</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="684"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="700"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="686"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="702"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
@@ -4974,27 +5137,27 @@
 <context>
     <name>TupSymbolEditor</name>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="85"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="74"/>
         <source>Symbol editor</source>
         <translation>Editor de objetos</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="95"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="84"/>
         <source>Brushes</source>
         <translation>Pincéis</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="98"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="87"/>
         <source>Selection</source>
         <translation>Seleção</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="101"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="90"/>
         <source>Fill</source>
         <translation>Preenchimento</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="104"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="93"/>
         <source>View</source>
         <translation>Visualização</translation>
     </message>
@@ -5002,138 +5165,138 @@
 <context>
     <name>TupThemeSelector</name>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="75"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="73"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Base</source>
         <translation>Base</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Foreground</source>
         <translation>Primeiro plano</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Background</source>
         <translation>Fundo</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button</source>
         <translation>Botão</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button Text</source>
         <translation>Texto do Botão</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="103"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="101"/>
         <source>Effects</source>
         <translation>Efeitos</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Light</source>
         <translation>Iluminação</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Midlight</source>
         <translation>Iluminação média</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Dark</source>
         <translation>Obscuridade</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Mid</source>
         <translation>Meio</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="129"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="127"/>
         <source>Selections</source>
         <translation>Seleções</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlight</source>
         <translation>Ressaltar</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlighted Text</source>
         <translation>Texto ressaltado</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="150"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="148"/>
         <source>Text effects</source>
         <translation>Efeitos de texto</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Bright Text</source>
         <translation>Texto Brilhante</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link</source>
         <translation>Vínculo</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link Visited</source>
         <translation>Vínculo Visitado</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="171"/>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="169"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Schema</source>
         <translation>Esquema</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Owner</source>
         <translation>Proprietário</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="183"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="182"/>
         <source>Save schema</source>
         <translation>Salvar esquema</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="190"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="189"/>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="194"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="193"/>
         <source>Use this colors</source>
         <translation>Usar estas cores</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Please choose a theme name</source>
         <translation>Por favor, escolha um nome de tema</translation>
     </message>
@@ -5141,25 +5304,25 @@
 <context>
     <name>TupTimeLine</name>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="75"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="60"/>
         <source>Time Line</source>
         <translation>Linha de Tempo</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="461"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="471"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="543"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="549"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="476"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="486"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="558"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="564"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="538"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="553"/>
         <source>Layer %1</source>
         <translation>Camada %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="598"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="613"/>
         <source>Scene %1</source>
         <translation>Cena %1</translation>
     </message>
@@ -5167,8 +5330,8 @@
 <context>
     <name>TupToolStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="52"/>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="55"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="46"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="49"/>
         <source>Current Tool</source>
         <translation>Ferramenta Atual</translation>
     </message>
@@ -5176,60 +5339,88 @@
 <context>
     <name>TupToolsDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="59"/>
         <source>Pencil</source>
         <translation>Lápis</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="67"/>
         <source>Ink</source>
         <translation>Tinta</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="82"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="75"/>
         <source>Polyline</source>
         <translation>Polilinha</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="83"/>
         <source>Ellipse</source>
         <translation>Elípse</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="91"/>
         <source>Rectangle</source>
         <translation>Retângulo</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="106"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="99"/>
         <source>Object Selection</source>
         <translation>Seleção de Objeto</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="115"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="108"/>
+        <source>Nodes Selection</source>
         <translation>Seleção de Contorno</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="116"/>
         <source>Color Palette</source>
         <translation>Paleta de Cor</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="124"/>
         <source>Pen Size</source>
         <translation>Tamanho da Caneta</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="132"/>
         <source>Opacity Value</source>
         <translation>Valor de Opacidade</translation>
     </message>
 </context>
 <context>
+    <name>TupTwitter</name>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="270"/>
+        <source>Latest version</source>
+        <translation type="unfinished">Última versão</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="271"/>
+        <source>Revision</source>
+        <translation type="unfinished">Revisão</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="272"/>
+        <source>Code Name</source>
+        <translation type="unfinished">Nome de Código</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="275"/>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="279"/>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupTwitterWidget</name>
     <message>
-        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="52"/>
+        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="47"/>
         <source>News!</source>
         <translation>Notícias!</translation>
     </message>
@@ -5237,32 +5428,32 @@
 <context>
     <name>TupViewColorCells</name>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="109"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="111"/>
         <source>Default Palette</source>
         <translation>Paleta Padrão</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="118"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="120"/>
         <source>Named Colors</source>
         <translation>Cores Etiquetadas</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="125"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="127"/>
         <source>Custom Color Palette</source>
         <translation>Paleta de Cor Personalizada</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="130"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="132"/>
         <source>Custom Gradient Palette</source>
         <translation>Paleta de Gradiente Personalizada</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="342"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="373"/>
         <source>Add Color</source>
         <translation>Adicionar Cor</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="349"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="380"/>
         <source>Remove Color</source>
         <translation>Remover Cor</translation>
     </message>
@@ -5270,88 +5461,40 @@
 <context>
     <name>TupWebHunter</name>
     <message>
-        <location filename="../src/libbase/tupwebhunter.cpp" line="108"/>
+        <location filename="../src/libbase/tupwebhunter.cpp" line="101"/>
         <source>Information Temporarily Unavailable</source>
         <translation>Informação Temporariamente Indisponível</translation>
     </message>
 </context>
 <context>
-    <name>Tupwitter</name>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Latest version</source>
-        <translation>Última versão</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Revision</source>
-        <translation>Revisão</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Code Name</source>
-        <translation>Nome de Código</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="333"/>
-        <source>Update here!</source>
-        <translation>Atualize aqui!</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="341"/>
-        <source>This is what&apos;s happening</source>
-        <translation>Isto é o que está acontecendo</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="356"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="357"/>
-        <source>Description</source>
-        <translation>Descrição</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="358"/>
-        <source>Website</source>
-        <translation>Sítio Web</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="359"/>
-        <source>Followers</source>
-        <translation>Seguidores</translation>
-    </message>
-</context>
-<context>
     <name>TweenManager</name>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="66"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="56"/>
         <source>Create a new Tween</source>
         <translation>Criar um novo Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Tween name already exists!</source>
         <translation>Nome do intermeios já existe!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="189"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="179"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="191"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="181"/>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="194"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="184"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
@@ -5359,161 +5502,161 @@
 <context>
     <name>Tweener</name>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="169"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="362"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="752"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="161"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="359"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="363"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="768"/>
         <source>Position Tween</source>
         <translation>Intermeios de Posição</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="360"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="361"/>
         <source>Shift+W</source>
         <translation>Shift+W</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="130"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="260"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="264"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="101"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="239"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="243"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="527"/>
         <source>Coloring Tween</source>
         <translation>Intermeios de Cor</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
         <source>Coloring Tween can&apos;t be applied to raster images</source>
         <translation>Intermeios de cor não pode ser aplicado a imagens raster</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
         <source>Coloring Tween can&apos;t be applied to SVG files</source>
         <translation>Intermeios de cor não pode ser aplicado a arquivos SVG</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="262"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="241"/>
         <source>Shift+C</source>
         <translation>Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Tween name is missing!</source>
         <translation>Nome do intermeios indefinido!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="528"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="614"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="481"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="647"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="525"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="505"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="619"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="480"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="654"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="523"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="540"/>
         <source>Frame %1</source>
         <translation>Quadro %1</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Tween %1 applied!</source>
         <translation>Intermeios %1 aplicado!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="156"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="373"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="377"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="759"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="144"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="379"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="383"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="758"/>
         <source>Compound Tween</source>
         <translation>Intermeios Composto</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="375"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="381"/>
         <source>Shift+X</source>
         <translation>Shift+X</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="126"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="227"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="231"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="503"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="117"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="230"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="502"/>
         <source>Opacity Tween</source>
         <translation>Intermeios de Opacidade</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="229"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="228"/>
         <source>Shift+O</source>
         <translation>Shift+O</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="140"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="253"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="257"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="134"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="257"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="261"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="555"/>
         <source>Rotation Tween</source>
         <translation>Intermeios de Rotação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="255"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="259"/>
         <source>Shift+R</source>
         <translation>Shift+R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="250"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="546"/>
         <source>Scale Tween</source>
         <translation>Intermeios de Escala</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="252"/>
         <source>Shift+S</source>
         <translation>Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="555"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="133"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="256"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="260"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="562"/>
         <source>Shear Tween</source>
         <translation>Intermeios de Corte</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="258"/>
         <source>Shift+H</source>
         <translation>Shift+H</translation>
     </message>
@@ -5521,88 +5664,88 @@
 <context>
     <name>TweenerPanel</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="84"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="127"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="119"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="128"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="120"/>
         <source>Select object</source>
         <translation>Selecionar objeto</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="129"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="121"/>
         <source>Set Tweeners</source>
         <translation>Aplicar Intermediadores</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="153"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="145"/>
         <source>Tweeners</source>
         <translation>intermediadores</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Position</source>
         <translation>Posição</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Rotation</source>
         <translation>Rotação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Scale</source>
         <translation>Escala</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Shear</source>
         <translation>Corte</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Opacity</source>
         <translation>Opacidade</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Coloring</source>
         <translation>Cor</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="283"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="275"/>
         <source>Save Tween</source>
         <translation>Salvar Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="285"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="277"/>
         <source>Cancel Tween</source>
         <translation>Cancelar Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="377"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="369"/>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
         <source>Select objects for Tweening first!</source>
         <translation>Selecione os objetos para o Intermeios primeiro!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="429"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="421"/>
         <source>Update Tween</source>
         <translation>Atualizar Intermeios</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="431"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="423"/>
         <source>Close Tween properties</source>
         <translation>Fechar propriedades de Intermeios</translation>
     </message>
@@ -5610,32 +5753,32 @@
 <context>
     <name>TweenerTable</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Position</source>
         <translation>Posição</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Rotation</source>
         <translation>Rotação</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Scale</source>
         <translation>Escala</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Shear</source>
         <translation>Corte</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Opacity</source>
         <translation>Opacidade</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Coloring</source>
         <translation>Cor</translation>
     </message>
@@ -5643,49 +5786,49 @@
 <context>
     <name>VideoProperties</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="843"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="877"/>
         <source>Set Animation Properties</source>
         <translation>Definir Propriedades da Animação</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="855"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="889"/>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="856"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="890"/>
         <source>My Video</source>
         <translation>Meu Vídeo</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="861"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="895"/>
         <source>Topics</source>
         <translation>Tópicos</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="862"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="896"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation>#tópico1 #tópico2 #tópico3</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="867"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="901"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="873"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="907"/>
         <source>Just a little taste of my style :)</source>
         <translation>Uma pequena amostra do meu estilo :)</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="934"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="954"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="968"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="988"/>
         <source>Set a title for the picture here!</source>
         <translation>Defina um título para a imagem aqui!</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="941"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="965"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="975"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="999"/>
         <source>Set some topic tags for the picture here!</source>
         <translation>Defina algumas etiquetas de tópicos para a imagem aqui!</translation>
     </message>
@@ -5693,53 +5836,52 @@
 <context>
     <name>ViewTool</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="114"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="147"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="189"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="308"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="338"/>
-        <source>Hand</source>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="96"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="143"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="184"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="288"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="304"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="334"/>
+        <source>Shift</source>
         <translation>Mão</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="100"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="105"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="149"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="250"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="271"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="340"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="103"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="145"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="241"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="263"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="336"/>
         <source>Zoom In</source>
         <translation>Aproximar</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="107"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="112"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="254"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="273"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="342"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="110"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="245"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="338"/>
         <source>Zoom Out</source>
         <translation>Afastar</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="104"/>
         <source>Z</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="111"/>
         <source>Shift+Z</source>
         <translation>Shift+Z</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="97"/>
         <source>H</source>
         <translation>H</translation>
     </message>
@@ -5747,22 +5889,22 @@
 <context>
     <name>ZoomConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="54"/>
         <source>Scale Factor</source>
         <translation>Fator de Escala</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="67"/>
         <source>Tips</source>
         <translation>Dicas</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Zoom Square mode</source>
         <translation>Modo de Ampliação Quadrado</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Press Ctrl key + Mouse left button</source>
         <translation>Pressione a tecla Ctrl + o botão esquerdo do Mouse</translation>
     </message>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_ru.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_ru.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_ru.ts tupi-0.2+git05/src/shell/data/translations/tupi_ru.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_ru.ts	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_ru.ts	2014-12-15 14:21:34.000000000 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>ButtonsPanel</name>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="47"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="41"/>
         <source>Edit Tween</source>
         <translation>Редактировать анимацию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="51"/>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="45"/>
         <source>Remove Tween</source>
         <translation>Удалить анимацию</translation>
     </message>
@@ -17,122 +17,108 @@
 <context>
     <name>Configurator</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/color/configurator.cpp" line="66"/>
         <source>Coloring Tween</source>
         <translation>Анимация цвета</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/configurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/compound/configurator.cpp" line="71"/>
         <source>Compound Tween</source>
         <translation>Комбинированная анимация</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="59"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="57"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="58"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="52"/>
         <source>Parameters</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="81"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="77"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="80"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="72"/>
         <source>Dot Spacing</source>
         <translation>Шаг точек</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="97"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="93"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="96"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="88"/>
         <source>Size Tolerance</source>
         <translation>Величина отклонения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/configurator.cpp" line="122"/>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="117"/>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="121"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="112"/>
         <source>Smoothness</source>
         <translation>Сглаживание</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/opacity/configurator.cpp" line="70"/>
         <source>Opacity Tween</source>
         <translation>Анимация прозрачности</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/configurator.cpp" line="91"/>
+        <location filename="../src/plugins/tools/position/configurator.cpp" line="80"/>
         <source>Position Tween</source>
         <translation>Анимация положения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/papagayo/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/rotation/configurator.cpp" line="70"/>
         <source>Rotation Tween</source>
         <translation>Анимация вращения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/scale/configurator.cpp" line="70"/>
         <source>Scale Tween</source>
         <translation>Анимация масштабирования</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="53"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="48"/>
         <source>This tool is just a &lt;b&gt;proof-of-concept&lt;/b&gt; of the basic algorithm for the Tupi&apos;s free-tracing vectorial brushes</source>
         <translation>This tool is just a &lt;b&gt;proof-of-concept&lt;/b&gt; of the basic algorithm for the Tupi&apos;s free-tracing vectorial brushes</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="63"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="58"/>
         <source>Structure</source>
         <translation>Структура</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="68"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="63"/>
         <source>Basic</source>
         <translation>Основная</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="64"/>
         <source>Axial</source>
         <translation>Осевая</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="65"/>
         <source>Organic</source>
         <translation>Основная</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/configurator.cpp" line="109"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="104"/>
         <source>Run simulation</source>
         <translation>Запуск симуляции</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/configurator.cpp" line="75"/>
+        <location filename="../src/plugins/tools/shear/configurator.cpp" line="70"/>
         <source>Shear Tween</source>
         <translation>Анимация сдвига</translation>
     </message>
 </context>
 <context>
-    <name>ContourSelection</name>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="107"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="306"/>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="309"/>
-        <source>Line Selection</source>
-        <translation>Выделение линии</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/contourselectiontool/contourselection.cpp" line="307"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-</context>
-<context>
     <name>EraserTool</name>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="67"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="72"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="76"/>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="49"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="54"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="58"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="79"/>
         <source>Eraser</source>
         <translation>Ластик</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/erasertool/erasertool.cpp" line="73"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="55"/>
         <source>E</source>
         <translation>E</translation>
     </message>
@@ -140,17 +126,17 @@
 <context>
     <name>ExportTo</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="468"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="469"/>
         <source>Image name prefix: </source>
         <translation>Имя файла с префиксом:</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="473"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="474"/>
         <source>Directory: </source>
         <translation>Папка:</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="476"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="477"/>
         <source>File: </source>
         <translation>Файл:</translation>
     </message>
@@ -175,31 +161,31 @@
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="644"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="649"/>
         <source>Choose a file name...</source>
         <translation>Выберите имя файла...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="657"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="663"/>
         <source>Choose a directory...</source>
         <translation>Выберите папку...</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="726"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="741"/>
         <source>Warning!</source>
         <translation>Предупреждение!</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="727"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="742"/>
         <source>File exists. Overwrite it?</source>
         <translation>Файл существует, переписать его?</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="689"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="703"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="738"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="748"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="789"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -209,33 +195,33 @@
         <translation>Включить прозрачность фона</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="689"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
         <source>Images name prefix can&apos;t be empty! Please, type a prefix.</source>
         <translation>Имя файла не может быть пустым! Пожалуйста, введите его.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="703"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="738"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
         <source>Directory doesn&apos;t exist! Please, choose another path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="748"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation>У Вас нет прав для создания этого файла. Пожалуйста, введите другой путь.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="789"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
         <source>Format problem. Tupi Internal error.</source>
         <translation>Проблема форматирования. Внутренняя ошибка Tupi.</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="796"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="825"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="800"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="829"/>
         <source>ERROR!</source>
         <translation>Ошибка!</translation>
     </message>
@@ -243,145 +229,145 @@
 <context>
     <name>FillTool</name>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="98"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="102"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="169"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="80"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="84"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="177"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="278"/>
         <source>Internal fill</source>
         <translation>Внутренняя заливка</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="104"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="108"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="171"/>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="267"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="86"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="90"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="179"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="280"/>
         <source>Line fill</source>
         <translation>Заливка линии</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="99"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="81"/>
         <source>I</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/filltool/filltool.cpp" line="105"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="87"/>
         <source>B</source>
         <translation>B</translation>
     </message>
 </context>
 <context>
-    <name>GenericExportPlugin</name>
-    <message>
-        <location filename="../src/plugins/export/genericexportplugin/genericexportplugin.cpp" line="55"/>
-        <source>Image Array</source>
-        <translation>Массив изображений</translation>
-    </message>
-</context>
-<context>
     <name>GeometricTool</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="124"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="151"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="207"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="220"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="283"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="302"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="333"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="380"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="113"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="118"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="149"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="209"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="222"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="285"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="308"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="339"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="386"/>
         <source>Rectangle</source>
         <translation>Прямоугольник</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="126"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="131"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="158"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="205"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="305"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="335"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="382"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="125"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="311"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="341"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="388"/>
         <source>Ellipse</source>
         <translation>Эллипс</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="92"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="133"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="138"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="165"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="309"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="384"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="448"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="455"/>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="462"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="132"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="163"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="315"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="390"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="460"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="467"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="474"/>
         <source>Line</source>
         <translation>Линия</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="114"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="121"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/geometrictool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="128"/>
         <source>L</source>
         <translation>L</translation>
     </message>
 </context>
 <context>
+    <name>ImagePlugin</name>
+    <message>
+        <location filename="../src/plugins/export/imageplugin/imageplugin.cpp" line="48"/>
+        <source>Image Array</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InfoPanel</name>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="48"/>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="52"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="43"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="51"/>
         <source>Tips</source>
         <translation>Подсказки</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
-        <source>Mouse Double Click</source>
-        <translation>Двойной щелчок мышью</translation>
-    </message>
-    <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
         <source>Close the line path</source>
         <translation>Завершить линию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Mouse Right Click</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="61"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
         <source>Align line to horizontal/vertical axis</source>
         <translation>Выравнивание линии по горизонтальной/вертикальной оси</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Shift + Left Mouse Button</source>
         <translation>Shift + Левая Клавиша Мыши</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/geometrictool/infopanel.cpp" line="63"/>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
         <source>Set width/height proportional dimensions</source>
         <translation>Установка ширины/высоты пропорциональных размеров</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>Close line</source>
         <translation>Завершить линию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/infopanel.cpp" line="60"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
         <source>X key or Right mouse button</source>
         <translation>клавиша X или Правая Клавиша Мыши</translation>
     </message>
@@ -389,14 +375,14 @@
 <context>
     <name>InkTool</name>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="139"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="558"/>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="562"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="605"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="609"/>
         <source>Ink</source>
         <translation>Перо</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/inktool/inktool.cpp" line="559"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="606"/>
         <source>K</source>
         <translation>K</translation>
     </message>
@@ -404,89 +390,145 @@
 <context>
     <name>KinasWidget</name>
     <message>
-        <location filename="../src/components/kinas/kinaswidget.cpp" line="43"/>
+        <location filename="../src/components/kinas/kinaswidget.cpp" line="42"/>
         <source>Tupi Script</source>
         <translation>Скрипт Tupi</translation>
     </message>
 </context>
 <context>
+    <name>NodesTool</name>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="88"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="351"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="354"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Выделение линии</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="352"/>
+        <source>N</source>
+        <translation type="unfinished">N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="257"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="261"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="555"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="259"/>
+        <source>Shift+R</source>
+        <translation type="unfinished">Shift+R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Error</source>
+        <translation type="unfinished">Ошибка</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Tween name is missing!</source>
+        <translation type="unfinished">Название анимации отсутствует!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="533"/>
+        <source>Frame %1</source>
+        <translation type="unfinished">Кадр %1</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Info</source>
+        <translation type="unfinished">Информация</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Tween %1 applied!</source>
+        <translation type="unfinished">Анимация %1 применена!</translation>
+    </message>
+</context>
+<context>
     <name>PencilTool</name>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="88"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="93"/>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="135"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="78"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="83"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="129"/>
         <source>Pencil</source>
         <translation>Карандаш</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/penciltool.cpp" line="89"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="79"/>
         <source>P</source>
         <translation>P</translation>
     </message>
 </context>
 <context>
-    <name>PolyLine</name>
+    <name>PolyLineTool</name>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="100"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="104"/>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="129"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="93"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="122"/>
         <source>PolyLine</source>
-        <translation>Полилиния</translation>
+        <translation type="unfinished">Полилиния</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/polylinetool/polyline.cpp" line="101"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="94"/>
         <source>S</source>
-        <translation>S</translation>
+        <translation type="unfinished">S</translation>
     </message>
 </context>
 <context>
     <name>PositionSettings</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="78"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="68"/>
         <source>Component</source>
         <translation>Компонент</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="71"/>
         <source>Position</source>
         <translation>Позиция</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="82"/>
         <source>Starting at frame</source>
         <translation>Старт в кадре</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="119"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="180"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="212"/>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="243"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="202"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="233"/>
         <source>Frames Total</source>
         <translation>Количество кадров</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="154"/>
         <source>Cancel Tween</source>
         <translation>Отменить анимацию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
         <source>You must define a path for this Tween!</source>
         <translation>Вы должны определить путь для этой анимации!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="235"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="225"/>
         <source>Position Tween is set!</source>
         <translation>Позиция анимации установлена!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/positionsettings.cpp" line="260"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="250"/>
         <source>Close Tween properties</source>
         <translation>Закрыть свойства анимации</translation>
     </message>
@@ -494,102 +536,102 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="262"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="229"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="268"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="235"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="274"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="241"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/framework/tcore/tdebug.cpp" line="280"/>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="247"/>
         <source>Critical</source>
         <translation>Критично</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="70"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="51"/>
         <source>Fatal Error</source>
         <translation>Фатальная ошибка</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="71"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="52"/>
         <source>Well, Tupi has crashed...</source>
         <translation>Что ж, Tupi рухнул...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="72"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="53"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="73"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="54"/>
         <source>Re-launch Tupi</source>
         <translation>Перезапустить Tupi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashhandler.cpp" line="74"/>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="55"/>
         <source>This is a general failure</source>
         <translation>Это общая ошибка</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="137"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="159"/>
         <source>add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="142"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="164"/>
         <source>remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="147"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="169"/>
         <source>move</source>
         <translation>Переместить</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="152"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="174"/>
         <source>lock</source>
         <translation>Заблокировать</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="157"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="179"/>
         <source>rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="162"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="184"/>
         <source>select</source>
         <translation>Выделить</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="167"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="189"/>
         <source>edit node</source>
         <translation>Редактировать узел</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="172"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="194"/>
         <source>view</source>
         <translation>Просмотр</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="177"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="199"/>
         <source>transform</source>
         <translation>Преобразовать</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectcommand.cpp" line="182"/>
+        <location filename="../src/store/tupprojectcommand.cpp" line="204"/>
         <source>convert</source>
         <translation>Конвертировать</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="490"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="535"/>
         <source>Wall from</source>
         <translation>Стена из</translation>
     </message>
@@ -597,14 +639,14 @@
 <context>
     <name>SchemeTool</name>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="144"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="697"/>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="701"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="682"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="686"/>
         <source>Scheme</source>
         <translation>Схема</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/schemetool/schemetool.cpp" line="698"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="683"/>
         <source>M</source>
         <translation>M</translation>
     </message>
@@ -612,93 +654,93 @@
 <context>
     <name>SelectPlugin</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="100"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="77"/>
         <source>Select plugin</source>
         <translation>Выбор плагина</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="165"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="231"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="142"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
         <source>WEBM Video</source>
         <translation>WEBM Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="170"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="234"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="147"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="211"/>
         <source>OGV Video</source>
         <translation>OGV Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="175"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="237"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="152"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="214"/>
         <source>MPEG Video</source>
         <translation>MPEG Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="180"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="240"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="217"/>
         <source>Macromedia flash</source>
         <translation>Macromedia flash</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="243"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="162"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="220"/>
         <source>AVI Video</source>
         <translation>AVI Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="218"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="264"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="241"/>
         <source>Animated PNG (APNG)</source>
         <translation>Анимированный PNG (APNG)</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="246"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="223"/>
         <source>RealMedia Video</source>
         <translation>RealMedia Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="282"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="259"/>
         <source>Animated Image</source>
         <translation>Анимированное изображение</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="284"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
         <source>Image Array</source>
         <translation>Массив изображений</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="249"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="167"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="226"/>
         <source>ASF Video</source>
         <translation>ASF Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="252"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="172"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="229"/>
         <source>QuickTime Video</source>
         <translation>QuickTime Video</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="255"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="232"/>
         <source>Gif Image</source>
         <translation>Gif Image</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="258"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="235"/>
         <source>PNG Image Array</source>
         <translation>PNG Image Array</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="213"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="238"/>
         <source>JPEG Image Array</source>
         <translation>JPEG Image Array</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="224"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="267"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="201"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="244"/>
         <source>SMIL</source>
         <translation>SMIL</translation>
     </message>
@@ -706,465 +748,495 @@
 <context>
     <name>SelectScenes</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="327"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="304"/>
         <source>Select Scenes</source>
         <translation>Выбор сцен</translation>
     </message>
 </context>
 <context>
-    <name>SelectTool</name>
+    <name>SelectionTool</name>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="339"/>
-        <source>Select</source>
-        <translation>Выделение</translation>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="161"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="369"/>
+        <source>Selection</source>
+        <translation type="unfinished">Выделение</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="336"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="366"/>
         <source>Object Selection</source>
-        <translation>Выделение объекта</translation>
+        <translation type="unfinished">Выделение объекта</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/selecttool.cpp" line="337"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="367"/>
         <source>O</source>
-        <translation>O</translation>
+        <translation type="unfinished">O</translation>
     </message>
 </context>
 <context>
     <name>Settings</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="96"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="82"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="101"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="97"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="85"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="72"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="87"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="88"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="104"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="92"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="111"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="108"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="91"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="95"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="82"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="98"/>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="107"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="105"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="93"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="112"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="99"/>
         <source>Select object</source>
         <translation>Выделение объекта</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="108"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="106"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="94"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="113"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="109"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="110"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="93"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="84"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="99"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="100"/>
         <source>Set Properties</source>
         <translation>Установка свойств</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="148"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="146"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="134"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="133"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="137"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="124"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="140"/>
         <source>Starting at frame</source>
         <translation>Старт в кадре</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="155"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="153"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="160"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="156"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="141"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="145"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="147"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="148"/>
         <source>Ending at frame</source>
         <translation>Завершить в кадре</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="177"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="573"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="175"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="524"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="149"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="185"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="210"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="184"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="670"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="178"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="546"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="179"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="552"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="565"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="168"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="516"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="200"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="538"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="171"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="544"/>
         <source>Frames Total</source>
         <translation>Количество кадров</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="203"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="190"/>
         <source>White</source>
         <translation>Белый</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="192"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="179"/>
         <source>Initial Color</source>
         <translation>Начальный цвет</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="195"/>
         <source>Ending Color</source>
         <translation>Заключительный цвет</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="221"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="219"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="212"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="211"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="212"/>
         <source>Iterations</source>
         <translation>Итераций</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="230"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="337"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="228"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="217"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="221"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="221"/>
         <source>Loop</source>
         <translation>Цикл</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="239"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="346"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="237"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="238"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="230"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="230"/>
         <source>Loop with Reverse</source>
         <translation>Цикл с возвратом</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="284"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="383"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="287"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="287"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="178"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="279"/>
         <source>Save Tween</source>
         <translation>Сохранить анимацию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="288"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="286"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="190"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="385"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="289"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="289"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="275"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="281"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="281"/>
         <source>Cancel Tween</source>
         <translation>Отменить анимацию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="350"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="343"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="459"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="359"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="343"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="333"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="347"/>
         <source>Update Tween</source>
         <translation>Обновить анимацию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="360"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="352"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="345"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="461"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="361"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="357"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="347"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="335"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="349"/>
         <source>Close Tween properties</source>
         <translation>Закрыть свойства анимации</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="366"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="322"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="467"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="367"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="363"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
         <source>You must select at least one object!</source>
         <translation>Выделите хотя бы один объект!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="371"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="363"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="472"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="372"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="368"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
         <source>You must set Tween properties first!</source>
         <translation>Сначала установите свойства анимации!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/settings.cpp" line="427"/>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="406"/>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="258"/>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="515"/>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="415"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="411"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
         <source>Select objects for Tweening first!</source>
         <translation>Сначала выделите объекты для анимации!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="183"/>
         <source>Initial Opacity</source>
         <translation>Начальная прозрачность</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/settings.cpp" line="206"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="199"/>
         <source>Ending Opacity</source>
         <translation>Заключительная прозрачность</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/settings.cpp" line="327"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
         <source>You must define a path for this Tween!</source>
         <translation>Вы должны определить путь для этой анимации!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="193"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="185"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="185"/>
         <source>Continuous</source>
         <translation>Непрерывно</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="194"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="186"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="186"/>
         <source>Partial</source>
         <translation>Частично</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="190"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="199"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="199"/>
         <source>Speed (Degrees/Frame)</source>
         <translation>Скорость (Угол/Кадр)</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="265"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="265"/>
         <source>Direction</source>
         <translation>Направление</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="269"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="269"/>
         <source>Clockwise</source>
         <translation>По часовой стрелке</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="278"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="270"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="270"/>
         <source>Counterclockwise</source>
         <translation>Против часовой стрелки</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="302"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="294"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="294"/>
         <source>Degrees Range</source>
         <translation>Диапазон</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="305"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="297"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="297"/>
         <source>Start at</source>
         <translation>Начало</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/settings.cpp" line="321"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="313"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="313"/>
         <source>Finish at</source>
         <translation>Конец</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="187"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="188"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="179"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="180"/>
         <source>Width &amp; Height</source>
         <translation>По ширине и высоте</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="188"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="189"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="181"/>
         <source>Only Width</source>
         <translation>Только по ширине</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="189"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="181"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="182"/>
         <source>Only Height</source>
         <translation>Только по высоте</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="182"/>
         <source>Scale in</source>
         <translation>Масштабировать</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/settings.cpp" line="206"/>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="207"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="199"/>
         <source>Scaling Factor</source>
         <translation>Коэффициент</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/settings.cpp" line="191"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="183"/>
         <source>Shear in</source>
         <translation>Сдвиг</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/penciltool/settings.cpp" line="57"/>
+        <location filename="../src/plugins/tools/pencil/settings.cpp" line="53"/>
         <source>Smoothness</source>
         <translation>Сглаживание</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="66"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="59"/>
         <source>Flips</source>
         <translation>Отражение</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="77"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="70"/>
         <source>Horizontal Flip</source>
         <translation>Горизонтальное отражение</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="80"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="73"/>
         <source>Vertical Flip</source>
         <translation>Вертикальное отражение</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="76"/>
         <source>Crossed Flip</source>
         <translation>Диагональное отражение</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="89"/>
         <source>Order</source>
         <translation>Порядок</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="106"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="99"/>
         <source>Send object to back</source>
         <translation>Перенести на задний план</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="102"/>
         <source>Send object to back one level</source>
         <translation>Перенести на уровень ниже</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="112"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="105"/>
         <source>Send object to front</source>
         <translation>Перенести на передний план</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="115"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="108"/>
         <source>Send object to front one level</source>
         <translation>Перенести на уровень выше</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="131"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="124"/>
         <source>Position</source>
         <translation>Позиция</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="157"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="236"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="229"/>
         <source>Show Tips</source>
         <translation>Показывать советы</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="158"/>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="237"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="151"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="230"/>
         <source>A little help for the Selection tool</source>
         <translation>Справка по инструменту &lt;Выбор&gt;</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Rotation mode</source>
         <translation>Режим вращения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="173"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
         <source>Double click on any node or shortcut Alt + R</source>
         <translation>Дважды щелкните на узле или клавиатурная комбинация Alt + R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Arrows</source>
         <translation>Стрелки</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
         <source>Movement on selection</source>
         <translation>Перемещение выделения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Shift + Arrows</source>
         <translation>Shift + Стрелки</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
         <source>Slow movement on selection</source>
         <translation>Медленное перемещение выделения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Ctrl + Arrows</source>
         <translation>Ctrl + Стрелки</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
         <source>Fast movement on selection</source>
         <translation>Быстрое перемещение выделения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Shift + Left Mouse Button</source>
         <translation>Shift + Левая Клавиша Мыши</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="177"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
         <source>Proportional scaling on selection</source>
         <translation>Пропорциональное масштабирование выделения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="231"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="224"/>
         <source>Show Tools</source>
         <translation>Показать инструменты</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/selecttool/settings.cpp" line="232"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="225"/>
         <source>Options panel for the Selection tool</source>
         <translation>Настройки для инструмента &lt;Выбор&gt;</translation>
     </message>
@@ -1172,12 +1244,12 @@
 <context>
     <name>SpinControl</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="220"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="221"/>
         <source>Radius</source>
         <translation>Радиус</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.h" line="229"/>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="230"/>
         <source>Angle</source>
         <translation>Угол</translation>
     </message>
@@ -1185,12 +1257,12 @@
 <context>
     <name>StepsViewer</name>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="67"/>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
         <source>Frames</source>
         <translation>Кадры</translation>
     </message>
@@ -1198,42 +1270,42 @@
 <context>
     <name>TButtonBar</name>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="59"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="47"/>
         <source>Left button bar</source>
         <translation>Левая панель кнопок</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="64"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="52"/>
         <source>Right button bar</source>
         <translation>Правая панель кнопок</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="69"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="57"/>
         <source>Bottom button bar</source>
         <translation>Нижняя панель кнопок</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="74"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="62"/>
         <source>Top button bar</source>
         <translation>Верхняя панель кнопок</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="88"/>
         <source>Only icons</source>
         <translation>Только значки</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="91"/>
         <source>Only texts</source>
         <translation>Только текст</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="108"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="96"/>
         <source>Exclusive space</source>
         <translation>Эксклюзивное пространство</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="115"/>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
         <source>Auto hide</source>
         <translation>Автоскрытие</translation>
     </message>
@@ -1241,12 +1313,12 @@
 <context>
     <name>TCommandHistory</name>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="45"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="41"/>
         <source>Undo</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="46"/>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="42"/>
         <source>Redo</source>
         <translation>Возврат</translation>
     </message>
@@ -1254,32 +1326,32 @@
 <context>
     <name>TFontChooser</name>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="52"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="45"/>
         <source>Family</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="56"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="49"/>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="60"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="53"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="80"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="73"/>
         <source>Normal</source>
         <translation>Обычный</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="81"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="74"/>
         <source>Italic</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tfontchooser.cpp" line="82"/>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="75"/>
         <source>Oblique</source>
         <translation>Наклонный</translation>
     </message>
@@ -1287,17 +1359,17 @@
 <context>
     <name>TOptionalDialog</name>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="60"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="56"/>
         <source>Don&apos;t show again</source>
         <translation>Больше не показывать</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="59"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="67"/>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
         <source>Accept</source>
         <translation>Принять</translation>
     </message>
@@ -1305,12 +1377,12 @@
 <context>
     <name>TRulerBase</name>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="109"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="102"/>
         <source>Change scale to 5...</source>
         <translation>Изменить масштаб на 5...</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/trulerbase.cpp" line="110"/>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="103"/>
         <source>Change scale to 10...</source>
         <translation>Изменить масштаб на 10...</translation>
     </message>
@@ -1318,22 +1390,22 @@
 <context>
     <name>TViewButton</name>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="275"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="265"/>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="276"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="266"/>
         <source>Only icon</source>
         <translation>Только значки</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="277"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="267"/>
         <source>Only text</source>
         <translation>Только текст</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tviewbutton.cpp" line="280"/>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="270"/>
         <source>Mouse sensibility</source>
         <translation>Чувствительность мыши</translation>
     </message>
@@ -1341,22 +1413,22 @@
 <context>
     <name>TWizard</name>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="48"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="40"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="49"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="41"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Назад</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="50"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="42"/>
         <source>Next &gt;</source>
         <translation>Далее &gt;</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/twizard.cpp" line="51"/>
+        <location filename="../src/framework/tgui/twizard.cpp" line="43"/>
         <source>&amp;Finish</source>
         <translation>&amp;Финиш</translation>
     </message>
@@ -1364,22 +1436,22 @@
 <context>
     <name>TabDialog</name>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="93"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="89"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="100"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="96"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="107"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="103"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/tabdialog.cpp" line="114"/>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="110"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -1387,7 +1459,7 @@
 <context>
     <name>TextConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/textconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/text/textconfigurator.cpp" line="49"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
@@ -1395,14 +1467,14 @@
 <context>
     <name>TextTool</name>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="64"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="163"/>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="167"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="57"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="160"/>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/texttool/texttool.cpp" line="164"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="157"/>
         <source>T</source>
         <translation>T</translation>
     </message>
@@ -1410,18 +1482,18 @@
 <context>
     <name>TreeWidgetSearchLine</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="74"/>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="89"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="63"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="78"/>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="277"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="266"/>
         <source>Search Columns</source>
         <translation>Просмотреть столбцы</translation>
     </message>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="279"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="268"/>
         <source>All Visible Columns</source>
         <translation>Все видимые столбцы</translation>
     </message>
@@ -1429,7 +1501,7 @@
 <context>
     <name>TreeWidgetSearchLineWidget</name>
     <message>
-        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="575"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="564"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
@@ -1437,32 +1509,32 @@
 <context>
     <name>TupAbout</name>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="136"/>
+        <location filename="../src/libui/tupabout.cpp" line="152"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="111"/>
+        <location filename="../src/libui/tupabout.cpp" line="115"/>
         <source>Credits</source>
         <translation>Титры</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="58"/>
+        <location filename="../src/libui/tupabout.cpp" line="48"/>
         <source>About Tupi</source>
         <translation>О Tupi</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="126"/>
+        <location filename="../src/libui/tupabout.cpp" line="136"/>
         <source>Thanks</source>
         <translation>Благодарности</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="146"/>
+        <location filename="../src/libui/tupabout.cpp" line="167"/>
         <source>License Agreement</source>
         <translation>Лицензионное соглашение</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupabout.cpp" line="147"/>
+        <location filename="../src/libui/tupabout.cpp" line="168"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -1470,37 +1542,42 @@
 <context>
     <name>TupBasicCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Tupi Camera Manager</source>
         <translation type="unfinished">Управление камерой</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
         <source>Current resolution:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="122"/>
         <source>Cameras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="124"/>
         <source>Camera</source>
         <translation type="unfinished">Камера</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="138"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
         <source>Take picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="147"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Error</source>
         <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
         <source>Can&apos;t create pictures directory</source>
         <translation type="unfinished">Не получилось создать каталог для изображений</translation>
     </message>
@@ -1508,27 +1585,27 @@
 <context>
     <name>TupCameraBar</name>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="61"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="59"/>
         <source>Rewind</source>
         <translation>Перемотать назад</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="66"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="64"/>
         <source>Play in reverse</source>
         <translation>Воспроизвести назад</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="71"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="69"/>
         <source>Play</source>
         <translation>Воспроизвести</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="76"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="74"/>
         <source>Stop</source>
         <translation>Стоп</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerabar.cpp" line="81"/>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="79"/>
         <source>Forward</source>
         <translation>Перемотать вперед</translation>
     </message>
@@ -1536,42 +1613,42 @@
 <context>
     <name>TupCameraDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="69"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="56"/>
         <source>Camera Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="72"/>
         <source>Available Camera Devices:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="77"/>
         <source>Camera Detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="89"/>
         <source>Available Camera Resolutions:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="101"/>
         <source>Resize my project to fit camera resolution</source>
         <translation>Подогнать размеры проекта под разрешение камеры</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="104"/>
         <source>Use the basic camera interface (low resources)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="110"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="127"/>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -1579,87 +1656,92 @@
 <context>
     <name>TupCameraInterface</name>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Tupi Camera Manager</source>
         <translation>Управление камерой</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="75"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
         <source>Current resolution:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="125"/>
         <source>Cameras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="127"/>
         <source>Camera</source>
         <translation type="unfinished">Камера</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="133"/>
         <source>Take picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="138"/>
         <source>Show safe area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="139"/>
         <source>+</source>
         <translation type="unfinished">+</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
         <source>Show grid</source>
         <translation type="unfinished">Показать сетку</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
         <source>#</source>
         <translation type="unfinished">#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="156"/>
         <source>Grid spacing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="174"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="167"/>
         <source>Grid color</source>
         <translation type="unfinished">Цвет сетки</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="190"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="183"/>
         <source>Show previous images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="191"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="184"/>
         <source>P</source>
         <translation type="unfinished">P</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="194"/>
         <source>Image opacity level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="204"/>
         <source>Amount of images to show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="231"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Error</source>
         <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="292"/>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
         <source>Can&apos;t create pictures directory</source>
         <translation type="unfinished">Не получилось создать каталог для изображений</translation>
     </message>
@@ -1667,37 +1749,37 @@
 <context>
     <name>TupCameraStatus</name>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="79"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="71"/>
         <source>Scene name</source>
         <translation>Имя сцены</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="92"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="84"/>
         <source>Frames total</source>
         <translation>Количество кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="103"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="95"/>
         <source>FPS</source>
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="120"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="112"/>
         <source>Loop</source>
         <translation>Цикл</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="124"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="116"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="137"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="129"/>
         <source>Export</source>
         <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerastatus.cpp" line="147"/>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="139"/>
         <source>Post</source>
         <translation>Постобработка</translation>
     </message>
@@ -1705,207 +1787,230 @@
 <context>
     <name>TupCameraWidget</name>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="98"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="91"/>
         <source>Scene Preview</source>
         <translation>Предпросмотр сцены</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="162"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="159"/>
         <source>Scale</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/components/animation/tupcamerawidget.cpp" line="185"/>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="182"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
 </context>
 <context>
+    <name>TupCameraWindow</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="95"/>
+        <source>General Camera error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="100"/>
+        <source>Camera invalid request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="105"/>
+        <source>Camera service missing error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="110"/>
+        <source>Camera not supported error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupCanvas</name>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="101"/>
         <source>Sketch Tools</source>
         <translation>Инструменты для набросков</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="128"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="119"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="119"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="105"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="118"/>
         <source>Images</source>
         <translation>Изображения</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="94"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="80"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="71"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="78"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="79"/>
         <source>Tupi: Open 2D Magic</source>
         <translation>Tupi: Open 2D Magic</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="109"/>
         <source>Selection Tools</source>
         <translation>Инструмент &lt;Выбор&gt;</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="136"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="147"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="146"/>
         <source>Undo</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="140"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="151"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="151"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="149"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="150"/>
         <source>Redo</source>
         <translation>Повтор</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="144"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="131"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="130"/>
         <source>Delete Selection</source>
         <translation>Удаление выделения</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="135"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="135"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="134"/>
         <source>Zoom In</source>
         <translation>Приблизить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="139"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="137"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="138"/>
         <source>Zoom Out</source>
         <translation>Отдалить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="156"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="143"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="143"/>
-        <source>Hand</source>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="142"/>
+        <source>Shift</source>
         <translation>Рука</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="160"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="137"/>
         <source>Pen Properties</source>
         <translation>Свойства пера</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="164"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="163"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="162"/>
         <source>Exposure Sheet</source>
         <translation>Экспозиционный лист</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="447"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="295"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="425"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="293"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="295"/>
         <source>Import a SVG file...</source>
         <translation>Импорт SVG файла...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="448"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="296"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="297"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="426"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="294"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
         <source>Vector</source>
         <translation>Вектор</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="485"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="463"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="331"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="333"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="487"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="335"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="465"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="335"/>
         <source>Image is bigger than workspace.</source>
         <translation>Изображение больше рабочего пространства.</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="488"/>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="336"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="337"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="466"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
         <source>Do you want to resize it?</source>
         <translation>Хотите изменить его размер?</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="634"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="609"/>
         <source>Scene %1</source>
         <translation>Сцена %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="637"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="612"/>
         <source>Layer 1</source>
         <translation>Слой 1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="640"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="615"/>
         <source>Frame 1</source>
         <translation>Кадр 1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="653"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="628"/>
         <source>Layer %1</source>
         <translation>Слой %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="660"/>
-        <location filename="../src/components/paintarea/tupcanvas.cpp" line="672"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="635"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="647"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="97"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="97"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="96"/>
         <source>Pencil</source>
         <translation>Карандаш</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="101"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="101"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="99"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="100"/>
         <source>Ink</source>
         <translation>Перо</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="111"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="109"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="110"/>
         <source>Ellipse</source>
         <translation>Эллипс</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="115"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="114"/>
         <source>Rectangle</source>
         <translation>Прямоугольник</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="122"/>
         <source>Object Selection</source>
         <translation>Выделение объекта</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="127"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="127"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="126"/>
+        <source>Nodes Selection</source>
         <translation>Выделение линии</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="155"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="155"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="154"/>
         <source>Color Palette</source>
         <translation>Палитра</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="159"/>
-        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="158"/>
         <source>Pen Size</source>
         <translation>Размер пера</translation>
     </message>
@@ -1913,17 +2018,17 @@
 <context>
     <name>TupChat</name>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="85"/>
+        <location filename="../src/net/tupchat.cpp" line="75"/>
         <source>Send</source>
         <translation>Отправить</translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="174"/>
+        <location filename="../src/net/tupchat.cpp" line="164"/>
         <source>Error:</source>
         <translation>Ошибка:</translation>
     </message>
     <message>
-        <location filename="../src/net/tupchat.cpp" line="175"/>
+        <location filename="../src/net/tupchat.cpp" line="165"/>
         <source>Invalid Message. It won&apos;t be sent. Please, don&apos;t use HTML tags</source>
         <translation>Неверное сообщение, невозможно отправить, не используйте HTML теги</translation>
     </message>
@@ -1931,27 +2036,27 @@
 <context>
     <name>TupColorPalette</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="95"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="77"/>
         <source>Color Palette</source>
         <translation>Палитра</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="141"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="127"/>
         <source>Contour</source>
         <translation>Контур</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="142"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="128"/>
         <source>Fill</source>
         <translation>Заливка</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="221"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="207"/>
         <source>Color Mixer</source>
         <translation>Выбор цвета</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="229"/>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="215"/>
         <source>Gradients</source>
         <translation>Градиенты</translation>
     </message>
@@ -1959,7 +2064,7 @@
 <context>
     <name>TupColorValue</name>
     <message>
-        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="184"/>
+        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="180"/>
         <source>Percent</source>
         <translation>Процент</translation>
     </message>
@@ -1967,12 +2072,12 @@
 <context>
     <name>TupConfigurationArea</name>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="286"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="296"/>
         <source>Cursor here for expand</source>
         <translation>Поместите курсор сюда для расширения</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="329"/>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="339"/>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
@@ -1980,42 +2085,42 @@
 <context>
     <name>TupConnectDialog</name>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="60"/>
         <source>Connection Dialog</source>
         <translation>Диалог подключения</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Login</source>
         <translation>Логин</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="82"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="84"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
         <source>Store password</source>
         <translation>Сохранить пароль</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/net/tupconnectdialog.cpp" line="170"/>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
         <source>Please, fill in your password</source>
         <translation>Пожалуйста, введите ваш пароль</translation>
     </message>
@@ -2023,18 +2128,18 @@
 <context>
     <name>TupCrashWidget</name>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="129"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="112"/>
         <source>What&apos;s happening?</source>
         <translation>Что случилось?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="159"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="140"/>
         <source>Executable information</source>
         <translation>Информация о выполнении</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="165"/>
-        <location filename="../src/shell/tupcrashwidget.cpp" line="172"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="146"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="153"/>
         <source>Backtrace</source>
         <translation>Трассировка</translation>
     </message>
@@ -2042,7 +2147,7 @@
 <context>
     <name>TupDebugWidget</name>
     <message>
-        <location filename="../src/components/debug/tupdebugwidget.cpp" line="48"/>
+        <location filename="../src/components/debug/tupdebugwidget.cpp" line="44"/>
         <source>Debug Console</source>
         <translation>Консоль отладки</translation>
     </message>
@@ -2050,368 +2155,388 @@
 <context>
     <name>TupDocumentView</name>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="341"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="587"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="836"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="874"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1126"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="617"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="931"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
         <source>Object Selection</source>
         <translation>Выделение объекта</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Выделение линии</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="359"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>&amp;Group</source>
         <translation>С&amp;группировать</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="375"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="378"/>
         <source>&amp;Ungroup</source>
         <translation>Ра&amp;згруппировать</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="376"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="379"/>
         <source>Ctrl+Shift+G</source>
         <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Onion Skin</source>
         <translation>Просвет</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="380"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1016"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1123"/>
         <source>Onion Skin Factor</source>
         <translation>Значение просвета</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>@</source>
         <translation>@</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
         <source>Export Current Frame As Image</source>
         <translation>Экспортировать этот кадр как изображение</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="393"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
         <source>Export Current Frame To Gallery</source>
         <translation>Экспортировать этот кадр в галерею</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="397"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
         <source>Storyboard Settings</source>
         <translation>Установки раскадровки</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Camera</source>
         <translation>Камера</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="406"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="409"/>
         <source>Draw tools</source>
         <translation>Инструменты рисования</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="416"/>
         <source>Brushes</source>
         <translation>Кисти</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="420"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="423"/>
         <source>Selection</source>
         <translation>Выделение</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="427"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="430"/>
         <source>Fill</source>
         <translation>Заливка</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="434"/>
-        <source>View</source>
-        <translation>Вид</translation>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
+        <source>Papagayo file has been imported successfully</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="444"/>
         <source>Tweening</source>
         <translation>Анимация</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="455"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="467"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="478"/>
         <source>Image Array</source>
         <translation>Массив изображений</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="510"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="800"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="896"/>
         <source>Pencil</source>
         <translation>Карандаш</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="516"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
         <source>Ink</source>
         <translation>Перо</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="520"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="542"/>
         <source>Eraser</source>
         <translation>Ластик</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="525"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="804"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1537"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="547"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1648"/>
         <source>PolyLine</source>
         <translation>Полилиния</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1651"/>
         <source>Line</source>
         <translation>Линия</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="535"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="805"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="561"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
         <source>Rectangle</source>
         <translation>Прямоугольник</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="806"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="564"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
         <source>Ellipse</source>
         <translation>Эллипс</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="541"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="802"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="567"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="898"/>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="549"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="575"/>
         <source>Position Tween</source>
         <translation>Анимация положения</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="580"/>
         <source>Rotation Tween</source>
         <translation>Анимация вращения</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="558"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="584"/>
         <source>Scale Tween</source>
         <translation>Анимация масштабирования</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="563"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="589"/>
         <source>Shear Tween</source>
         <translation>Анимация сдвига</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="568"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
         <source>Opacity Tween</source>
         <translation>Анимация прозрачности</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="573"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="599"/>
         <source>Coloring Tween</source>
         <translation>Анимация цвета</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="578"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="604"/>
         <source>Compound Tween</source>
         <translation>Комбинированная анимация</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="624"/>
         <source>Internal fill</source>
         <translation>Внутренняя заливка</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="601"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom In</source>
         <translation>Приблизить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="743"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="775"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="816"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="871"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="848"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
         <source>Zoom Out</source>
         <translation>Отдалить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="851"/>
-        <source>Hand</source>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="437"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="631"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="946"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1496"/>
+        <source>Shift</source>
         <translation>Рука</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="953"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="609"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1060"/>
         <source>Paint area actions</source>
         <translation>Действия в области рисования</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="956"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1063"/>
         <source>Dynamic Background Properties</source>
         <translation>Свойства динамического заднего плана</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="961"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1068"/>
         <source>Frames Mode</source>
         <translation>Режим кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="962"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1069"/>
         <source>Static BG Mode</source>
         <translation>Статический задний план</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="963"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1070"/>
         <source>Dynamic BG Mode</source>
         <translation>Динамический задний план</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="988"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1095"/>
         <source>Previous Frames</source>
         <translation>Предыдущие кадры</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1000"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1107"/>
         <source>Next Frames</source>
         <translation>Следующие кадры</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1035"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1142"/>
         <source>Direction</source>
         <translation>Направление</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1038"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1145"/>
         <source>Left to Right</source>
         <translation>Слева направо</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1146"/>
         <source>Right to Left</source>
         <translation>Справа налево</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1040"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1147"/>
         <source>Top to Bottom</source>
         <translation>Сверху вниз</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1041"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1148"/>
         <source>Bottom to Top</source>
         <translation>Снизу вверх</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1044"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1151"/>
         <source>Shift Length</source>
         <translation>Длина смещения</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1413"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1519"/>
         <source>Export Frame As</source>
         <translation>Экспортировать кадр как</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1414"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1520"/>
         <source>Images</source>
         <translation>Изображения</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1419"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
         <source>Frame has been exported successfully</source>
         <translation>Кадр успешно экспортирован</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1421"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
         <source>Can&apos;t export frame as image</source>
         <translation>Невозможно экспортировать кадр как изображение</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1605"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
         <source>No cameras detected</source>
         <translation>Ни одной камеры не обнаружено</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1668"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1797"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1870"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
@@ -2419,47 +2544,47 @@
 <context>
     <name>TupExportWidget</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="997"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1030"/>
         <source>Export to Video</source>
         <translation>Экспорт в Видео</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1007"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1041"/>
         <source>Export to Video File</source>
         <translation>Экспорт в Видео файл</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1010"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1044"/>
         <source>Export to Images Array</source>
         <translation>Экспорт в массив изображений</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1013"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1047"/>
         <source>Export to Animated Image</source>
         <translation>Экспортировать в анимированное изображение</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1029"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1063"/>
         <source>Post Animation in Tupitube</source>
         <translation>Опубликовать анимацию в Tupitube</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1058"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1097"/>
         <source>Video Formats</source>
         <translation>Видеоформаты</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1060"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1099"/>
         <source>Open Video Format</source>
         <translation>Открытые видеоформаты</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1062"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1101"/>
         <source>Image Array</source>
         <translation>Массив изображений</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="1064"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1103"/>
         <source>Animated Image</source>
         <translation>Анимированное изображение</translation>
     </message>
@@ -2467,29 +2592,29 @@
 <context>
     <name>TupExportWizard</name>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="62"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="54"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="63"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="55"/>
         <source>Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="64"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="56"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="149"/>
         <source>Next</source>
         <translation>Далее</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="187"/>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="214"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="179"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="206"/>
         <source>Export</source>
         <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwizard.cpp" line="216"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="208"/>
         <source>Post</source>
         <translation>Постобработка</translation>
     </message>
@@ -2497,21 +2622,21 @@
 <context>
     <name>TupExposureDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="57"/>
         <source>Exposure Sheet</source>
         <translation>Экспозиционный лист</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="132"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="149"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="152"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="273"/>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="288"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="264"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="279"/>
         <source>Scene</source>
         <translation>Сцена</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="144"/>
         <source>Work Team</source>
         <translation>Рабочая группа</translation>
     </message>
@@ -2519,15 +2644,15 @@
 <context>
     <name>TupExposureScene</name>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="70"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="115"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="65"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="110"/>
         <source>Layer</source>
         <translation>Слой</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="77"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="123"/>
-        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="72"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="154"/>
         <source>Frame</source>
         <translation>Кадр</translation>
     </message>
@@ -2535,123 +2660,123 @@
 <context>
     <name>TupExposureSheet</name>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="71"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="60"/>
         <source>Exposure Sheet</source>
         <translation>Экспозиционный лист</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="96"/>
         <source>actions</source>
         <translation>Действия</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="106"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="100"/>
         <source>Insert</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="108"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="166"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
         <source>1 frame</source>
         <translation>1 Кадр</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="113"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="167"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="107"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="161"/>
         <source>5 frames</source>
         <translation>5 Кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="118"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="112"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="162"/>
         <source>10 frames</source>
         <translation>10 Кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="123"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="117"/>
         <source>20 frames</source>
         <translation>20 Кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="128"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="122"/>
         <source>50 frames</source>
         <translation>50 Кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="133"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="127"/>
         <source>100 frames</source>
         <translation>100 Кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="140"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="134"/>
         <source>Remove frame</source>
         <translation>Удалить кадр</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="145"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="139"/>
         <source>Clear frame</source>
         <translation>Очистить Кадр</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="150"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="144"/>
         <source>Lock/Unlock frame</source>
         <translation>Блокировать/Разблокировать кадр</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="155"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="149"/>
         <source>Copy frame</source>
         <translation>Копировать кадр</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="154"/>
         <source>Paste in frame</source>
         <translation>Вставить в кадр</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="165"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="159"/>
         <source>Expand</source>
         <translation>Расширить</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
         <source>Copy TL forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="174"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="169"/>
         <source>1 time</source>
         <translation>1 раз</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="175"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="170"/>
         <source>2 times</source>
         <translation>2 раза</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="176"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="171"/>
         <source>3 times</source>
         <translation>3 раза</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="177"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="172"/>
         <source>4 times</source>
         <translation>4 раза</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="178"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
         <source>5 times</source>
         <translation>5 раз</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="239"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="632"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="247"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="671"/>
         <source>Layer %1</source>
         <translation>Слой %1</translation>
     </message>
     <message>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="246"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="474"/>
-        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="635"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="254"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="501"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="674"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
@@ -2659,32 +2784,32 @@
 <context>
     <name>TupGradientCreator</name>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Linear</source>
         <translation>Линейный</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Radial</source>
         <translation>Радиальный</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="81"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
         <source>Conical</source>
         <translation>Конический</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Pad</source>
         <translation>Заполнение</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Reflect</source>
         <translation>Отражение</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupgradientcreator.cpp" line="88"/>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
         <source>Repeat</source>
         <translation>Повтор</translation>
     </message>
@@ -2692,34 +2817,34 @@
 <context>
     <name>TupGraphicsScene</name>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="154"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="155"/>
         <source>PolyLine</source>
         <translation>Полилиния</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="533"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="727"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="583"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="771"/>
         <source>/Step: 0</source>
         <translation>/Шаг: 0</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="610"/>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="759"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="653"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="803"/>
         <source>/Step: </source>
         <translation>/Шаг: </translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1108"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1212"/>
         <source>Line</source>
         <translation>Линия</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom In</source>
         <translation>Приблизить</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1176"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
         <source>Zoom Out</source>
         <translation>Отдалить</translation>
     </message>
@@ -2727,7 +2852,7 @@
 <context>
     <name>TupHelpBrowser</name>
     <message>
-        <location filename="../src/components/help/tuphelpbrowser.cpp" line="50"/>
+        <location filename="../src/components/help/tuphelpbrowser.cpp" line="42"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
@@ -2735,7 +2860,7 @@
 <context>
     <name>TupHelpWidget</name>
     <message>
-        <location filename="../src/components/help/tuphelpwidget.cpp" line="48"/>
+        <location filename="../src/components/help/tuphelpwidget.cpp" line="40"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
@@ -2743,59 +2868,59 @@
 <context>
     <name>TupImageDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="48"/>
         <source>Image Properties</source>
         <translation>Свойства изображения</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="53"/>
         <source>Title</source>
         <translation>Заголовок</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="67"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="54"/>
         <source>My Picture</source>
         <translation>Моя Картинка</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="73"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="60"/>
         <source>Topics</source>
         <translation>Темы</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation>#тема1 #тема2 #тема3</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="79"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="72"/>
         <source>Just a little taste of my style :)</source>
         <translation>Просто немного о моем стиле :)</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="89"/>
         <source>Post Image</source>
         <translation>Post Image</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="124"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="130"/>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="128"/>
         <source>Set a title for the picture here!</source>
         <translation>Здесь установите заголовок для изображения!</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="152"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="139"/>
         <source>Set some topic tags for the picture here!</source>
         <translation>Здесь установите тематические теги для изображения!</translation>
     </message>
@@ -2803,55 +2928,55 @@
 <context>
     <name>TupInfoWidget</name>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="140"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="124"/>
         <source>Currency Converter</source>
         <translation>Конвертер валют</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="128"/>
         <source>Currency</source>
         <translation>Валюта</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="148"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="227"/>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="244"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="228"/>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="143"/>
         <source>Source</source>
         <translation>Источник</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="168"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="152"/>
         <source>Update data every</source>
         <translation>Обновлять данные каждые</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
         <source>minute</source>
         <translation>минуту</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="173"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
         <source>minutes</source>
         <translation>минут</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="262"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="246"/>
         <source>Link file to Object</source>
         <translation>Связать файл с объектом</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="263"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="247"/>
         <source>All files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
@@ -2859,65 +2984,67 @@
 <context>
     <name>TupItemManager</name>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="74"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="70"/>
         <source>New folder %1</source>
         <translation>Новая папка %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="231"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="343"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="229"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="350"/>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="234"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="242"/>
         <source>Edit with Inkscape</source>
         <translation>Открыть в Inkscape</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="244"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="252"/>
         <source>Edit with Gimp</source>
         <translation>Открыть в Gimp</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="254"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="262"/>
         <source>Edit with Krita</source>
         <translation>Открыть в Krita</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="264"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="272"/>
         <source>Edit with MyPaint</source>
         <translation>Открыть в MyPaint</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="275"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="283"/>
         <source>Clone</source>
         <translation>Клонировать</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="278"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="286"/>
         <source>Export</source>
         <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="281"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="232"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="289"/>
         <source>Rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="284"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="235"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="292"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="295"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="347"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="354"/>
         <source>Create new raster item</source>
         <translation>Создать растровое изображение</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
-        <location filename="../src/components/library/tupitemmanager.cpp" line="355"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="309"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="359"/>
         <source>Create new svg item</source>
         <translation>Создать векторное изображение svg</translation>
     </message>
@@ -2925,7 +3052,7 @@
 <context>
     <name>TupItemPreview</name>
     <message>
-        <location filename="../src/libtupi/tupitempreview.cpp" line="64"/>
+        <location filename="../src/libtupi/tupitempreview.cpp" line="56"/>
         <source>Library is empty :(</source>
         <translation>Библиотека пуста :(</translation>
     </message>
@@ -2933,40 +3060,45 @@
 <context>
     <name>TupItemTweener</name>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="551"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="610"/>
         <source>Position Tween</source>
         <translation>Анимация положения</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="554"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="613"/>
         <source>Rotation Tween</source>
         <translation>Анимация вращения</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="557"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="616"/>
         <source>Scale Tween</source>
         <translation>Анимация масштабирования</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="560"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="619"/>
         <source>Shear Tween</source>
         <translation>Анимация сдвига</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="563"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="622"/>
         <source>Opacity Tween</source>
         <translation>Анимация прозрачности</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="566"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="625"/>
         <source>Coloring Tween</source>
         <translation>Анимация цвета</translation>
     </message>
     <message>
-        <location filename="../src/store/tupitemtweener.cpp" line="569"/>
+        <location filename="../src/store/tupitemtweener.cpp" line="628"/>
         <source>Compound Tween</source>
         <translation>Комбинированная анимация</translation>
     </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="631"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupLayer</name>
@@ -2979,7 +3111,7 @@
 <context>
     <name>TupLayerIndex</name>
     <message>
-        <location filename="../src/components/timeline/tuplayerindex.cpp" line="178"/>
+        <location filename="../src/components/timeline/tuplayerindex.cpp" line="169"/>
         <source>Layers</source>
         <translation>Слои</translation>
     </message>
@@ -2987,17 +3119,17 @@
 <context>
     <name>TupLibraryDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="58"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="47"/>
         <source>Library Object</source>
         <translation>Библиотека Объектов</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="92"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="81"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="84"/>
         <source>Item %1</source>
         <translation>Элемент %1</translation>
     </message>
@@ -3005,238 +3137,238 @@
 <context>
     <name>TupLibraryWidget</name>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="125"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="95"/>
         <source>Library</source>
         <translation>Библиотека</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="189"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1327"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="162"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1445"/>
         <source>Image</source>
         <translation>Изображение</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="191"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1332"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="164"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1450"/>
         <source>Image Array</source>
         <translation>Массив Изображений</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="190"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="163"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1455"/>
         <source>Svg File</source>
         <translation>SVG файл</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="192"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1342"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="165"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1460"/>
         <source>Svg Array</source>
         <translation>Массив SVG</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="198"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="171"/>
         <source>Add an object to library</source>
         <translation>Добавить объект в библиотеку</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="206"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="179"/>
         <source>Adds a folder to the object&apos;s list</source>
         <translation>Добавить папку в список объектов</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="213"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="186"/>
         <source>Inserts the selected object into the drawing area</source>
         <translation>Вставить выделенный объект в область рисования</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="278"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1374"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="269"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1493"/>
         <source>Directory</source>
         <translation>Папка</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="289"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="337"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="286"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="339"/>
         <source>No preview available</source>
         <translation>Просмотр недоступен</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="518"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="550"/>
         <source>Export object...</source>
         <translation>Экспортировать объект...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
         <source>Item exported successfully!</source>
         <translation>Экспорт успешно завершен!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
         <source>Couldn&apos;t create images directory!</source>
         <translation>Не получилось создать каталог для изображений!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
         <source>Couldn&apos;t create vector directory!</source>
         <translation>Не получилось создать каталог для векторных изображений!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="708"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="781"/>
         <source>Tupi library item</source>
         <translation>Элемент библиотеки Tupi</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="505"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="753"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="836"/>
         <source>Images</source>
         <translation>Изображения</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="752"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="835"/>
         <source>Import images...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="787"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="928"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1062"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="876"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1026"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1159"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="789"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="878"/>
         <source>Image is bigger than workspace.</source>
         <translation>Изображение больше рабочего пространства.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="790"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="879"/>
         <source>Do you want to resize it?</source>
         <translation>Хотите изменить его размер?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="596"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="689"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="833"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="880"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1167"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
         <source>Cannot open file: %1</source>
         <translation>Невозможно открыть файл: %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="839"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="929"/>
         <source>Import SVG files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="840"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="930"/>
         <source>Vector</source>
         <translation>Вектор</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="887"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="986"/>
         <source>Choose the images directory...</source>
         <translation>Выберите папку с изображениями...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="911"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
         <source>Image files found: %1.</source>
         <translation>Найдены изображения: %1.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="921"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1019"/>
         <source>Files are too big, so they will be resized.</source>
         <translation>Файлы слишком большие, необходимо изменить их размер.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="922"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1020"/>
         <source>Note: This task can take a while.</source>
         <translation>Внимание: это может занять некоторое время.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="931"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1065"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1029"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1162"/>
         <source>Do you want to continue?</source>
         <translation>Хотите продолжить?</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="953"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1051"/>
         <source>Loading images...</source>
         <translation>Загрузка изображений...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1001"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1118"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1099"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1213"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1107"/>
         <source>Loading image #%1</source>
         <translation>Загрузка изображения #%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR!</source>
         <translation>Ошибка!</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1013"/>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
         <source>ERROR: Can&apos;t open file %1. Please, check file permissions and try again.</source>
         <translation>ОШИБКА: невозможно открыть файл %1. Проверьте права доступа и попытайтесь снова.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1025"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
         <source>No image files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Файлы изображений не обнаружены.&lt;br/&gt;Попробуйте поискать в другой папке</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1033"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
         <source>Choose the SVG files directory...</source>
         <translation>Выберите папку с SVG файлами...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1059"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1156"/>
         <source>%1 SVG files will be loaded.</source>
         <translation>%1 SVG файлов будет загружено.</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1086"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1182"/>
         <source>Loading SVG files...</source>
         <translation>Загрузка SVG файлов...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1126"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1221"/>
         <source>Loading SVG file #%1</source>
         <translation>Загрузка SVG файла #%1</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1143"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
         <source>No SVG files were found.&lt;br/&gt;Please, try another directory</source>
         <translation>Файлы SVG не обнаружены.&lt;br/&gt;Попробуйте поискать в другой папке</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1149"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1244"/>
         <source>Import audio file...</source>
         <translation>Импорт аудио файла...</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1150"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1245"/>
         <source>Sound file</source>
         <translation>Звуковой файл</translation>
     </message>
@@ -3244,45 +3376,45 @@
 <context>
     <name>TupListProjectDialog</name>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="64"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="54"/>
         <source>Projects List from Server</source>
         <translation>Список проектов на сервере</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="89"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="79"/>
         <source>My works:</source>
         <translation>Мои работы:</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="90"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="80"/>
         <source>My contributions:</source>
         <translation>Мои публикаци:</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="126"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="116"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="149"/>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../src/net/tuplistprojectdialog.cpp" line="151"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
@@ -3290,584 +3422,619 @@
 <context>
     <name>TupMainWindow</name>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="108"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="581"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="111"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="635"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>Tupi: Open 2D Magic</source>
         <translation>Tupi: Open 2D Magic</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="209"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
         <source>[ by %1 | net mode ]</source>
         <translation>[ by %1 | сетевой режим ]</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="245"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
         <source>Opening a new document...</source>
         <translation>Открытие нового документа...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="263"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1135"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="306"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="273"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1218"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="277"/>
         <source>Animation</source>
         <translation>Анимация</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="317"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="327"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="285"/>
         <source>Player</source>
         <translation>Плеер</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="365"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; opened!</source>
         <translation>Проект &lt;b&gt;%1&lt;/b&gt; открыт!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="434"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="484"/>
         <source>Question</source>
         <translation>Вопрос</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="436"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="486"/>
         <source>The document has been modified.</source>
         <translation>Документ был изменен.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="487"/>
         <source>Do you want to save the project?</source>
         <translation>Хотите сохранить проект?</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="489"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="440"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="490"/>
         <source>Discard</source>
         <translation>Сброс</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="441"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="491"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="671"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="757"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1054"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1089"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
         <source>by</source>
         <translation>от</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="746"/>
         <source>Open Tupi project</source>
         <translation>Открыть проект Tupi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="689"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1014"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1341"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="747"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1093"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1429"/>
         <source>Tupi Project Package (*.tup)</source>
         <translation>Пакет проекта Tupi (*.tup)</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="761"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
         <source>Cannot open project!</source>
         <translation>Невозможно открыть проект!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Import Gimp palettes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="885"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
         <source>Gimp Palette (*.gpl *.txt *.css)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="915"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
         <source>Gimp palette import was successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="917"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
         <source>Gimp palette import was unsuccessful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Tip of the day</source>
         <translation>Совет дня</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Show on start</source>
         <translation>Показывать при запуске</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Previous tip</source>
         <translation>Предыдущий совет</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
         <source>Next tip</source>
         <translation>Следующий совет</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="864"/>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1374"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1462"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1013"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1092"/>
         <source>Save Project As</source>
         <translation>Сохранить проект как</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1030"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
         <source>Directory does not exist! Please, choose another path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1040"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
         <source>You have no permission to create this file. Please, choose another path.</source>
         <translation>У Вас нет прав для создания этого файла. Пожалуйста, введите другой путь.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1081"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
         <source>Project &lt;b&gt;%1&lt;/b&gt; saved</source>
         <translation>Проект &lt;b&gt;%1&lt;/b&gt; сохранен</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1091"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
         <source>Cannot save the project!</source>
         <translation>Невозможно сохранить проект!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1136"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1219"/>
         <source>New camera</source>
         <translation>Новая камера</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1340"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1428"/>
         <source>Import project package</source>
         <translation>Импорт проекта</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1349"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
         <source>Can&apos;t import project. File is empty!</source>
         <translation>Невозможно импортировать проект. Файл пуст!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1353"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
         <source>Can&apos;t save the project. File doesn&apos;t exist!</source>
         <translation>Невозможно сохранить проект. Файл не существует!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1369"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1457"/>
         <source>Fatal Error</source>
         <translation>Фатальная ошибка</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1371"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1459"/>
         <source>The connection to the server has been lost.</source>
         <translation>Соединение с сервером разорвано.</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow.cpp" line="1372"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1460"/>
         <source>Please, try to connect again in a while</source>
         <translation>Попробуйте подключиться позднее</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="70"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="64"/>
         <source>Shift+P</source>
         <translation>Shift+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="81"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="75"/>
         <source>Shift+B</source>
         <translation>Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="92"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="86"/>
         <source>Shift+L</source>
         <translation>Shift+L</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Bitmap</source>
         <translation>Растровое изображение</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
         <source>Alt+B</source>
         <translation>Alt+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Bitmap Array</source>
         <translation>Массив растровых изображений</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
         <source>Alt+Shift+B</source>
         <translation>Alt+Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>SVG File</source>
         <translation>SVG файл</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="102"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>SVG Array</source>
         <translation>Массив SVG</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="105"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
         <source>Alt+Shift+S</source>
         <translation>Alt+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="121"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="115"/>
         <source>Shift+C</source>
         <translation>Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="130"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="124"/>
         <source>Shift+E</source>
         <translation>Shift+E</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="140"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="139"/>
         <source>Shift+H</source>
         <translation>Shift+H</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="155"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="154"/>
         <source>Shift+T</source>
         <translation>Shift+T</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="165"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="164"/>
         <source>Shift+D</source>
         <translation>Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="196"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="195"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="204"/>
         <source>Recents</source>
         <translation>Предыдущие</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="243"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="225"/>
         <source>&amp;Edit</source>
         <translation>&amp;Редактировать</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="257"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="235"/>
         <source>&amp;Import</source>
         <translation>&amp;Импорт</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="280"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="252"/>
         <source>&amp;Window</source>
         <translation>&amp;Окно</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="272"/>
         <source>Modules</source>
         <translation>Модули</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="322"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="293"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="330"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
         <source>News</source>
         <translation>Новости</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="343"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>New project</source>
         <translation>Новый проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="392"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="363"/>
         <source>Open new project</source>
         <translation>Открыть новый проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Open project</source>
         <translation>Открыть проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="395"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="398"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="369"/>
         <source>Load existent project</source>
         <translation>Загрузить существующий проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="411"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="382"/>
         <source>Save project</source>
         <translation>Сохранить проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="412"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="383"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="385"/>
         <source>Save current project in current location</source>
         <translation>Сохранить текущий проект в текущую локацию</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="416"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
         <source>Save project &amp;As...</source>
         <translation>Сохранить проект &amp;Как...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="417"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="391"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="420"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="394"/>
         <source>Open dialog box to save current project in any location</source>
         <translation>Открыть окно диалога для сохранения проекта в другую локацию</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="423"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Cl&amp;ose project</source>
         <translation>&amp;Закрыть проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="424"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="426"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="403"/>
         <source>Close active project</source>
         <translation>Закрыть активный проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="431"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="408"/>
         <source>&amp;Import GIMP palettes</source>
         <translation>&amp;Импорт палитр gimp</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="432"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="409"/>
         <source>Shift+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="433"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="410"/>
         <source>Import palettes</source>
         <translation>Импорт палитр</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="413"/>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="415"/>
+        <source>Import Papagayo lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>&amp;Export Project</source>
         <translation>&amp;Экспорт проекта</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="437"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="439"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="421"/>
         <source>Export project to several video formats</source>
         <translation>Экспорт проекта в различные видео форматы</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>E&amp;xit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="443"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="445"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="427"/>
         <source>Close application</source>
         <translation>Закрыть приложение</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="469"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="451"/>
         <source>Pr&amp;eferences...</source>
         <translation>Настро&amp;йки...</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="452"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="472"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="454"/>
         <source>Opens the preferences dialog box</source>
         <translation>Открыть диалог настроек</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>About Tupi</source>
         <translation>О Tupi</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="486"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
         <source>Ctrl+K</source>
         <translation>Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="488"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="544"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="526"/>
         <source>Actions Bar</source>
         <translation>Последние действия</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="685"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="666"/>
         <source>Undo</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="688"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="669"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="672"/>
         <source>Redo</source>
         <translation>Возврат</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupmainwindow_gui.cpp" line="694"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="675"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Import Papagayo project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
+        <source>Papagayo project is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TupNetProjectManagerHandler</name>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="111"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="80"/>
         <source>Communications</source>
         <translation>Коммуникации</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="115"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="84"/>
         <source>Chat</source>
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="120"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="89"/>
         <source>Notices</source>
         <translation>Примечания</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="462"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="507"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="247"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
         <source>Unable to connect to server</source>
         <translation>Невозможно соединиться с сервером</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="310"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="319"/>
         <source>Fatal Error</source>
         <translation>Фатальная ошибка</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="312"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="321"/>
         <source>User &quot;%1&quot; is disabled.
 Please, contact the animation server admin to get access.</source>
         <translation>Пользователь &quot;%1&quot; не активен.
 Свяжитесь с администратором сервера.</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="491"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="536"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="431"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
         <source>User has no available projects in the server</source>
         <translation>У пользователя нет доступных проектов на сервере</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="460"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="505"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="484"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="529"/>
         <source>Notice</source>
         <translation>Примечание</translation>
     </message>
@@ -3875,61 +4042,61 @@
 <context>
     <name>TupNewItemDialog</name>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="76"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="66"/>
         <source>Create new raster item</source>
         <translation>Создать растровое изображение</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="83"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="192"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="196"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="215"/>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="219"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="73"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="182"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="186"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="205"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="209"/>
         <source>Transparent</source>
         <translation>Прозрачный</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="84"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="74"/>
         <source>White</source>
         <translation>Белый</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="85"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="75"/>
         <source>Black</source>
         <translation>Черный</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="97"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="87"/>
         <source>Create new vector item</source>
         <translation>Создать векторное изображение</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="123"/>
         <source>&amp;Name:</source>
         <translation>И&amp;мя:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="134"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="124"/>
         <source>&amp;Extension:</source>
         <translation>Рас&amp;ширение:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="135"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="125"/>
         <source>&amp;Width:</source>
         <translation>&amp;Ширина:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="136"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="126"/>
         <source>&amp;Height:</source>
         <translation>&amp;Высота:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="139"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="129"/>
         <source>&amp;Background:</source>
         <translation>&amp;Задний план:</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupnewitemdialog.cpp" line="143"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
         <source>&amp;Open it with:</source>
         <translation>Открыть с помо&amp;щью:</translation>
     </message>
@@ -3937,175 +4104,175 @@
 <context>
     <name>TupNewProject</name>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="84"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="75"/>
         <source>Create a new project</source>
         <translation>Создать Новый проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="90"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="81"/>
         <source>Project Name</source>
         <translation>Имя проекта</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="94"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="85"/>
         <source>my_project</source>
         <translation>Мой_проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="97"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="88"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="101"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="92"/>
         <source>Your name</source>
         <translation>Ваше имя</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="104"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="95"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="99"/>
         <source>Just for fun!</source>
         <translation>Повеселимся!</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="103"/>
         <source>Presets</source>
         <translation>Свойства</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="115"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="106"/>
         <source>Free format</source>
         <translation>Другой формат</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="116"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="107"/>
         <source>520x380 - 24</source>
         <translation>520x380 - 24</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="117"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
         <source>640x480 - 24</source>
         <translation>640x480 - 24</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="118"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="109"/>
         <source>480p (PAL DV/DVD) - 25</source>
         <translation>480p (PAL DV/DVD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="110"/>
         <source>576p (PAL DV/DVD) - 25</source>
         <translation>576p (PAL DV/DVD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="120"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="111"/>
         <source>720p (HD) - 25</source>
         <translation>720p (HD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="121"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
         <source>1280p (Full HD) - 25</source>
         <translation>1280p (Full HD) - 25</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="128"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="126"/>
         <source>Background</source>
         <translation>Фон</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="136"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="127"/>
         <source>Click here to change background color</source>
         <translation>Щелкните здесь для изменения цвета фона</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="144"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
         <source>FPS</source>
         <translation>FPS</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="154"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="145"/>
         <source>Dimension</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="170"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="161"/>
         <source>Tupitube project</source>
         <translation>Tupitube проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="176"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="167"/>
         <source>Project info</source>
         <translation>Информация о проекте</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="235"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="226"/>
         <source>Settings</source>
         <translation>Установки</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="237"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="242"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="233"/>
         <source>Store password</source>
         <translation>Сохранить пароль</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="288"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
         <source>Please, set a name for the project</source>
         <translation>Пожалуйста, назовите проект</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="294"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
         <source>Please, fill in your username</source>
         <translation>Пожалуйста, введите ваше имя</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="299"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
         <source>Please, fill in your password</source>
         <translation>Пожалуйста, введите ваш пароль</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="304"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
         <source>Please, fill in the server name or IP</source>
         <translation>Пожалуйста, введите имя сервера или IP</translation>
     </message>
     <message>
-        <location filename="../src/shell/tupnewproject.cpp" line="334"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="325"/>
         <source>White</source>
         <translation>Белый</translation>
     </message>
@@ -4113,7 +4280,7 @@
 <context>
     <name>TupNotice</name>
     <message>
-        <location filename="../src/net/tupnotice.cpp" line="65"/>
+        <location filename="../src/net/tupnotice.cpp" line="58"/>
         <source>Notices</source>
         <translation>Примечания</translation>
     </message>
@@ -4121,27 +4288,27 @@
 <context>
     <name>TupOnionOpacityDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="61"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="50"/>
         <source>Onion Paper</source>
         <translation>Параметры просвета</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="103"/>
         <source>-0.05</source>
         <translation>-0.05</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="107"/>
         <source>-0.01</source>
         <translation>-0.01</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="119"/>
         <source>+0.01</source>
         <translation>+0.01</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="123"/>
         <source>+0.05</source>
         <translation>+0.05</translation>
     </message>
@@ -4149,162 +4316,163 @@
 <context>
     <name>TupPaintArea</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="109"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1159"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1378"/>
         <source>Pencil</source>
         <translation>Карандаш</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="166"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <source>Nodes Selection</source>
         <translation>Выделение линии</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="181"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="564"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="607"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1160"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="182"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="644"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1379"/>
         <source>Object Selection</source>
         <translation>Выделение объекта</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="196"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="199"/>
         <source>Drawing area</source>
         <translation>Область рисования</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="201"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="202"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="203"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
         <source>Paste in...</source>
         <translation>Вставить в ...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
         <source>next 5 frames</source>
         <translation>Следующие 5 кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="207"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
         <source>next 10 frames</source>
         <translation>Следующие 10 кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="211"/>
         <source>next 20 frames</source>
         <translation>Следующие 20 кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="212"/>
         <source>next 50 frames</source>
         <translation>Следующие 50 кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="213"/>
         <source>next 100 frames</source>
         <translation>Следующие 100 кадров</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="220"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="235"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="238"/>
         <source>Add to library...</source>
         <translation>Добавить в библиотеку...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="174"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="521"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1145"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="591"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1364"/>
         <source>PolyLine</source>
         <translation>Полилиния</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
         <source>Send</source>
         <translation>Отправить</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
         <source>To back</source>
         <translation>На задний план</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="227"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="230"/>
         <source>To front</source>
         <translation>На передний план</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="228"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="231"/>
         <source>One level to back</source>
         <translation>На уровень ниже</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="232"/>
         <source>One level to front</source>
         <translation>На уровень выше</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1005"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1039"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
         <source>No items selected</source>
         <translation>Нет выделенных элементов</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1151"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1370"/>
         <source>Rectangle</source>
         <translation>Прямоугольник</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1152"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1371"/>
         <source>Ellipse</source>
         <translation>Эллипс</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1153"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1372"/>
         <source>Line</source>
         <translation>Линия</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="922"/>
-        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1211"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1085"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1430"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
@@ -4312,27 +4480,22 @@
 <context>
     <name>TupPaintAreaBase</name>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="201"/>
-        <source>OpenGL isn&apos;t supported</source>
-        <translation>OpenGL не поддерживается</translation>
-    </message>
-    <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="372"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="393"/>
         <source>No Scene!</source>
         <translation>Нет сцены!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="379"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="400"/>
         <source>Locked!</source>
         <translation>Заблокировано!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="448"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="469"/>
         <source>No Frames!</source>
         <translation>Нет кадров!</translation>
     </message>
     <message>
-        <location filename="../src/libbase/tuppaintareabase.cpp" line="451"/>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="472"/>
         <source>No Layers!</source>
         <translation>Нет слоев!</translation>
     </message>
@@ -4340,27 +4503,27 @@
 <context>
     <name>TupPaintAreaConfig</name>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="67"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="59"/>
         <source>Grid color</source>
         <translation>Цвет сетки</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="73"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="65"/>
         <source>Grid separation</source>
         <translation>Размер сетки</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="82"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="74"/>
         <source>Background color</source>
         <translation>Цвет фона</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="88"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="80"/>
         <source>Onion skin color</source>
         <translation>Цвет просвета</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppaintareaconfig.cpp" line="94"/>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="86"/>
         <source>Onion skin background </source>
         <translation>Фон просвета</translation>
     </message>
@@ -4368,82 +4531,82 @@
 <context>
     <name>TupPaintAreaStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="93"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="76"/>
         <source>Action Safe Area</source>
         <translation>Всегда видимая область</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="77"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="102"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="85"/>
         <source>Show grid</source>
         <translation>Показать сетку</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="103"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="86"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
         <source>Full screen</source>
         <translation>Полноэкранный режим</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="95"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="106"/>
         <source>Current Frame</source>
         <translation>Текущий кадр</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="130"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="113"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="144"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="127"/>
         <source>Zoom</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="164"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="147"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="159"/>
         <source>Rotate Workspace</source>
         <translation>Поворот холста</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="182"/>
         <source>Antialiasing</source>
         <translation>Сглаживание</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="208"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="191"/>
         <source>Background Color</source>
         <translation>Цвет фона</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="209"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="192"/>
         <source>Click here to change background color</source>
         <translation>Щелкните здесь для изменения цвета фона</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="215"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="198"/>
         <source>Brush Color</source>
         <translation>Цвет кисти</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="216"/>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
         <source>Click here to change brush color</source>
         <translation>Щелкните здесь для изменения цвета кисти</translation>
     </message>
@@ -4451,27 +4614,27 @@
 <context>
     <name>TupPenDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="60"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="50"/>
         <source>Pen Size</source>
         <translation>Размер пера</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="112"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="102"/>
         <source>-5</source>
         <translation>-5</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="116"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="106"/>
         <source>-1</source>
         <translation>-1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="124"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="114"/>
         <source>+1</source>
         <translation>+1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuppendialog.cpp" line="128"/>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="118"/>
         <source>+5</source>
         <translation>+5</translation>
     </message>
@@ -4479,83 +4642,83 @@
 <context>
     <name>TupPenWidget</name>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="60"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="52"/>
         <source>Pen Properties</source>
         <translation>Свойства пера</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="71"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="63"/>
         <source>Thickness</source>
         <translation>Толщина</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="84"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="76"/>
         <source>Dashes</source>
         <translation>Штрих</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="90"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="83"/>
         <source>Solid</source>
         <translation>Сплошной</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="85"/>
         <source>Dash</source>
         <translation>Штрих</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="92"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="87"/>
         <source>Dot</source>
         <translation>Пунктир</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="93"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="89"/>
         <source>Dash dot</source>
         <translation>Штрих-пунктир</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="94"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
         <source>Dash dot dot</source>
         <translation>Штрих-двойной пунктир</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="103"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="108"/>
         <source>Cap</source>
         <translation>Завершение линии</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="109"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="114"/>
         <source>Flat</source>
         <translation>Плоское</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="110"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="115"/>
         <source>Square</source>
         <translation>Прямоугольное</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="111"/>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="127"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="116"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="132"/>
         <source>Round</source>
         <translation>Круглое</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="120"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
         <source>Join</source>
         <translation>Соединение</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="130"/>
         <source>Miter</source>
         <translation>Усовое</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="126"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="131"/>
         <source>Bevel</source>
         <translation>Фаска</translation>
     </message>
     <message>
-        <location filename="../src/components/pen/tuppenwidget.cpp" line="136"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="141"/>
         <source>Brush</source>
         <translation>Кисть</translation>
     </message>
@@ -4563,27 +4726,27 @@
 <context>
     <name>TupPreferences</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="202"/>
         <source>Application TupPreferences</source>
         <translation>Настройки Tupi</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
         <source>General</source>
         <translation>Основное</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
         <source>Theme</source>
         <translation>Темы</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="217"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
         <source>Workspace</source>
         <translation>Рабочая область</translation>
     </message>
@@ -4591,27 +4754,27 @@
 <context>
     <name>TupPreferences::GeneralPage</name>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Tupi Home</source>
         <translation>Домашняя папка Tupi</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Cache</source>
         <translation>Кэш</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="130"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
         <source>Browser</source>
         <translation>Браузер</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Open last project</source>
         <translation>Открыть предыдущий проект</translation>
     </message>
     <message>
-        <location filename="../src/libui/tuppreferences.cpp" line="131"/>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
         <source>Auto save (minutes)</source>
         <translation>Автосохранение (в минутах)</translation>
     </message>
@@ -4619,126 +4782,126 @@
 <context>
     <name>TupProjectActionBar</name>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="108"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="97"/>
         <source>Insert a layer</source>
         <translation>Вставить слой</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="98"/>
         <source>F5</source>
         <translation>F5</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="120"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
         <source>Remove the layer</source>
         <translation>Удалить слой</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="110"/>
         <source>F6</source>
         <translation>F6</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
         <source>Move layer up</source>
         <translation>Переместить слой вверх</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="122"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="197"/>
         <source>F9</source>
         <translation>F9</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="143"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
         <source>Move layer down</source>
         <translation>Переместить слой вниз</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="144"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="219"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
         <source>F10</source>
         <translation>F10</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="148"/>
         <source>Insert frame</source>
         <translation>Вставить кадр</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="170"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
         <source>Remove the frame</source>
         <translation>Удалить кадр</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="188"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="177"/>
         <source>Move frame up</source>
         <translation>Переместить кадр вверх</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="189"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="178"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="196"/>
         <source>Move frame down</source>
         <translation>Переместить кадр вниз</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
         <source>Lock frame</source>
         <translation>Блокировать кадр</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="229"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
         <source>Lock layer</source>
         <translation>Блокировать слой</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="239"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="228"/>
         <source>Insert a scene</source>
         <translation>Вставить сцену</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="249"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="238"/>
         <source>Remove the scene</source>
         <translation>Удалить сцену</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="259"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="248"/>
         <source>Move scene up</source>
         <translation>Переместить сцену вверх</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="269"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="258"/>
         <source>Move scene down</source>
         <translation>Переместить сцену вниз</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="279"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="268"/>
         <source>Lock scene</source>
         <translation>Блокировать сцену</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
         <source>Do you want to remove this frame?</source>
         <translation>Хотите удалить этот кадр?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="356"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Remove?</source>
         <translation>Удалить?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="377"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
         <source>Do you want to remove this layer?</source>
         <translation>Хотите удалить этот слой?</translation>
     </message>
     <message>
-        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="397"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
         <source>Do you want to remove this scene?</source>
         <translation>Хотите удалить эту сцену?</translation>
     </message>
@@ -4746,17 +4909,17 @@
 <context>
     <name>TupProjectManager</name>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="190"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="207"/>
         <source>Scene %1</source>
         <translation>Сцена %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="193"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="210"/>
         <source>Layer %1</source>
         <translation>Слой %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupprojectmanager.cpp" line="196"/>
+        <location filename="../src/store/tupprojectmanager.cpp" line="213"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
@@ -4764,17 +4927,17 @@
 <context>
     <name>TupScene</name>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="185"/>
+        <location filename="../src/store/tupscene.cpp" line="190"/>
         <source>Sound layer %1</source>
         <translation>Звук %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="634"/>
+        <location filename="../src/store/tupscene.cpp" line="648"/>
         <source>Layer %1</source>
         <translation>Слой %1</translation>
     </message>
     <message>
-        <location filename="../src/store/tupscene.cpp" line="635"/>
+        <location filename="../src/store/tupscene.cpp" line="649"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
@@ -4782,7 +4945,7 @@
 <context>
     <name>TupSceneTabWidget</name>
     <message>
-        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="84"/>
+        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="77"/>
         <source>Layers</source>
         <translation>Слои</translation>
     </message>
@@ -4790,29 +4953,29 @@
 <context>
     <name>TupScenesWidget</name>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="69"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="57"/>
         <source>Scenes Manager</source>
         <translation>Менеджер сцен</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="101"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="94"/>
         <source>Filter here...</source>
         <translation>Отфильтровать здесь...</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="154"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="158"/>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="185"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="155"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="159"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="190"/>
         <source>Scene %1</source>
         <translation>Сцена %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="164"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="165"/>
         <source>Layer %1</source>
         <translation>Слой %1</translation>
     </message>
     <message>
-        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="167"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="168"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
@@ -4820,7 +4983,7 @@
 <context>
     <name>TupScreen</name>
     <message>
-        <location filename="../src/components/animation/tupscreen.cpp" line="421"/>
+        <location filename="../src/components/animation/tupscreen.cpp" line="482"/>
         <source>Rendering...</source>
         <translation>Отрисовка...</translation>
     </message>
@@ -4828,7 +4991,7 @@
 <context>
     <name>TupSplash</name>
     <message>
-        <location filename="../src/shell/tupsplash.cpp" line="55"/>
+        <location filename="../src/shell/tupsplash.cpp" line="53"/>
         <source>Version </source>
         <translation>Версия </translation>
     </message>
@@ -4836,137 +4999,137 @@
 <context>
     <name>TupStoryBoardDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="147"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="117"/>
         <source>Storyboard Settings</source>
         <translation>Установки раскадровки</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="158"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="128"/>
         <source>&amp;PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="159"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="129"/>
         <source>Export as PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="162"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="132"/>
         <source>&amp;HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="163"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="133"/>
         <source>Export as HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="167"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="137"/>
         <source>Close</source>
         <translation type="unfinished">Закрыть</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="146"/>
         <source>&amp;Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="232"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="202"/>
         <source>Storyboard General Information</source>
         <translation>Основная информация о раскадровке</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="299"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="269"/>
         <source>Title</source>
         <translation>Заголовок</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="242"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="212"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="247"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="217"/>
         <source>Summary</source>
         <translation>Аннотация</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="266"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
         <source>Topics</source>
         <translation>Темы</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="295"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="265"/>
         <source>Scene Information</source>
         <translation>Информация о сцене</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="304"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="274"/>
         <source>Duration</source>
         <translation>Продолжительность</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="309"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="279"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="344"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="364"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="314"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="334"/>
         <source>Cover</source>
         <translation>Обложка</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="358"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="441"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="328"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="411"/>
         <source>Storyboard</source>
         <translation>Раскадровка</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="390"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="360"/>
         <source>Scene</source>
         <translation>Сцена</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="404"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="374"/>
         <source>Scene No %1 - Information</source>
         <translation>Информация о сцене %1</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="559"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="570"/>
         <source>Choose a directory...</source>
         <translation>Выберите папку...</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="563"/>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="601"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
         <source>Storyboard exported successfully!</source>
         <translation>Раскадровка полностью экспортирована!</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>Save PDF file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="576"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
         <source>PDF file (*.pdf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="684"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="700"/>
         <source>PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="686"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="702"/>
         <source>Html</source>
         <translation type="unfinished">Html</translation>
     </message>
@@ -4974,27 +5137,27 @@
 <context>
     <name>TupSymbolEditor</name>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="85"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="74"/>
         <source>Symbol editor</source>
         <translation>Редактор символов</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="95"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="84"/>
         <source>Brushes</source>
         <translation>Кисти</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="98"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="87"/>
         <source>Selection</source>
         <translation>Выделение</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="101"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="90"/>
         <source>Fill</source>
         <translation>Заливка</translation>
     </message>
     <message>
-        <location filename="../src/components/library/tupsymboleditor.cpp" line="104"/>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="93"/>
         <source>View</source>
         <translation>Вид</translation>
     </message>
@@ -5002,138 +5165,138 @@
 <context>
     <name>TupThemeSelector</name>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="75"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="73"/>
         <source>General</source>
         <translation>Основное</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Base</source>
         <translation>Основа</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Foreground</source>
         <translation>Передний план</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="79"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
         <source>Background</source>
         <translation>Фон</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button</source>
         <translation>Кнопка</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="80"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
         <source>Button Text</source>
         <translation>Текст кнопки</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="103"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="101"/>
         <source>Effects</source>
         <translation>Эффекты</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Light</source>
         <translation>Светлый</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Midlight</source>
         <translation>Полусветлый</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Dark</source>
         <translation>Темный</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="107"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
         <source>Mid</source>
         <translation>Полутемный</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="129"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="127"/>
         <source>Selections</source>
         <translation>Выделения</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlight</source>
         <translation>Выделено</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="133"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
         <source>Highlighted Text</source>
         <translation>Выделенный текст</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="150"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="148"/>
         <source>Text effects</source>
         <translation>Текстовые эффекты</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Bright Text</source>
         <translation>Яркий текст</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link</source>
         <translation>Ссылка</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="153"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
         <source>Link Visited</source>
         <translation>Посещенная ссылка</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="171"/>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="169"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Schema</source>
         <translation>Схема</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Owner</source>
         <translation>Владелец</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="175"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="183"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="182"/>
         <source>Save schema</source>
         <translation>Сохранить схему</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="190"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="189"/>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="194"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="193"/>
         <source>Use this colors</source>
         <translation>Использовать эти цвета</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../src/libui/tupthemeselector.cpp" line="283"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
         <source>Please choose a theme name</source>
         <translation>Выберите имя темы</translation>
     </message>
@@ -5141,25 +5304,25 @@
 <context>
     <name>TupTimeLine</name>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="75"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="60"/>
         <source>Time Line</source>
         <translation>Временная шкала</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="461"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="471"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="543"/>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="549"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="476"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="486"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="558"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="564"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="538"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="553"/>
         <source>Layer %1</source>
         <translation>Слой %1</translation>
     </message>
     <message>
-        <location filename="../src/components/timeline/tuptimeline.cpp" line="598"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="613"/>
         <source>Scene %1</source>
         <translation>Сцена %1</translation>
     </message>
@@ -5167,8 +5330,8 @@
 <context>
     <name>TupToolStatus</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="52"/>
-        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="55"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="46"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="49"/>
         <source>Current Tool</source>
         <translation>Текущий инструмент</translation>
     </message>
@@ -5176,60 +5339,88 @@
 <context>
     <name>TupToolsDialog</name>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="66"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="59"/>
         <source>Pencil</source>
         <translation>Карандаш</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="74"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="67"/>
         <source>Ink</source>
         <translation>Перо</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="82"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="75"/>
         <source>Polyline</source>
         <translation>Полилиния</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="90"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="83"/>
         <source>Ellipse</source>
         <translation>Эллипс</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="98"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="91"/>
         <source>Rectangle</source>
         <translation>Прямоугольник</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="106"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="99"/>
         <source>Object Selection</source>
         <translation>Выделение объекта</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="115"/>
-        <source>Line Selection</source>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="108"/>
+        <source>Nodes Selection</source>
         <translation>Выделение линии</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="123"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="116"/>
         <source>Color Palette</source>
         <translation>Палитра</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="124"/>
         <source>Pen Size</source>
         <translation>Размер пера</translation>
     </message>
     <message>
-        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="139"/>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="132"/>
         <source>Opacity Value</source>
         <translation>Значение прозрачности</translation>
     </message>
 </context>
 <context>
+    <name>TupTwitter</name>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="270"/>
+        <source>Latest version</source>
+        <translation type="unfinished">Последняя версия</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="271"/>
+        <source>Revision</source>
+        <translation type="unfinished">Ревизия</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="272"/>
+        <source>Code Name</source>
+        <translation type="unfinished">Название кода</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="275"/>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="279"/>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TupTwitterWidget</name>
     <message>
-        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="52"/>
+        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="47"/>
         <source>News!</source>
         <translation>Новости!</translation>
     </message>
@@ -5237,32 +5428,32 @@
 <context>
     <name>TupViewColorCells</name>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="109"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="111"/>
         <source>Default Palette</source>
         <translation>Палитра по умолчанию</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="118"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="120"/>
         <source>Named Colors</source>
         <translation>Именованные цвета</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="125"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="127"/>
         <source>Custom Color Palette</source>
         <translation>Своя палитра</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="130"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="132"/>
         <source>Custom Gradient Palette</source>
         <translation>Своя палитра градиентов</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="342"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="373"/>
         <source>Add Color</source>
         <translation>Добавить цвет</translation>
     </message>
     <message>
-        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="349"/>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="380"/>
         <source>Remove Color</source>
         <translation>Удалить цвет</translation>
     </message>
@@ -5270,88 +5461,40 @@
 <context>
     <name>TupWebHunter</name>
     <message>
-        <location filename="../src/libbase/tupwebhunter.cpp" line="108"/>
+        <location filename="../src/libbase/tupwebhunter.cpp" line="101"/>
         <source>Information Temporarily Unavailable</source>
         <translation>Информация временно недоступна</translation>
     </message>
 </context>
 <context>
-    <name>Tupwitter</name>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Latest version</source>
-        <translation>Последняя версия</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Revision</source>
-        <translation>Ревизия</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="330"/>
-        <source>Code Name</source>
-        <translation>Название кода</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="333"/>
-        <source>Update here!</source>
-        <translation>Обновить здесь!</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="341"/>
-        <source>This is what&apos;s happening</source>
-        <translation>Это то, что происходит</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="356"/>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="357"/>
-        <source>Description</source>
-        <translation>Описание</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="358"/>
-        <source>Website</source>
-        <translation>Website</translation>
-    </message>
-    <message>
-        <location filename="../src/components/twitter/tuptwitter.cpp" line="359"/>
-        <source>Followers</source>
-        <translation>Последователи</translation>
-    </message>
-</context>
-<context>
     <name>TweenManager</name>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="66"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="56"/>
         <source>Create a new Tween</source>
         <translation>Создать Новую анимацию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="141"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
         <source>Tween name already exists!</source>
         <translation>Анимация с таким именем уже существует!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="189"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="179"/>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="191"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="181"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="194"/>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="184"/>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
@@ -5359,161 +5502,161 @@
 <context>
     <name>Tweener</name>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="130"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="260"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="264"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="101"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="239"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="243"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="527"/>
         <source>Coloring Tween</source>
         <translation>Анимация цвета</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="178"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
         <source>Coloring Tween can&apos;t be applied to raster images</source>
         <translation>Анимация цвета не может быть применена к растровым изображениям</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="185"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
         <source>Coloring Tween can&apos;t be applied to SVG files</source>
         <translation>Анимация цвета не может быть применена к SVG файлам</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="262"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="241"/>
         <source>Shift+C</source>
         <translation>Shift+C</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="424"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="467"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="378"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="530"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="420"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="420"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
         <source>Tween name is missing!</source>
         <translation>Название анимации отсутствует!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="528"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="614"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="481"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="647"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="526"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="525"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="505"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="619"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="480"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="654"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="523"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="540"/>
         <source>Frame %1</source>
         <translation>Кадр %1</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/coloringtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="630"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="492"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="658"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="537"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
         <source>Tween %1 applied!</source>
         <translation>Анимация %1 применена!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="156"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="373"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="377"/>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="759"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="144"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="379"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="383"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="758"/>
         <source>Compound Tween</source>
         <translation>Комбинированная анимация</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweener.cpp" line="375"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="381"/>
         <source>Shift+X</source>
         <translation>Shift+X</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="126"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="227"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="231"/>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="503"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="117"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="230"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="502"/>
         <source>Opacity Tween</source>
         <translation>Анимация прозрачности</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/opacitytool/tweener.cpp" line="229"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="228"/>
         <source>Shift+O</source>
         <translation>Shift+O</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="169"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="358"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="362"/>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="752"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="161"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="359"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="363"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="768"/>
         <source>Position Tween</source>
         <translation>Анимация положения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/positiontool/tweener.cpp" line="360"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="361"/>
         <source>Shift+W</source>
         <translation>Shift+W</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="140"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="253"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="257"/>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="134"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="257"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="261"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="555"/>
         <source>Rotation Tween</source>
         <translation>Анимация вращения</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/rotationtool/tweener.cpp" line="255"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="259"/>
         <source>Shift+R</source>
         <translation>Shift+R</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="548"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="250"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="546"/>
         <source>Scale Tween</source>
         <translation>Анимация масштабирования</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/scaletool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="252"/>
         <source>Shift+S</source>
         <translation>Shift+S</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="139"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="252"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="256"/>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="555"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="133"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="256"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="260"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="562"/>
         <source>Shear Tween</source>
         <translation>Анимация сдвига</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/sheartool/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="258"/>
         <source>Shift+H</source>
         <translation>Shift+H</translation>
     </message>
@@ -5521,88 +5664,88 @@
 <context>
     <name>TweenerPanel</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="92"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="84"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="127"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="119"/>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="128"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="120"/>
         <source>Select object</source>
         <translation>Выделение объекта</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="129"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="121"/>
         <source>Set Tweeners</source>
         <translation>Установка методов анимации</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="153"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="145"/>
         <source>Tweeners</source>
         <translation>Методы анимации</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Position</source>
         <translation>Позиция</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Rotation</source>
         <translation>Вращение</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Scale</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Shear</source>
         <translation>Сдвиг</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Opacity</source>
         <translation>Прозрачность</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="218"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
         <source>Coloring</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="283"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="275"/>
         <source>Save Tween</source>
         <translation>Сохранить анимацию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="285"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="277"/>
         <source>Cancel Tween</source>
         <translation>Отменить анимацию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="377"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="369"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="335"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
         <source>Select objects for Tweening first!</source>
         <translation>Сначала выделите объекты для анимации!</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="429"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="421"/>
         <source>Update Tween</source>
         <translation>Обновить анимацию</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenerpanel.cpp" line="431"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="423"/>
         <source>Close Tween properties</source>
         <translation>Закрыть свойства анимации</translation>
     </message>
@@ -5610,32 +5753,32 @@
 <context>
     <name>TweenerTable</name>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Position</source>
         <translation>Позиция</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Rotation</source>
         <translation>Вращение</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Scale</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Shear</source>
         <translation>Сдвиг</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Opacity</source>
         <translation>Прозрачность</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/compoundtool/tweenertable.cpp" line="57"/>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
         <source>Coloring</source>
         <translation>Цвет</translation>
     </message>
@@ -5643,49 +5786,49 @@
 <context>
     <name>VideoProperties</name>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="848"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="877"/>
         <source>Set Animation Properties</source>
         <translation>Установить свойства анимации</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="860"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="889"/>
         <source>Title</source>
         <translation>Заголовок</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="861"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="890"/>
         <source>My Video</source>
         <translation>Мое видео</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="866"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="895"/>
         <source>Topics</source>
         <translation>Темы</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="867"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="896"/>
         <source>#topic1 #topic2 #topic3</source>
         <translation>#тема1 #тема2 #тема3</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="872"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="901"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="878"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="907"/>
         <source>Just a little taste of my style :)</source>
         <translation>Просто немного о моем стиле :)</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="939"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="959"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="968"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="988"/>
         <source>Set a title for the picture here!</source>
         <translation>Здесь установите заголовок для изображения!</translation>
     </message>
     <message>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="946"/>
-        <location filename="../src/components/export/tupexportwidget.cpp" line="970"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="975"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="999"/>
         <source>Set some topic tags for the picture here!</source>
         <translation>Здесь установите тематические теги для изображения!</translation>
     </message>
@@ -5693,53 +5836,52 @@
 <context>
     <name>ViewTool</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="100"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="105"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="149"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="250"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="271"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="340"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="103"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="145"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="241"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="263"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="336"/>
         <source>Zoom In</source>
         <translation>Приблизить</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="107"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="112"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="141"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="215"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="254"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="273"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="342"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="110"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="245"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="338"/>
         <source>Zoom Out</source>
         <translation>Отдалить</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="95"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="114"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="119"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="147"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="189"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="308"/>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="338"/>
-        <source>Hand</source>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="96"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="143"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="184"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="288"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="304"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="334"/>
+        <source>Shift</source>
         <translation>Рука</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="104"/>
         <source>Z</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="111"/>
         <source>Shift+Z</source>
         <translation>Shift+Z</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="97"/>
         <source>H</source>
         <translation>H</translation>
     </message>
@@ -5747,22 +5889,22 @@
 <context>
     <name>ZoomConfigurator</name>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="56"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="54"/>
         <source>Scale Factor</source>
         <translation>Коэффициент масштабирования</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="69"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="67"/>
         <source>Tips</source>
         <translation>Подсказки</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Zoom Square mode</source>
         <translation>Режим масштабирования</translation>
     </message>
     <message>
-        <location filename="../src/plugins/tools/viewtool/zoomconfigurator.cpp" line="76"/>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
         <source>Press Ctrl key + Mouse left button</source>
         <translation>Нажмите Ctrl клавишу + левую клавишу мыши</translation>
     </message>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/shell/data/translations/tupi_uk.qm and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/shell/data/translations/tupi_uk.qm differ
diff -Nru tupi-0.2+git04/src/shell/data/translations/tupi_uk.ts tupi-0.2+git05/src/shell/data/translations/tupi_uk.ts
--- tupi-0.2+git04/src/shell/data/translations/tupi_uk.ts	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/translations/tupi_uk.ts	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,5912 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="uk_UA">
+<context>
+    <name>ButtonsPanel</name>
+    <message>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="41"/>
+        <source>Edit Tween</source>
+        <translation>Змінити анімацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/buttonspanel.cpp" line="45"/>
+        <source>Remove Tween</source>
+        <translation>Вилучити анімацію</translation>
+    </message>
+</context>
+<context>
+    <name>Configurator</name>
+    <message>
+        <location filename="../src/plugins/tools/color/configurator.cpp" line="66"/>
+        <source>Coloring Tween</source>
+        <translation>Анімація розфарбовування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/configurator.cpp" line="71"/>
+        <source>Compound Tween</source>
+        <translation>Комбінована анімація</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="58"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="52"/>
+        <source>Parameters</source>
+        <translation>Параметри</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="80"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="72"/>
+        <source>Dot Spacing</source>
+        <translation>Інтервали між крапками</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="96"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="88"/>
+        <source>Size Tolerance</source>
+        <translation>Допустиме відхилення за розміром</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/configurator.cpp" line="121"/>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="112"/>
+        <source>Smoothness</source>
+        <translation>Плавність</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/configurator.cpp" line="70"/>
+        <source>Opacity Tween</source>
+        <translation>Анімація зміни прозорості</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/position/configurator.cpp" line="80"/>
+        <source>Position Tween</source>
+        <translation>Анімація розташовування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/configurator.cpp" line="70"/>
+        <location filename="../src/plugins/tools/rotation/configurator.cpp" line="70"/>
+        <source>Rotation Tween</source>
+        <translation>Анімація обертання</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/configurator.cpp" line="70"/>
+        <source>Scale Tween</source>
+        <translation>Анімація масштабування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="48"/>
+        <source>This tool is just a &lt;b&gt;proof-of-concept&lt;/b&gt; of the basic algorithm for the Tupi&apos;s free-tracing vectorial brushes</source>
+        <translation>Цей інструмент є лише &lt;b&gt;демонстрацією&lt;/b&gt; базового алгоритму для векторних пензлів з довільним трасуванням у Tupi</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="58"/>
+        <source>Structure</source>
+        <translation>Структура</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="63"/>
+        <source>Basic</source>
+        <translation>Базовий</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="64"/>
+        <source>Axial</source>
+        <translation>Осьовий</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="65"/>
+        <source>Organic</source>
+        <translation>Органічний</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/configurator.cpp" line="104"/>
+        <source>Run simulation</source>
+        <translation>Почати імітацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/shear/configurator.cpp" line="70"/>
+        <source>Shear Tween</source>
+        <translation>Анімація перекошування</translation>
+    </message>
+</context>
+<context>
+    <name>EraserTool</name>
+    <message>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="49"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="54"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="58"/>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="79"/>
+        <source>Eraser</source>
+        <translation>Гумка</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/eraser/erasertool.cpp" line="55"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+</context>
+<context>
+    <name>ExportTo</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="459"/>
+        <source>Enable background transparency</source>
+        <translation>Увімкнути прозорість тла</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="469"/>
+        <source>Image name prefix: </source>
+        <translation>Префікс назв зображень: </translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="474"/>
+        <source>Directory: </source>
+        <translation>Каталог: </translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="477"/>
+        <source>File: </source>
+        <translation>Файл: </translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="516"/>
+        <source>i.e. &lt;B&gt;%1&lt;/B&gt;01.png / &lt;B&gt;%1&lt;/B&gt;01.jpg</source>
+        <translation>тобто &lt;B&gt;%1&lt;/B&gt;01.png / &lt;B&gt;%1&lt;/B&gt;01.jpg</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="530"/>
+        <source>Size</source>
+        <translation>Розмір</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="541"/>
+        <source>Configuration</source>
+        <translation>Налаштування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="555"/>
+        <source>FPS</source>
+        <translation>Частота кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="649"/>
+        <source>Choose a file name...</source>
+        <translation>Вибрати назву файла…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="663"/>
+        <source>Choose a directory...</source>
+        <translation>Вибрати каталог…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="698"/>
+        <source>Images name prefix can&apos;t be empty! Please, type a prefix.</source>
+        <translation>Префікс назв зображень не може бути порожнім! Будь ласка, вкажіть префікс.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="711"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="752"/>
+        <source>Directory doesn&apos;t exist! Please, choose another path.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="741"/>
+        <source>Warning!</source>
+        <translation>Попередження!</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="742"/>
+        <source>File exists. Overwrite it?</source>
+        <translation>Файл вже існує. Перезаписати його?</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="767"/>
+        <source>You have no permission to create this file. Please, choose another path.</source>
+        <translation>У вас немає прав доступу до створення цього файла. Будь ласка, виберіть для нього інший каталог.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="818"/>
+        <source>Format problem. Tupi Internal error.</source>
+        <translation>Проблема з форматуванням. Внутрішня помилка Tupi.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="825"/>
+        <source>Information</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="829"/>
+        <source>ERROR!</source>
+        <translation>ПОМИЛКА!</translation>
+    </message>
+</context>
+<context>
+    <name>FillTool</name>
+    <message>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="80"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="84"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="177"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="278"/>
+        <source>Internal fill</source>
+        <translation>Внутрішнє заповнення</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="75"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="86"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="90"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="179"/>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="280"/>
+        <source>Line fill</source>
+        <translation>Заповнення лінії</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="81"/>
+        <source>I</source>
+        <translation>I</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/fill/filltool.cpp" line="87"/>
+        <source>B</source>
+        <translation>B</translation>
+    </message>
+</context>
+<context>
+    <name>GeometricTool</name>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="113"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="118"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="149"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="209"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="222"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="285"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="308"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="339"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="386"/>
+        <source>Rectangle</source>
+        <translation>Прямокутник</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="120"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="125"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="207"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="311"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="341"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="388"/>
+        <source>Ellipse</source>
+        <translation>Еліпс</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="82"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="132"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="163"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="315"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="390"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="460"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="467"/>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="474"/>
+        <source>Line</source>
+        <translation>Пряма</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="114"/>
+        <source>R</source>
+        <translation>R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="121"/>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/geometrictool.cpp" line="128"/>
+        <source>L</source>
+        <translation>О</translation>
+    </message>
+</context>
+<context>
+    <name>ImagePlugin</name>
+    <message>
+        <location filename="../src/plugins/export/imageplugin/imageplugin.cpp" line="48"/>
+        <source>Image Array</source>
+        <translation type="unfinished">Масив зображень</translation>
+    </message>
+</context>
+<context>
+    <name>InfoPanel</name>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="43"/>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="51"/>
+        <source>Tips</source>
+        <translation>Підказки</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Close the line path</source>
+        <translation>Замкнути контур</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="55"/>
+        <source>Mouse Right Click</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
+        <source>Shift</source>
+        <translation>Shift</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="56"/>
+        <source>Align line to horizontal/vertical axis</source>
+        <translation>Вирівняти лінію за горизонтальною або вертикальною віссю</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
+        <source>Shift + Left Mouse Button</source>
+        <translation>Shift + ліва кнопка миші</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/geometric/infopanel.cpp" line="58"/>
+        <source>Set width/height proportional dimensions</source>
+        <translation>Встановити пропорційні виміри за шириною-висотою</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
+        <source>Close line</source>
+        <translation>Замкнена лінія</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/polyline/infopanel.cpp" line="59"/>
+        <source>X key or Right mouse button</source>
+        <translation>Клавіша X або права кнопка миші</translation>
+    </message>
+</context>
+<context>
+    <name>InkTool</name>
+    <message>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="127"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="605"/>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="609"/>
+        <source>Ink</source>
+        <translation>Чорнило</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/ink/inktool.cpp" line="606"/>
+        <source>K</source>
+        <translation>K</translation>
+    </message>
+</context>
+<context>
+    <name>KinasWidget</name>
+    <message>
+        <location filename="../src/components/kinas/kinaswidget.cpp" line="42"/>
+        <source>Tupi Script</source>
+        <translation>скрипт Tupi</translation>
+    </message>
+</context>
+<context>
+    <name>NodesTool</name>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="88"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="351"/>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="354"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Позначення лінії</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/nodes/nodestool.cpp" line="352"/>
+        <source>N</source>
+        <translation type="unfinished">N</translation>
+    </message>
+</context>
+<context>
+    <name>PapagayoTool</name>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="134"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="257"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="261"/>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="555"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="259"/>
+        <source>Shift+R</source>
+        <translation type="unfinished">Shift+R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Error</source>
+        <translation type="unfinished">Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="427"/>
+        <source>Tween name is missing!</source>
+        <translation type="unfinished">Не вказано назви анімації!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="533"/>
+        <source>Frame %1</source>
+        <translation type="unfinished">Кадр %1</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Info</source>
+        <translation type="unfinished">Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/papagayotool.cpp" line="544"/>
+        <source>Tween %1 applied!</source>
+        <translation type="unfinished">Застосовано анімацію %1!</translation>
+    </message>
+</context>
+<context>
+    <name>PencilTool</name>
+    <message>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="78"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="83"/>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="129"/>
+        <source>Pencil</source>
+        <translation>Олівець</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/pencil/penciltool.cpp" line="79"/>
+        <source>P</source>
+        <translation>P</translation>
+    </message>
+</context>
+<context>
+    <name>PolyLineTool</name>
+    <message>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="93"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="97"/>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="122"/>
+        <source>PolyLine</source>
+        <translation type="unfinished">Ламана</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/polyline/polylinetool.cpp" line="94"/>
+        <source>S</source>
+        <translation type="unfinished">S</translation>
+    </message>
+</context>
+<context>
+    <name>PositionSettings</name>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="68"/>
+        <source>Component</source>
+        <translation>Компонент</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="71"/>
+        <source>Position</source>
+        <translation>Розташування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="82"/>
+        <source>Starting at frame</source>
+        <translation>Початок на кадрі</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="109"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="202"/>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="233"/>
+        <source>Frames Total</source>
+        <translation>Загальна кількість кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="154"/>
+        <source>Cancel Tween</source>
+        <translation>Скасувати анімацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
+        <source>Info</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="216"/>
+        <source>You must define a path for this Tween!</source>
+        <translation>Для цієї анімації слід визначити контур!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="225"/>
+        <source>Position Tween is set!</source>
+        <translation>Встановлено анімацію з розташовування!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/positionsettings.cpp" line="250"/>
+        <source>Close Tween properties</source>
+        <translation>Властивості замикання анімації</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="229"/>
+        <source>Information</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="235"/>
+        <source>Warning</source>
+        <translation>Попередження</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="241"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tcore/tdebug.cpp" line="247"/>
+        <source>Critical</source>
+        <translation>Критична</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="535"/>
+        <source>Wall from</source>
+        <translation>Стіна</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="51"/>
+        <source>Fatal Error</source>
+        <translation>Критична помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="52"/>
+        <source>Well, Tupi has crashed...</source>
+        <translation>Оце тобі, програма Tupi завершила роботу у аварійному режимі…</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="53"/>
+        <source>Close</source>
+        <translation>Завершити роботу</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="54"/>
+        <source>Re-launch Tupi</source>
+        <translation>Перезапустити Tupi</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashhandler.cpp" line="55"/>
+        <source>This is a general failure</source>
+        <translation>Це критична помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="159"/>
+        <source>add</source>
+        <translation>додати</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="164"/>
+        <source>remove</source>
+        <translation>вилучити</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="169"/>
+        <source>move</source>
+        <translation>пересунути</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="174"/>
+        <source>lock</source>
+        <translation>заблокувати</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="179"/>
+        <source>rename</source>
+        <translation>перейменувати</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="184"/>
+        <source>select</source>
+        <translation>позначити</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="189"/>
+        <source>edit node</source>
+        <translation>редагувати вузол</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="194"/>
+        <source>view</source>
+        <translation>перегляд</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="199"/>
+        <source>transform</source>
+        <translation>перетворення</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectcommand.cpp" line="204"/>
+        <source>convert</source>
+        <translation>перетворити</translation>
+    </message>
+</context>
+<context>
+    <name>SchemeTool</name>
+    <message>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="682"/>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="686"/>
+        <source>Scheme</source>
+        <translation>Схема</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scheme/schemetool.cpp" line="683"/>
+        <source>M</source>
+        <translation>M</translation>
+    </message>
+</context>
+<context>
+    <name>SelectPlugin</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="77"/>
+        <source>Select plugin</source>
+        <translation>Виберіть додаток</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="142"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="208"/>
+        <source>WEBM Video</source>
+        <translation>відео WebM</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="147"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="211"/>
+        <source>OGV Video</source>
+        <translation>відео OGV</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="152"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="214"/>
+        <source>MPEG Video</source>
+        <translation>відео MPEG</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="157"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="217"/>
+        <source>Macromedia flash</source>
+        <translation>Macromedia flash</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="162"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="220"/>
+        <source>AVI Video</source>
+        <translation>відео AVI</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="167"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="226"/>
+        <source>ASF Video</source>
+        <translation>відео ASF</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="172"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="229"/>
+        <source>QuickTime Video</source>
+        <translation>відео QuickTime</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="185"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="235"/>
+        <source>PNG Image Array</source>
+        <translation>масив зображень PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="190"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="238"/>
+        <source>JPEG Image Array</source>
+        <translation>масив зображень JPEG</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="195"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="241"/>
+        <source>Animated PNG (APNG)</source>
+        <translation>анімований PNG (APNG)</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="201"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="244"/>
+        <source>SMIL</source>
+        <translation>SMIL</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="223"/>
+        <source>RealMedia Video</source>
+        <translation>відео RealMedia</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="232"/>
+        <source>Gif Image</source>
+        <translation>зображення GIF</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="259"/>
+        <source>Animated Image</source>
+        <translation>Анімоване зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="261"/>
+        <source>Image Array</source>
+        <translation>Масив зображень</translation>
+    </message>
+</context>
+<context>
+    <name>SelectScenes</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="304"/>
+        <source>Select Scenes</source>
+        <translation>Виберіть сцени</translation>
+    </message>
+</context>
+<context>
+    <name>SelectionTool</name>
+    <message>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="161"/>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="369"/>
+        <source>Selection</source>
+        <translation type="unfinished">Позначення</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="366"/>
+        <source>Object Selection</source>
+        <translation type="unfinished">Позначення об’єктів</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/selectiontool.cpp" line="367"/>
+        <source>O</source>
+        <translation type="unfinished">O</translation>
+    </message>
+</context>
+<context>
+    <name>Settings</name>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="81"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="85"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="72"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="87"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="88"/>
+        <source>Name</source>
+        <translation>Назва</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="91"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="95"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="82"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="102"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="98"/>
+        <source>Options</source>
+        <translation>Параметри</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="92"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="96"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="83"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="103"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="98"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="99"/>
+        <source>Select object</source>
+        <translation>Позначити об’єкт</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="93"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="97"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="84"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="104"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="99"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="100"/>
+        <source>Set Properties</source>
+        <translation>Встановити властивості</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="133"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="137"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="124"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="144"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="140"/>
+        <source>Starting at frame</source>
+        <translation>Початок на кадрі</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="141"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="145"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="152"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="147"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="148"/>
+        <source>Ending at frame</source>
+        <translation>Завершити на кадрі</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="565"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="168"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="516"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="139"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="175"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="200"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="176"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="687"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="170"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="538"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="171"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="544"/>
+        <source>Frames Total</source>
+        <translation>Загальна кількість кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="174"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="190"/>
+        <source>White</source>
+        <translation>Білий</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="179"/>
+        <source>Initial Color</source>
+        <translation>Початковий колір</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="195"/>
+        <source>Ending Color</source>
+        <translation>Завершальний колір</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="208"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="212"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="211"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="212"/>
+        <source>Iterations</source>
+        <translation>Кількість ітерацій</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="217"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="221"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="329"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="220"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="221"/>
+        <source>Loop</source>
+        <translation>Цикл</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="230"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="338"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="229"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="230"/>
+        <source>Loop with Reverse</source>
+        <translation>Цикл з обертанням</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="273"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="277"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="178"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="375"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="279"/>
+        <source>Save Tween</source>
+        <translation>Зберегти анімацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="275"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="279"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="377"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="281"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="281"/>
+        <source>Cancel Tween</source>
+        <translation>Скасувати анімацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="343"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="333"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="451"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="347"/>
+        <source>Update Tween</source>
+        <translation>Оновити анімацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="347"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="345"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="335"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="453"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="349"/>
+        <source>Close Tween properties</source>
+        <translation>Властивості замикання анімації</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
+        <source>Info</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="353"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="351"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="312"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="459"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="359"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="355"/>
+        <source>You must select at least one object!</source>
+        <translation>Вам слід позначити принаймні один об’єкт!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="358"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="356"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="473"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="364"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="360"/>
+        <source>You must set Tween properties first!</source>
+        <translation>Спочатку слід визначити властивості анімації!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/settings.cpp" line="414"/>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="399"/>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="248"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="524"/>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="407"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="403"/>
+        <source>Select objects for Tweening first!</source>
+        <translation>Для анімування спочатку позначте об’єкти!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="183"/>
+        <source>Initial Opacity</source>
+        <translation>Початкова непрозорість</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/settings.cpp" line="199"/>
+        <source>Ending Opacity</source>
+        <translation>Кінцева непрозорість</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/position/settings.cpp" line="317"/>
+        <source>You must define a path for this Tween!</source>
+        <translation>Для цієї анімації слід визначити контур!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="185"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="185"/>
+        <source>Continuous</source>
+        <translation>Неперервно</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="186"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="186"/>
+        <source>Partial</source>
+        <translation>Частково</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="190"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="190"/>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="199"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="199"/>
+        <source>Speed (Degrees/Frame)</source>
+        <translation>Швидкість (у градусах на кадр)</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="265"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="265"/>
+        <source>Direction</source>
+        <translation>Напрямок</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="269"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="269"/>
+        <source>Clockwise</source>
+        <translation>За годинниковою стрілкою</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="270"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="270"/>
+        <source>Counterclockwise</source>
+        <translation>Проти годинникової стрілки</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="294"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="294"/>
+        <source>Degrees Range</source>
+        <translation>Діапазон у градусах</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="297"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="297"/>
+        <source>Start at</source>
+        <translation>Почати з</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/papagayo/settings.cpp" line="313"/>
+        <location filename="../src/plugins/tools/rotation/settings.cpp" line="313"/>
+        <source>Finish at</source>
+        <translation>Завершити у</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="179"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="180"/>
+        <source>Width &amp; Height</source>
+        <translation>Ширина і висота</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="180"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="181"/>
+        <source>Only Width</source>
+        <translation>Лише ширина</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="181"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="182"/>
+        <source>Only Height</source>
+        <translation>Лише висота</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="182"/>
+        <source>Scale in</source>
+        <translation>Масштабування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/settings.cpp" line="198"/>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="199"/>
+        <source>Scaling Factor</source>
+        <translation>Коефіцієнт масштабування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/shear/settings.cpp" line="183"/>
+        <source>Shear in</source>
+        <translation>Перекошування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/pencil/settings.cpp" line="53"/>
+        <source>Smoothness</source>
+        <translation type="unfinished">Плавність</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="59"/>
+        <source>Flips</source>
+        <translation type="unfinished">Віддзеркалення</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="70"/>
+        <source>Horizontal Flip</source>
+        <translation type="unfinished">Віддзеркалити горизонтально</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="73"/>
+        <source>Vertical Flip</source>
+        <translation type="unfinished">Віддзеркалити вертикально</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="76"/>
+        <source>Crossed Flip</source>
+        <translation type="unfinished">Перехресне віддзеркалення</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="89"/>
+        <source>Order</source>
+        <translation type="unfinished">Порядок</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="99"/>
+        <source>Send object to back</source>
+        <translation type="unfinished">Пересунути об’єкт нижче</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="102"/>
+        <source>Send object to back one level</source>
+        <translation type="unfinished">Пересунути об’єкт на один рівень нижче</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="105"/>
+        <source>Send object to front</source>
+        <translation type="unfinished">Пересунути об’єкт вище</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="108"/>
+        <source>Send object to front one level</source>
+        <translation type="unfinished">Пересунути об’єкт на рівень вище</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="124"/>
+        <source>Position</source>
+        <translation type="unfinished">Розташування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="150"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="229"/>
+        <source>Show Tips</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="151"/>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="230"/>
+        <source>A little help for the Selection tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
+        <source>Rotation mode</source>
+        <translation type="unfinished">Режим обертання</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="166"/>
+        <source>Double click on any node or shortcut Alt + R</source>
+        <translation type="unfinished">Двічі клацніть на будь-якому вузлі або скористайтеся скороченням Alt + R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
+        <source>Arrows</source>
+        <translation type="unfinished">Клавіші зі стрілками</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="167"/>
+        <source>Movement on selection</source>
+        <translation type="unfinished">Рух позначеного</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
+        <source>Shift + Arrows</source>
+        <translation type="unfinished">Shift + стрілки</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="168"/>
+        <source>Slow movement on selection</source>
+        <translation type="unfinished">Повільний рух позначеного</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
+        <source>Ctrl + Arrows</source>
+        <translation type="unfinished">Ctrl + клавіші зі стрілками</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="169"/>
+        <source>Fast movement on selection</source>
+        <translation type="unfinished">Швидкий рух позначеного</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
+        <source>Shift + Left Mouse Button</source>
+        <translation type="unfinished">Shift + ліва кнопка миші</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="170"/>
+        <source>Proportional scaling on selection</source>
+        <translation type="unfinished">Пропорційне масштабування позначеного</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="224"/>
+        <source>Show Tools</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/selection/settings.cpp" line="225"/>
+        <source>Options panel for the Selection tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SpinControl</name>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="221"/>
+        <source>Radius</source>
+        <translation>Радіус</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.h" line="230"/>
+        <source>Angle</source>
+        <translation>Кут</translation>
+    </message>
+</context>
+<context>
+    <name>StepsViewer</name>
+    <message>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
+        <source>Interval</source>
+        <translation>Інтервал</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/stepsviewer.cpp" line="56"/>
+        <source>Frames</source>
+        <translation>Кадри</translation>
+    </message>
+</context>
+<context>
+    <name>TButtonBar</name>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="47"/>
+        <source>Left button bar</source>
+        <translation>Панель кнопок ліворуч</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="52"/>
+        <source>Right button bar</source>
+        <translation>Панель кнопок праворуч</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="57"/>
+        <source>Bottom button bar</source>
+        <translation>Панель кнопок внизу</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="62"/>
+        <source>Top button bar</source>
+        <translation>Панель кнопок згори</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="88"/>
+        <source>Only icons</source>
+        <translation>Лише піктограми</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="91"/>
+        <source>Only texts</source>
+        <translation>Лише текстові фрагменти</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="96"/>
+        <source>Exclusive space</source>
+        <translation>Ексклюзивний простір</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tbuttonbar.cpp" line="103"/>
+        <source>Auto hide</source>
+        <translation>Автоматично ховати</translation>
+    </message>
+</context>
+<context>
+    <name>TCommandHistory</name>
+    <message>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="41"/>
+        <source>Undo</source>
+        <translation>Вернути</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tcommandhistory.cpp" line="42"/>
+        <source>Redo</source>
+        <translation>Повторити</translation>
+    </message>
+</context>
+<context>
+    <name>TFontChooser</name>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="45"/>
+        <source>Family</source>
+        <translation>Гарнітура</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="49"/>
+        <source>Style</source>
+        <translation>Стиль</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="53"/>
+        <source>Size</source>
+        <translation>Розмір</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="73"/>
+        <source>Normal</source>
+        <translation>Звичайний</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="74"/>
+        <source>Italic</source>
+        <translation>Курсив</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tfontchooser.cpp" line="75"/>
+        <source>Oblique</source>
+        <translation>Нахилений</translation>
+    </message>
+</context>
+<context>
+    <name>TOptionalDialog</name>
+    <message>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="56"/>
+        <source>Don&apos;t show again</source>
+        <translation>Більше не показувати</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="59"/>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/toptionaldialog.cpp" line="63"/>
+        <source>Accept</source>
+        <translation>Прийняти</translation>
+    </message>
+</context>
+<context>
+    <name>TRulerBase</name>
+    <message>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="102"/>
+        <source>Change scale to 5...</source>
+        <translation>Змінити масштаб на 5…</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/trulerbase.cpp" line="103"/>
+        <source>Change scale to 10...</source>
+        <translation>Змінити масштаб на 10…</translation>
+    </message>
+</context>
+<context>
+    <name>TViewButton</name>
+    <message>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="265"/>
+        <source>Menu</source>
+        <translation>Меню</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="266"/>
+        <source>Only icon</source>
+        <translation>Лише піктограма</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="267"/>
+        <source>Only text</source>
+        <translation>Лише текст</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tviewbutton.cpp" line="270"/>
+        <source>Mouse sensibility</source>
+        <translation>Чутливість миші</translation>
+    </message>
+</context>
+<context>
+    <name>TWizard</name>
+    <message>
+        <location filename="../src/framework/tgui/twizard.cpp" line="40"/>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/twizard.cpp" line="41"/>
+        <source>&lt; &amp;Back</source>
+        <translation>&lt; &amp;Назад</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/twizard.cpp" line="42"/>
+        <source>Next &gt;</source>
+        <translation>Далі &gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/twizard.cpp" line="43"/>
+        <source>&amp;Finish</source>
+        <translation>&amp;Замкнути</translation>
+    </message>
+</context>
+<context>
+    <name>TabDialog</name>
+    <message>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="89"/>
+        <source>Help</source>
+        <translation>Довідка</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="96"/>
+        <source>Apply</source>
+        <translation>Застосувати</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="103"/>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/tabdialog.cpp" line="110"/>
+        <source>OK</source>
+        <translation>Гаразд</translation>
+    </message>
+</context>
+<context>
+    <name>TextConfigurator</name>
+    <message>
+        <location filename="../src/plugins/tools/text/textconfigurator.cpp" line="49"/>
+        <source>Html</source>
+        <translation>HTML</translation>
+    </message>
+</context>
+<context>
+    <name>TextTool</name>
+    <message>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="57"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="156"/>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="160"/>
+        <source>Text</source>
+        <translation>Текст</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/text/texttool.cpp" line="157"/>
+        <source>T</source>
+        <translation>T</translation>
+    </message>
+</context>
+<context>
+    <name>TreeWidgetSearchLine</name>
+    <message>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="63"/>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="78"/>
+        <source>Search</source>
+        <translation>Пошук</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="266"/>
+        <source>Search Columns</source>
+        <translation>Стовпчики для пошуку</translation>
+    </message>
+    <message>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="268"/>
+        <source>All Visible Columns</source>
+        <translation>Всі видимі стовпчики</translation>
+    </message>
+</context>
+<context>
+    <name>TreeWidgetSearchLineWidget</name>
+    <message>
+        <location filename="../src/framework/tgui/treewidgetsearchline.cpp" line="564"/>
+        <source>Clear</source>
+        <translation>Спорожнити</translation>
+    </message>
+</context>
+<context>
+    <name>TupAbout</name>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="152"/>
+        <source>About</source>
+        <translation>Про програму</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="115"/>
+        <source>Credits</source>
+        <translation>Подяки</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="48"/>
+        <source>About Tupi</source>
+        <translation type="unfinished">Про Tupi</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="136"/>
+        <source>Thanks</source>
+        <translation>Подяки</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="167"/>
+        <source>License Agreement</source>
+        <translation>Ліцензійна угода</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupabout.cpp" line="168"/>
+        <source>Close</source>
+        <translation>Закрити</translation>
+    </message>
+</context>
+<context>
+    <name>TupBasicCameraInterface</name>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
+        <source>Tupi Camera Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="61"/>
+        <source>Current resolution:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="122"/>
+        <source>Cameras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="124"/>
+        <source>Camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="130"/>
+        <source>Take picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="147"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
+        <source>Error</source>
+        <translation type="unfinished">Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupbasiccamerainterface.cpp" line="219"/>
+        <source>Can&apos;t create pictures directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraBar</name>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="59"/>
+        <source>Rewind</source>
+        <translation>Перемотати до початку</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="64"/>
+        <source>Play in reverse</source>
+        <translation>Відтворити у зворотному порядку</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="69"/>
+        <source>Play</source>
+        <translation>Відтворити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="74"/>
+        <source>Stop</source>
+        <translation>Зупинити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerabar.cpp" line="79"/>
+        <source>Forward</source>
+        <translation>Вперед</translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="56"/>
+        <source>Camera Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="72"/>
+        <source>Available Camera Devices:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="77"/>
+        <source>Camera Detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="89"/>
+        <source>Available Camera Resolutions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="101"/>
+        <source>Resize my project to fit camera resolution</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="104"/>
+        <source>Use the basic camera interface (low resources)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="110"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Скасувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcameradialog.cpp" line="114"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraInterface</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
+        <source>Tupi Camera Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="63"/>
+        <source>Current resolution:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="125"/>
+        <source>Cameras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="127"/>
+        <source>Camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="133"/>
+        <source>Take picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="138"/>
+        <source>Show safe area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="139"/>
+        <source>+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="145"/>
+        <source>Show grid</source>
+        <translation type="unfinished">Показати ґратку</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="146"/>
+        <source>#</source>
+        <translation type="unfinished">№</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="156"/>
+        <source>Grid spacing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="167"/>
+        <source>Grid color</source>
+        <translation type="unfinished">Колір ґратки</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="183"/>
+        <source>Show previous images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="184"/>
+        <source>P</source>
+        <translation type="unfinished">P</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="194"/>
+        <source>Image opacity level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="204"/>
+        <source>Amount of images to show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="231"/>
+        <source>Close manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
+        <source>Error</source>
+        <translation type="unfinished">Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerainterface.cpp" line="302"/>
+        <source>Can&apos;t create pictures directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraStatus</name>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="71"/>
+        <source>Scene name</source>
+        <translation>Назва сцени</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="84"/>
+        <source>Frames total</source>
+        <translation>Загальна кількість кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="95"/>
+        <source>FPS</source>
+        <translation>Частота кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="112"/>
+        <source>Loop</source>
+        <translation>Цикл</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="116"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="129"/>
+        <source>Export</source>
+        <translation>Експортувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerastatus.cpp" line="139"/>
+        <source>Post</source>
+        <translation>Надіслати</translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraWidget</name>
+    <message>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="91"/>
+        <source>Scene Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="159"/>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/animation/tupcamerawidget.cpp" line="182"/>
+        <source>Size</source>
+        <translation type="unfinished">Розмір</translation>
+    </message>
+</context>
+<context>
+    <name>TupCameraWindow</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="95"/>
+        <source>General Camera error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="100"/>
+        <source>Camera invalid request error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="105"/>
+        <source>Camera service missing error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcamerawindow.cpp" line="110"/>
+        <source>Camera not supported error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupCanvas</name>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="71"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="78"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="79"/>
+        <source>Tupi: Open 2D Magic</source>
+        <translation>Tupi: відкрита магія на площині</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="101"/>
+        <source>Sketch Tools</source>
+        <translation>Засоби створення ескізів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="105"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="118"/>
+        <source>Images</source>
+        <translation>Зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="109"/>
+        <source>Selection Tools</source>
+        <translation>Засоби позначення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="145"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="146"/>
+        <source>Undo</source>
+        <translation>Вернути</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="149"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="150"/>
+        <source>Redo</source>
+        <translation>Повторити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="130"/>
+        <source>Delete Selection</source>
+        <translation>Вилучити позначене</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="134"/>
+        <source>Zoom In</source>
+        <translation>Збільшити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="129"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="137"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="138"/>
+        <source>Zoom Out</source>
+        <translation>Зменшити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="133"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="142"/>
+        <source>Shift</source>
+        <translation>Рука</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="137"/>
+        <source>Pen Properties</source>
+        <translation>Властивості пера</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="141"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="162"/>
+        <source>Exposure Sheet</source>
+        <translation>Таблиця експонування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="425"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="293"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="295"/>
+        <source>Import a SVG file...</source>
+        <translation>Імпортувати файл SVG…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="426"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="294"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="296"/>
+        <source>Vector</source>
+        <translation>Вектор</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="463"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="331"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="333"/>
+        <source>Information</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="465"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="333"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="335"/>
+        <source>Image is bigger than workspace.</source>
+        <translation>Розміри зображення перевищують розміри робочої області.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="466"/>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="334"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="336"/>
+        <source>Do you want to resize it?</source>
+        <translation>Хочете змінити розміри?</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="609"/>
+        <source>Scene %1</source>
+        <translation>Сцена %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="612"/>
+        <source>Layer 1</source>
+        <translation>Шар 1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="615"/>
+        <source>Frame 1</source>
+        <translation>Кадр 1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="628"/>
+        <source>Layer %1</source>
+        <translation>Шар %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="635"/>
+        <location filename="../src/components/paintarea/tupcanvas.cpp" line="647"/>
+        <source>Frame %1</source>
+        <translation>Кадр %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="95"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="96"/>
+        <source>Pencil</source>
+        <translation>Олівець</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="99"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="100"/>
+        <source>Ink</source>
+        <translation>Чорнило</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="109"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="110"/>
+        <source>Ellipse</source>
+        <translation>Еліпс</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="113"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="114"/>
+        <source>Rectangle</source>
+        <translation>Прямокутник</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="121"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="122"/>
+        <source>Object Selection</source>
+        <translation>Позначення об’єктів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="125"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="126"/>
+        <source>Nodes Selection</source>
+        <translation>Позначення лінії</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="153"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="154"/>
+        <source>Color Palette</source>
+        <translation>Палітра кольорів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupcanvas.pc.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupcanvas.tablet.cpp" line="158"/>
+        <source>Pen Size</source>
+        <translation>Товщина пера</translation>
+    </message>
+</context>
+<context>
+    <name>TupChat</name>
+    <message>
+        <location filename="../src/net/tupchat.cpp" line="75"/>
+        <source>Send</source>
+        <translation>Надіслати</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupchat.cpp" line="164"/>
+        <source>Error:</source>
+        <translation>Помилка:</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupchat.cpp" line="165"/>
+        <source>Invalid Message. It won&apos;t be sent. Please, don&apos;t use HTML tags</source>
+        <translation>Некоректне повідомлення. Його не буде надіслано. Будь ласка, не використовуйте теґів HTML.</translation>
+    </message>
+</context>
+<context>
+    <name>TupColorPalette</name>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="77"/>
+        <source>Color Palette</source>
+        <translation>Палітра кольорів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="127"/>
+        <source>Contour</source>
+        <translation>Контур</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="128"/>
+        <source>Fill</source>
+        <translation>Заповнити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="207"/>
+        <source>Color Mixer</source>
+        <translation>Мікшер кольорів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorpalette.cpp" line="215"/>
+        <source>Gradients</source>
+        <translation>Градієнти</translation>
+    </message>
+</context>
+<context>
+    <name>TupColorValue</name>
+    <message>
+        <location filename="../src/components/colorpalette/tupcolorvalue.cpp" line="180"/>
+        <source>Percent</source>
+        <translation>Відсоток</translation>
+    </message>
+</context>
+<context>
+    <name>TupConfigurationArea</name>
+    <message>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="296"/>
+        <source>Cursor here for expand</source>
+        <translation>Наведіть курсор, щоб розгорнути.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupconfigurationarea.cpp" line="339"/>
+        <source>Properties</source>
+        <translation>Властивості</translation>
+    </message>
+</context>
+<context>
+    <name>TupConnectDialog</name>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="60"/>
+        <source>Connection Dialog</source>
+        <translation>Діалогове вікно з’єднання</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
+        <source>Login</source>
+        <translation>Користувач</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
+        <source>Server</source>
+        <translation>Сервер</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="70"/>
+        <source>Port</source>
+        <translation>Порт</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="72"/>
+        <source>Store password</source>
+        <translation>Зберегти пароль</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupconnectdialog.cpp" line="158"/>
+        <source>Please, fill in your password</source>
+        <translation>Будь ласка, вкажіть ваш пароль</translation>
+    </message>
+</context>
+<context>
+    <name>TupCrashWidget</name>
+    <message>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="112"/>
+        <source>What&apos;s happening?</source>
+        <translation>Що сталося?</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="140"/>
+        <source>Executable information</source>
+        <translation>Дані щодо виконуваного файла</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="146"/>
+        <location filename="../src/shell/tupcrashwidget.cpp" line="153"/>
+        <source>Backtrace</source>
+        <translation>Зворотне трасування</translation>
+    </message>
+</context>
+<context>
+    <name>TupDebugWidget</name>
+    <message>
+        <location filename="../src/components/debug/tupdebugwidget.cpp" line="44"/>
+        <source>Debug Console</source>
+        <translation>Консоль діагностики</translation>
+    </message>
+</context>
+<context>
+    <name>TupDocumentView</name>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="617"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="931"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <source>Object Selection</source>
+        <translation>Позначення об’єктів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <source>Nodes Selection</source>
+        <translation type="unfinished">Позначення лінії</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <source>Copy</source>
+        <translation>Копіювати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="362"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <source>Paste</source>
+        <translation>Вставити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="365"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
+        <source>Cut</source>
+        <translation>Вирізати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="368"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="371"/>
+        <source>Delete</source>
+        <translation>Вилучити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
+        <source>&amp;Group</source>
+        <translation>З&amp;групувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="374"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="378"/>
+        <source>&amp;Ungroup</source>
+        <translation>&amp;Розгрупувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="379"/>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
+        <source>Onion Skin</source>
+        <translation>Калька</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="383"/>
+        <source>Ctrl+Shift+O</source>
+        <translation>Ctrl+Shift+O</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1123"/>
+        <source>Onion Skin Factor</source>
+        <translation>Коефіцієнт масштабування кальки</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="386"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <source>Ctrl+Shift+S</source>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
+        <source>@</source>
+        <translation>@</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="389"/>
+        <source>Export Current Frame As Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="396"/>
+        <source>Export Current Frame To Gallery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="400"/>
+        <source>Storyboard Settings</source>
+        <translation type="unfinished">Параметри сценарію</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
+        <source>Camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="403"/>
+        <source>Ctrl+Shift+C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="409"/>
+        <source>Draw tools</source>
+        <translation>Інструменти малювання</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="416"/>
+        <source>Brushes</source>
+        <translation>Пензлі</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="423"/>
+        <source>Selection</source>
+        <translation>Позначення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="430"/>
+        <source>Fill</source>
+        <translation>Заповнити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
+        <source>Papagayo file has been imported successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="444"/>
+        <source>Tweening</source>
+        <translation>Анімування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="467"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="478"/>
+        <source>Image Array</source>
+        <translation>Масив зображень</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="532"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="896"/>
+        <source>Pencil</source>
+        <translation>Олівець</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="538"/>
+        <source>Ink</source>
+        <translation>Чорнило</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="542"/>
+        <source>Eraser</source>
+        <translation>Гумка</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="344"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="547"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="973"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1648"/>
+        <source>PolyLine</source>
+        <translation>Ламана</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="554"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1651"/>
+        <source>Line</source>
+        <translation>Пряма</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="561"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="900"/>
+        <source>Rectangle</source>
+        <translation>Прямокутник</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="564"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="901"/>
+        <source>Ellipse</source>
+        <translation>Еліпс</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="567"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="898"/>
+        <source>Text</source>
+        <translation>Текст</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="575"/>
+        <source>Position Tween</source>
+        <translation>Анімація розташовування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="580"/>
+        <source>Rotation Tween</source>
+        <translation>Анімація обертання</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="584"/>
+        <source>Scale Tween</source>
+        <translation>Анімація масштабування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="589"/>
+        <source>Shear Tween</source>
+        <translation>Анімація перекошування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="594"/>
+        <source>Opacity Tween</source>
+        <translation>Анімація зміни прозорості</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="599"/>
+        <source>Coloring Tween</source>
+        <translation>Анімація розфарбовування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="604"/>
+        <source>Compound Tween</source>
+        <translation>Комбінована анімація</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="624"/>
+        <source>Internal fill</source>
+        <translation>Внутрішнє заповнення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
+        <source>Zoom In</source>
+        <translation>Збільшити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="816"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="871"/>
+        <source>%1</source>
+        <translation>%1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="943"/>
+        <source>Zoom Out</source>
+        <translation>Зменшити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="437"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="631"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="946"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1441"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1496"/>
+        <source>Shift</source>
+        <translation>Рука</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="609"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1060"/>
+        <source>Paint area actions</source>
+        <translation>Дії з малювання області</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1063"/>
+        <source>Dynamic Background Properties</source>
+        <translation>Властивості динамічного тла</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1068"/>
+        <source>Frames Mode</source>
+        <translation>Режим кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1069"/>
+        <source>Static BG Mode</source>
+        <translation>Режим статичного тла</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1070"/>
+        <source>Dynamic BG Mode</source>
+        <translation>Режим динамічного тла</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1095"/>
+        <source>Previous Frames</source>
+        <translation>Попередні кадри</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1107"/>
+        <source>Next Frames</source>
+        <translation>Наступні кадри</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1142"/>
+        <source>Direction</source>
+        <translation>Напрямок</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1145"/>
+        <source>Left to Right</source>
+        <translation>Зліва праворуч</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1146"/>
+        <source>Right to Left</source>
+        <translation>Справа ліворуч</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1147"/>
+        <source>Top to Bottom</source>
+        <translation>Згори вниз</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1148"/>
+        <source>Bottom to Top</source>
+        <translation>Знизу вгору</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1151"/>
+        <source>Shift Length</source>
+        <translation>Довжина зсуву</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1519"/>
+        <source>Export Frame As</source>
+        <translation>Експортувати кадр як</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1520"/>
+        <source>Images</source>
+        <translation>Зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1879"/>
+        <source>Information</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1525"/>
+        <source>Frame has been exported successfully</source>
+        <translation>Кадр успішно експортовано</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1527"/>
+        <source>Can&apos;t export frame as image</source>
+        <translation>Не вдалося експортувати кадр як зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1734"/>
+        <source>No cameras detected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1797"/>
+        <location filename="../src/components/paintarea/tupdocumentview.cpp" line="1870"/>
+        <source>Frame %1</source>
+        <translation type="unfinished">Кадр %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupExportWidget</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1030"/>
+        <source>Export to Video</source>
+        <translation>Експортувати до відео</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1041"/>
+        <source>Export to Video File</source>
+        <translation>Експортувати до відеофайла</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1044"/>
+        <source>Export to Images Array</source>
+        <translation>Експортувати дані до масиву зображень</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1047"/>
+        <source>Export to Animated Image</source>
+        <translation>Експортувати дані до анімованого зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1063"/>
+        <source>Post Animation in Tupitube</source>
+        <translation>Надіслати анімація до Tupitube</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1097"/>
+        <source>Video Formats</source>
+        <translation>Формати відео</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1099"/>
+        <source>Open Video Format</source>
+        <translation>Відкрити дані у формат відео</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1101"/>
+        <source>Image Array</source>
+        <translation>Масив зображень</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="1103"/>
+        <source>Animated Image</source>
+        <translation>Анімоване зображення</translation>
+    </message>
+</context>
+<context>
+    <name>TupExportWizard</name>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="54"/>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="55"/>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="56"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="149"/>
+        <source>Next</source>
+        <translation>Далі</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="179"/>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="206"/>
+        <source>Export</source>
+        <translation>Експортувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwizard.cpp" line="208"/>
+        <source>Post</source>
+        <translation>Надіслати</translation>
+    </message>
+</context>
+<context>
+    <name>TupExposureDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="57"/>
+        <source>Exposure Sheet</source>
+        <translation>Таблиця експонування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="114"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="131"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="134"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="264"/>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="279"/>
+        <source>Scene</source>
+        <translation>Сцена</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupexposuredialog.cpp" line="144"/>
+        <source>Work Team</source>
+        <translation>Робоча команда</translation>
+    </message>
+</context>
+<context>
+    <name>TupExposureScene</name>
+    <message>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="65"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="110"/>
+        <source>Layer</source>
+        <translation>Шар</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="72"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="118"/>
+        <location filename="../src/components/paintarea/tupexposurescene.cpp" line="154"/>
+        <source>Frame</source>
+        <translation>Кадр</translation>
+    </message>
+</context>
+<context>
+    <name>TupExposureSheet</name>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="60"/>
+        <source>Exposure Sheet</source>
+        <translation>Таблиця експонування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="96"/>
+        <source>actions</source>
+        <translation>дії</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="100"/>
+        <source>Insert</source>
+        <translation>Вставити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="102"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="160"/>
+        <source>1 frame</source>
+        <translation>1 кадр</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="107"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="161"/>
+        <source>5 frames</source>
+        <translation>5 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="112"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="162"/>
+        <source>10 frames</source>
+        <translation>10 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="117"/>
+        <source>20 frames</source>
+        <translation>20 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="122"/>
+        <source>50 frames</source>
+        <translation>50 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="127"/>
+        <source>100 frames</source>
+        <translation>100 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="134"/>
+        <source>Remove frame</source>
+        <translation>Вилучити кадр</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="139"/>
+        <source>Clear frame</source>
+        <translation>Спорожнити кадр</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="144"/>
+        <source>Lock/Unlock frame</source>
+        <translation>Заблокувати/Розблокувати кадр</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="149"/>
+        <source>Copy frame</source>
+        <translation>Копіювати кадр</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="154"/>
+        <source>Paste in frame</source>
+        <translation>Вставити до кадру</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="159"/>
+        <source>Expand</source>
+        <translation>Розгорнути</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="168"/>
+        <source>Copy TL forward</source>
+        <translation>Копіювати розклад вперед</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="169"/>
+        <source>1 time</source>
+        <translation>1 раз</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="170"/>
+        <source>2 times</source>
+        <translation>2 рази</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="171"/>
+        <source>3 times</source>
+        <translation>3 рази</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="172"/>
+        <source>4 times</source>
+        <translation>4 рази</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="173"/>
+        <source>5 times</source>
+        <translation>5 разів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="247"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="671"/>
+        <source>Layer %1</source>
+        <translation>Шар %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="254"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="501"/>
+        <location filename="../src/components/exposure/tupexposuresheet.cpp" line="674"/>
+        <source>Frame %1</source>
+        <translation>Кадр %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupGradientCreator</name>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
+        <source>Linear</source>
+        <translation>Лінійна</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
+        <source>Radial</source>
+        <translation>Радіальний</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="77"/>
+        <source>Conical</source>
+        <translation>Конічний</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
+        <source>Pad</source>
+        <translation>Фаска</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
+        <source>Reflect</source>
+        <translation>Відбиття</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupgradientcreator.cpp" line="84"/>
+        <source>Repeat</source>
+        <translation>Повторити</translation>
+    </message>
+</context>
+<context>
+    <name>TupGraphicsScene</name>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="155"/>
+        <source>PolyLine</source>
+        <translation>Ламана</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="583"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="771"/>
+        <source>/Step: 0</source>
+        <translation>/Крок: 0</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="653"/>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="803"/>
+        <source>/Step: </source>
+        <translation>/Крок: </translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1212"/>
+        <source>Line</source>
+        <translation>Лінія</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
+        <source>Zoom In</source>
+        <translation>Збільшити</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tupgraphicsscene.cpp" line="1297"/>
+        <source>Zoom Out</source>
+        <translation>Зменшити</translation>
+    </message>
+</context>
+<context>
+    <name>TupHelpBrowser</name>
+    <message>
+        <location filename="../src/components/help/tuphelpbrowser.cpp" line="42"/>
+        <source>Help</source>
+        <translation>Довідка</translation>
+    </message>
+</context>
+<context>
+    <name>TupHelpWidget</name>
+    <message>
+        <location filename="../src/components/help/tuphelpwidget.cpp" line="40"/>
+        <source>Help</source>
+        <translation>Довідка</translation>
+    </message>
+</context>
+<context>
+    <name>TupImageDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="48"/>
+        <source>Image Properties</source>
+        <translation>Властивості зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="53"/>
+        <source>Title</source>
+        <translation>Заголовок</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="54"/>
+        <source>My Picture</source>
+        <translation>Моє зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="60"/>
+        <source>Topics</source>
+        <translation>Теми</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="61"/>
+        <source>#topic1 #topic2 #topic3</source>
+        <translation>#тема1 #тема2 #тема3</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="66"/>
+        <source>Description</source>
+        <translation>Опис</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="72"/>
+        <source>Just a little taste of my style :)</source>
+        <translation>Лише часточка мого стилю :)</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="85"/>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="89"/>
+        <source>Post Image</source>
+        <translation>Надіслати зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="111"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="117"/>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="128"/>
+        <source>Set a title for the picture here!</source>
+        <translation>Тут можна вказати заголовок зображення!</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupimagedialog.cpp" line="139"/>
+        <source>Set some topic tags for the picture here!</source>
+        <translation>Тут можна вказати мітки тем для зображення!</translation>
+    </message>
+</context>
+<context>
+    <name>TupInfoWidget</name>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="124"/>
+        <source>Currency Converter</source>
+        <translation>Конвертер валют</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="128"/>
+        <source>Currency</source>
+        <translation>Валюта</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="132"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="211"/>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="228"/>
+        <source>%1</source>
+        <translation>%1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="143"/>
+        <source>Source</source>
+        <translation>Джерело</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="152"/>
+        <source>Update data every</source>
+        <translation>Оновлювати дані кожні</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="155"/>
+        <source>minute</source>
+        <translation>хвилину</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="157"/>
+        <source>minutes</source>
+        <translation>хвилин</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="246"/>
+        <source>Link file to Object</source>
+        <translation>Пов’язати з об’єктом файл</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupinfowidget.cpp" line="247"/>
+        <source>All files (*.*)</source>
+        <translation>всі файли (*.*)</translation>
+    </message>
+</context>
+<context>
+    <name>TupItemManager</name>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="70"/>
+        <source>New folder %1</source>
+        <translation>Нова тека %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="229"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="350"/>
+        <source>Options</source>
+        <translation>Параметри</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="242"/>
+        <source>Edit with Inkscape</source>
+        <translation>Редагувати за допомогою Inkscape</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="252"/>
+        <source>Edit with Gimp</source>
+        <translation>Редагувати за допомогою Gimp</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="262"/>
+        <source>Edit with Krita</source>
+        <translation>Редагувати за допомогою Krita</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="272"/>
+        <source>Edit with MyPaint</source>
+        <translation>Редагувати за допомогою MyPaint</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="283"/>
+        <source>Clone</source>
+        <translation>Клонувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="286"/>
+        <source>Export</source>
+        <translation>Експортувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="232"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="289"/>
+        <source>Rename</source>
+        <translation>Перейменувати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="235"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="292"/>
+        <source>Delete</source>
+        <translation>Вилучити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="303"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="354"/>
+        <source>Create new raster item</source>
+        <translation>Створити запис растрового зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="309"/>
+        <location filename="../src/components/library/tupitemmanager.cpp" line="359"/>
+        <source>Create new svg item</source>
+        <translation>Створити запис зображення SVG</translation>
+    </message>
+</context>
+<context>
+    <name>TupItemPreview</name>
+    <message>
+        <location filename="../src/libtupi/tupitempreview.cpp" line="56"/>
+        <source>Library is empty :(</source>
+        <translation>Бібліотека порожня :(</translation>
+    </message>
+</context>
+<context>
+    <name>TupItemTweener</name>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="610"/>
+        <source>Position Tween</source>
+        <translation>Анімація розташовування</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="613"/>
+        <source>Rotation Tween</source>
+        <translation>Анімація обертання</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="616"/>
+        <source>Scale Tween</source>
+        <translation>Анімація масштабування</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="619"/>
+        <source>Shear Tween</source>
+        <translation>Анімація перекошування</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="622"/>
+        <source>Opacity Tween</source>
+        <translation>Анімація зміни прозорості</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="625"/>
+        <source>Coloring Tween</source>
+        <translation>Анімація розфарбовування</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="628"/>
+        <source>Compound Tween</source>
+        <translation>Комбінована анімація</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupitemtweener.cpp" line="631"/>
+        <source>Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupLayer</name>
+    <message>
+        <location filename="../src/store/tuplayer.cpp" line="56"/>
+        <source>Layer</source>
+        <translation>Шар</translation>
+    </message>
+</context>
+<context>
+    <name>TupLayerIndex</name>
+    <message>
+        <location filename="../src/components/timeline/tuplayerindex.cpp" line="169"/>
+        <source>Layers</source>
+        <translation>Шари</translation>
+    </message>
+</context>
+<context>
+    <name>TupLibraryDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="47"/>
+        <source>Library Object</source>
+        <translation>Об’єкт бібліотеки</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="81"/>
+        <source>Name</source>
+        <translation>Назва</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuplibrarydialog.cpp" line="84"/>
+        <source>Item %1</source>
+        <translation>Запис %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupLibraryWidget</name>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="95"/>
+        <source>Library</source>
+        <translation>Бібліотека</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="162"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1445"/>
+        <source>Image</source>
+        <translation>Зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="163"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1455"/>
+        <source>Svg File</source>
+        <translation>файл SVG</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="164"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1450"/>
+        <source>Image Array</source>
+        <translation>Масив зображень</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="165"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1460"/>
+        <source>Svg Array</source>
+        <translation>Масив SVG</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="171"/>
+        <source>Add an object to library</source>
+        <translation>Додати об’єкт до бібліотеки</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="179"/>
+        <source>Adds a folder to the object&apos;s list</source>
+        <translation>Додає теку до списку об’єкта</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="186"/>
+        <source>Inserts the selected object into the drawing area</source>
+        <translation>Вставляє позначений об’єкт до області малювання</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="269"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1493"/>
+        <source>Directory</source>
+        <translation>Каталог</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="286"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="339"/>
+        <source>No preview available</source>
+        <translation>Перегляд недоступний</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="537"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="836"/>
+        <source>Images</source>
+        <translation>Зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="550"/>
+        <source>Export object...</source>
+        <translation>Експортувати об’єкт…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
+        <source>Info</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="579"/>
+        <source>Item exported successfully!</source>
+        <translation>Елемент успішно експортовано!</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="653"/>
+        <source>Couldn&apos;t create images directory!</source>
+        <translation>Не вдалося створити каталог зображень!</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="762"/>
+        <source>Couldn&apos;t create vector directory!</source>
+        <translation>Не вдалося створити каталог векторних даних!</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="781"/>
+        <source>Tupi library item</source>
+        <translation>Запис бібліотеки Tupi</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="876"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1026"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1159"/>
+        <source>Information</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="878"/>
+        <source>Image is bigger than workspace.</source>
+        <translation>Розміри зображення перевищують розміри робочої області.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="879"/>
+        <source>Do you want to resize it?</source>
+        <translation>Хочете змінити розміри?</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="923"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="979"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1262"/>
+        <source>Cannot open file: %1</source>
+        <translation>Не вдалося відкрити файл: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="835"/>
+        <source>Import images...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="929"/>
+        <source>Import SVG files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="930"/>
+        <source>Vector</source>
+        <translation>Вектор</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="986"/>
+        <source>Choose the images directory...</source>
+        <translation>Вибрати каталог зображень…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1009"/>
+        <source>Image files found: %1.</source>
+        <translation>Виявлено файли зображень: %1.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1019"/>
+        <source>Files are too big, so they will be resized.</source>
+        <translation>Файли є надто великими, отже, їхній розмір доведеться змінити.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1020"/>
+        <source>Note: This task can take a while.</source>
+        <translation>Зауваження: обробка може бути доволі тривалою.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1029"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1162"/>
+        <source>Do you want to continue?</source>
+        <translation>Бажаєте продовжити?</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1051"/>
+        <source>Loading images...</source>
+        <translation>Завантажуємо зображення…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1099"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1213"/>
+        <source>Frame %1</source>
+        <translation>Кадр %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1107"/>
+        <source>Loading image #%1</source>
+        <translation>Завантажуємо зображення №%1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
+        <source>ERROR!</source>
+        <translation>ПОМИЛКА!</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1111"/>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1226"/>
+        <source>ERROR: Can&apos;t open file %1. Please, check file permissions and try again.</source>
+        <translation>ПОМИЛКА: не вдалося відкрити файл %1. Будь ласка, перевірте, чи є у вас відповідні права доступу.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1123"/>
+        <source>No image files were found.&lt;br/&gt;Please, try another directory</source>
+        <translation>Файлів зображень не знайдено.&lt;br/&gt;Будь ласка, спробуйте інший каталог.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1131"/>
+        <source>Choose the SVG files directory...</source>
+        <translation>Виберіть каталог файлів SVG…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1156"/>
+        <source>%1 SVG files will be loaded.</source>
+        <translation>Буде завантажено %1 файлів SVG.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1182"/>
+        <source>Loading SVG files...</source>
+        <translation>Завантажуємо файли SVG…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1221"/>
+        <source>Loading SVG file #%1</source>
+        <translation>Завантажуємо файл SVG №%1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1238"/>
+        <source>No SVG files were found.&lt;br/&gt;Please, try another directory</source>
+        <translation>Файлів SVG не знайдено.&lt;br/&gt;Будь ласка, спробуйте інший каталог.</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1244"/>
+        <source>Import audio file...</source>
+        <translation>Імпортувати звуковий файл…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tuplibrarywidget.cpp" line="1245"/>
+        <source>Sound file</source>
+        <translation>Звуковий файл</translation>
+    </message>
+</context>
+<context>
+    <name>TupListProjectDialog</name>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="54"/>
+        <source>Projects List from Server</source>
+        <translation>Список проектів з сервера</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="79"/>
+        <source>My works:</source>
+        <translation>Ваші роботи:</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="80"/>
+        <source>My contributions:</source>
+        <translation>Ваші внески:</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="116"/>
+        <source>OK</source>
+        <translation>Гаразд</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
+        <source>Name</source>
+        <translation>Назва</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
+        <source>Description</source>
+        <translation>Опис</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="139"/>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tuplistprojectdialog.cpp" line="141"/>
+        <source>Author</source>
+        <translation>Автор</translation>
+    </message>
+</context>
+<context>
+    <name>TupMainWindow</name>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="111"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="635"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
+        <source>Tupi: Open 2D Magic</source>
+        <translation>Tupi: відкрита магія на площині</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="216"/>
+        <source>[ by %1 | net mode ]</source>
+        <translation>[ автор — %1 | режим мережі ]</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
+        <source>Information</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="255"/>
+        <source>Opening a new document...</source>
+        <translation>Відкриваємо новий документ…</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="273"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1218"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="277"/>
+        <source>Animation</source>
+        <translation>Анімація</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="327"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="285"/>
+        <source>Player</source>
+        <translation>Програвач</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="404"/>
+        <source>Project &lt;b&gt;%1&lt;/b&gt; opened!</source>
+        <translation>Відкрито проект &lt;b&gt;%1&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="484"/>
+        <source>Question</source>
+        <translation>Питання</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="486"/>
+        <source>The document has been modified.</source>
+        <translation>До документа внесено зміни.</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="487"/>
+        <source>Do you want to save the project?</source>
+        <translation>Хочете зберегти проект?</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="489"/>
+        <source>Save</source>
+        <translation>Зберегти</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="490"/>
+        <source>Discard</source>
+        <translation>Відкинути</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="491"/>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="729"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="820"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1138"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1173"/>
+        <source>by</source>
+        <translation>автор —</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="746"/>
+        <source>Open Tupi project</source>
+        <translation>Відкриття проекту Tupi</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="747"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1093"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1429"/>
+        <source>Tupi Project Package (*.tup)</source>
+        <translation>пакунок проекту Tupi (*.tup)</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="824"/>
+        <source>Cannot open project!</source>
+        <translation>Не вдалося відкрити проект!</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
+        <source>Import Gimp palettes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="954"/>
+        <source>Gimp Palette (*.gpl *.txt *.css)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="994"/>
+        <source>Gimp palette import was successful</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="996"/>
+        <source>Gimp palette import was unsuccessful</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1109"/>
+        <source>Directory does not exist! Please, choose another path.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
+        <source>Tip of the day</source>
+        <translation>Підказка дня</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <source>Show on start</source>
+        <translation>Показувати під час запуску</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <source>Previous tip</source>
+        <translation>Попередня підказка</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <source>Next tip</source>
+        <translation>Наступна підказка</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="933"/>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1462"/>
+        <source>Close</source>
+        <translation>Закрити</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1092"/>
+        <source>Save Project As</source>
+        <translation>Зберегти проект як</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1124"/>
+        <source>You have no permission to create this file. Please, choose another path.</source>
+        <translation>У вас немає прав доступу до створення цього файла. Будь ласка, виберіть для нього інший каталог.</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1165"/>
+        <source>Project &lt;b&gt;%1&lt;/b&gt; saved</source>
+        <translation>Проект &lt;b&gt;%1&lt;/b&gt; збережено</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1175"/>
+        <source>Cannot save the project!</source>
+        <translation>Не вдалося зберегти проект!</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1219"/>
+        <source>New camera</source>
+        <translation>Нова камера</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1428"/>
+        <source>Import project package</source>
+        <translation>Імпортування пакунка проекту</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1437"/>
+        <source>Can&apos;t import project. File is empty!</source>
+        <translation>Не вдалося імпортувати проект. Файл є порожнім!</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1441"/>
+        <source>Can&apos;t save the project. File doesn&apos;t exist!</source>
+        <translation>Не вдалося зберегти проект. Файла не існує!</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1457"/>
+        <source>Fatal Error</source>
+        <translation>Критична помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1459"/>
+        <source>The connection to the server has been lost.</source>
+        <translation>З’єднання з сервером розірвано.</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow.cpp" line="1460"/>
+        <source>Please, try to connect again in a while</source>
+        <translation>Будь ласка, повторіть спробу встановити з’єднання пізніше</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="64"/>
+        <source>Shift+P</source>
+        <translation>Shift+P</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="75"/>
+        <source>Shift+B</source>
+        <translation>Shift+B</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="86"/>
+        <source>Shift+L</source>
+        <translation>Shift+L</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
+        <source>Bitmap</source>
+        <translation>Растровий</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="90"/>
+        <source>Alt+B</source>
+        <translation>Alt+B</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
+        <source>Bitmap Array</source>
+        <translation>Масив растрових зображень</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="93"/>
+        <source>Alt+Shift+B</source>
+        <translation>Alt+Shift+B</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <source>SVG File</source>
+        <translation>файл SVG</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="96"/>
+        <source>Alt+S</source>
+        <translation>Alt+S</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <source>SVG Array</source>
+        <translation>Масив SVG</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="99"/>
+        <source>Alt+Shift+S</source>
+        <translation>Alt+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="115"/>
+        <source>Shift+C</source>
+        <translation>Shift+C</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="124"/>
+        <source>Shift+E</source>
+        <translation>Shift+E</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="139"/>
+        <source>Shift+H</source>
+        <translation>Shift+H</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="154"/>
+        <source>Shift+T</source>
+        <translation>Shift+T</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="164"/>
+        <source>Shift+D</source>
+        <translation>Shift+D</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="195"/>
+        <source>&amp;File</source>
+        <translation>&amp;Файл</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="204"/>
+        <source>Recents</source>
+        <translation>Нещодавні</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="225"/>
+        <source>&amp;Edit</source>
+        <translation>З&amp;міни</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="235"/>
+        <source>&amp;Import</source>
+        <translation>&amp;Імпорт</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="252"/>
+        <source>&amp;Window</source>
+        <translation>&amp;Вікно</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="272"/>
+        <source>Modules</source>
+        <translation>Модулі</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="293"/>
+        <source>Help</source>
+        <translation>Довідка</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="301"/>
+        <source>News</source>
+        <translation>Новини</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="314"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Довідка</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
+        <source>New project</source>
+        <translation>Новий проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="361"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="363"/>
+        <source>Open new project</source>
+        <translation>Відкрити новий проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
+        <source>Open project</source>
+        <translation>Відкрити проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="366"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="369"/>
+        <source>Load existent project</source>
+        <translation>Завантажити наявний проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="409"/>
+        <source>Shift+G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Import Papagayo project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="684"/>
+        <source>Papagayo Project (*.pgo)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="691"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="702"/>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="713"/>
+        <source>Papagayo project is invalid!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="382"/>
+        <source>Save project</source>
+        <translation>Зберегти проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="383"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="385"/>
+        <source>Save current project in current location</source>
+        <translation>Зберегти поточний проект у поточному каталозі</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="390"/>
+        <source>Save project &amp;As...</source>
+        <translation>Зберегти проект &amp;як...</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="391"/>
+        <source>Ctrl+Shift+S</source>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="394"/>
+        <source>Open dialog box to save current project in any location</source>
+        <translation>Відкрити діалогове вікно для зберігання поточного проекту будь-де</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
+        <source>Cl&amp;ose project</source>
+        <translation>З&amp;акрити проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="400"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="403"/>
+        <source>Close active project</source>
+        <translation>Закрити активний проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="408"/>
+        <source>&amp;Import GIMP palettes</source>
+        <translation>&amp;Імпортувати палітри GIMP</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="410"/>
+        <source>Import palettes</source>
+        <translation>Імпортувати палітри</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="413"/>
+        <source>&amp;Import Papagayo Lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="414"/>
+        <source>Alt+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="415"/>
+        <source>Import Papagayo lip-sync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
+        <source>&amp;Export Project</source>
+        <translation>&amp;Експортувати проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="419"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="421"/>
+        <source>Export project to several video formats</source>
+        <translation>Експортувати проекти у один з декількох відеоформатів</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
+        <source>E&amp;xit</source>
+        <translation>Ви&amp;йти</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="425"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="427"/>
+        <source>Close application</source>
+        <translation>Закрити вікно програми</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="451"/>
+        <source>Pr&amp;eferences...</source>
+        <translation>П&amp;араметри…</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="452"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="454"/>
+        <source>Opens the preferences dialog box</source>
+        <translation>Відкрити діалогове вікно налаштувань</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
+        <source>About Tupi</source>
+        <translation>Про Tupi</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="468"/>
+        <source>Ctrl+K</source>
+        <translation>Ctrl+K</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="470"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="526"/>
+        <source>Actions Bar</source>
+        <translation>Панель дій</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="666"/>
+        <source>Undo</source>
+        <translation>Вернути</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="669"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="672"/>
+        <source>Redo</source>
+        <translation>Повторити</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupmainwindow_gui.cpp" line="675"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+</context>
+<context>
+    <name>TupNetProjectManagerHandler</name>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="80"/>
+        <source>Communications</source>
+        <translation>Обмін даними</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="84"/>
+        <source>Chat</source>
+        <translation>Спілкування</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="89"/>
+        <source>Notices</source>
+        <translation>Нотатки</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="507"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="248"/>
+        <source>Unable to connect to server</source>
+        <translation>Не вдалося з’єднатися з сервером</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="319"/>
+        <source>Fatal Error</source>
+        <translation>Критична помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="321"/>
+        <source>User &quot;%1&quot; is disabled.
+Please, contact the animation server admin to get access.</source>
+        <translation>Запис користувача «%1» вимкнено.
+Щоб отримати доступ, будь ласка, зв’яжіться з адміністратором сервера анімацій.</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="536"/>
+        <source>Information</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="471"/>
+        <source>User has no available projects in the server</source>
+        <translation>У користувача немає доступних проектів на сервері</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="505"/>
+        <source>Warning</source>
+        <translation>Попередження</translation>
+    </message>
+    <message>
+        <location filename="../src/net/tupnetprojectmanagerhandler.cpp" line="529"/>
+        <source>Notice</source>
+        <translation>Нотатка</translation>
+    </message>
+</context>
+<context>
+    <name>TupNewItemDialog</name>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="66"/>
+        <source>Create new raster item</source>
+        <translation>Створити запис растрового зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="73"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="182"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="186"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="205"/>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="209"/>
+        <source>Transparent</source>
+        <translation>Прозорий</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="74"/>
+        <source>White</source>
+        <translation>Білий</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="75"/>
+        <source>Black</source>
+        <translation>Чорний</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="87"/>
+        <source>Create new vector item</source>
+        <translation>Створити новий векторний елемент</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="123"/>
+        <source>&amp;Name:</source>
+        <translation>&amp;Назва:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="124"/>
+        <source>&amp;Extension:</source>
+        <translation>С&amp;уфікс:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="125"/>
+        <source>&amp;Width:</source>
+        <translation>&amp;Ширина:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="126"/>
+        <source>&amp;Height:</source>
+        <translation>&amp;Висота:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="129"/>
+        <source>&amp;Background:</source>
+        <translation>&amp;Тло:</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupnewitemdialog.cpp" line="133"/>
+        <source>&amp;Open it with:</source>
+        <translation>В&amp;ідкрити за допомогою:</translation>
+    </message>
+</context>
+<context>
+    <name>TupNewProject</name>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="75"/>
+        <source>Create a new project</source>
+        <translation>Створити проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="81"/>
+        <source>Project Name</source>
+        <translation>Назва проекту</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="85"/>
+        <source>my_project</source>
+        <translation>мій_проект</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="88"/>
+        <source>Author</source>
+        <translation>Автор</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="92"/>
+        <source>Your name</source>
+        <translation>Ваше ім’я</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="95"/>
+        <source>Description</source>
+        <translation>Опис</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="99"/>
+        <source>Just for fun!</source>
+        <translation>Заради розваги!</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="103"/>
+        <source>Presets</source>
+        <translation>Шаблони</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="106"/>
+        <source>Free format</source>
+        <translation>Вільний формат</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="107"/>
+        <source>520x380 - 24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="108"/>
+        <source>640x480 - 24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="109"/>
+        <source>480p (PAL DV/DVD) - 25</source>
+        <translation>480p (PAL DV/DVD) — 25</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="110"/>
+        <source>576p (PAL DV/DVD) - 25</source>
+        <translation>576p (PAL DV/DVD) — 25</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="111"/>
+        <source>720p (HD) - 25</source>
+        <translation>720p (HD) — 25</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="112"/>
+        <source>1280p (Full HD) - 25</source>
+        <translation>1280p (Full HD) — 25</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="119"/>
+        <source>Options</source>
+        <translation>Параметри</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="126"/>
+        <source>Background</source>
+        <translation>Тло</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="127"/>
+        <source>Click here to change background color</source>
+        <translation>Натисніть тут, щоб змінити колір тла</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="135"/>
+        <source>FPS</source>
+        <translation>Частота кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="145"/>
+        <source>Dimension</source>
+        <translation>Розмірність</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="161"/>
+        <source>Tupitube project</source>
+        <translation>проект Tupitube</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="167"/>
+        <source>Project info</source>
+        <translation>Відомості щодо проекту</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="226"/>
+        <source>Settings</source>
+        <translation>Параметри</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
+        <source>Username</source>
+        <translation>Користувач</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
+        <source>Server</source>
+        <translation>Сервер</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="228"/>
+        <source>Port</source>
+        <translation>Порт</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="233"/>
+        <source>Store password</source>
+        <translation>Зберегти пароль</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="279"/>
+        <source>Please, set a name for the project</source>
+        <translation>Будь ласка, вкажіть назву проекту</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="285"/>
+        <source>Please, fill in your username</source>
+        <translation>Будь ласка, вкажіть ваше ім’я користувача</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="290"/>
+        <source>Please, fill in your password</source>
+        <translation>Будь ласка, вкажіть ваш пароль</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="295"/>
+        <source>Please, fill in the server name or IP</source>
+        <translation>Будь ласка, вкажіть назву сервера або IP-адресу</translation>
+    </message>
+    <message>
+        <location filename="../src/shell/tupnewproject.cpp" line="325"/>
+        <source>White</source>
+        <translation>Білий</translation>
+    </message>
+</context>
+<context>
+    <name>TupNotice</name>
+    <message>
+        <location filename="../src/net/tupnotice.cpp" line="58"/>
+        <source>Notices</source>
+        <translation>Нотатки</translation>
+    </message>
+</context>
+<context>
+    <name>TupOnionOpacityDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="50"/>
+        <source>Onion Paper</source>
+        <translation>Калька</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="103"/>
+        <source>-0.05</source>
+        <translation>-0,05</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="107"/>
+        <source>-0.01</source>
+        <translation>-0,01</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="119"/>
+        <source>+0.01</source>
+        <translation>+0,01</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuponionopacitydialog.cpp" line="123"/>
+        <source>+0.05</source>
+        <translation>+0,05</translation>
+    </message>
+</context>
+<context>
+    <name>TupPaintArea</name>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="80"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1378"/>
+        <source>Pencil</source>
+        <translation>Олівець</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="161"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <source>Nodes Selection</source>
+        <translation>Позначення лінії</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="171"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="591"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1364"/>
+        <source>PolyLine</source>
+        <translation>Ламана</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="182"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="644"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="696"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1379"/>
+        <source>Object Selection</source>
+        <translation>Позначення об’єктів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="199"/>
+        <source>Drawing area</source>
+        <translation>Область малювання</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
+        <source>Cut</source>
+        <translation>Вирізати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="204"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
+        <source>Copy</source>
+        <translation>Копіювати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="205"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
+        <source>Paste</source>
+        <translation>Вставити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="206"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="208"/>
+        <source>Paste in...</source>
+        <translation>Вставити до…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="209"/>
+        <source>next 5 frames</source>
+        <translation>наступних 5 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="210"/>
+        <source>next 10 frames</source>
+        <translation>наступних 10 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="211"/>
+        <source>next 20 frames</source>
+        <translation>наступних 20 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="212"/>
+        <source>next 50 frames</source>
+        <translation>наступних 50 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="213"/>
+        <source>next 100 frames</source>
+        <translation>наступних 100 кадрів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="223"/>
+        <source>Delete</source>
+        <translation>Вилучити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="226"/>
+        <source>Send</source>
+        <translation>Надіслати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="229"/>
+        <source>To back</source>
+        <translation>Нижче</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="230"/>
+        <source>To front</source>
+        <translation>Вище</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="231"/>
+        <source>One level to back</source>
+        <translation>На рівень нижче</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="232"/>
+        <source>One level to front</source>
+        <translation>На рівень вище</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="238"/>
+        <source>Add to library...</source>
+        <translation>Додати до бібліотеки…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1085"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1430"/>
+        <source>Frame %1</source>
+        <translation>Кадр %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1185"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1223"/>
+        <source>No items selected</source>
+        <translation>Не вибрано жодного запису</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1370"/>
+        <source>Rectangle</source>
+        <translation>Прямокутник</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1371"/>
+        <source>Ellipse</source>
+        <translation>Еліпс</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="176"/>
+        <location filename="../src/components/paintarea/tuppaintarea.cpp" line="1372"/>
+        <source>Line</source>
+        <translation>Пряма</translation>
+    </message>
+</context>
+<context>
+    <name>TupPaintAreaBase</name>
+    <message>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="393"/>
+        <source>No Scene!</source>
+        <translation>Немає сцени!</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="400"/>
+        <source>Locked!</source>
+        <translation>Заблоковано!</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="469"/>
+        <source>No Frames!</source>
+        <translation>Немає кадрів!</translation>
+    </message>
+    <message>
+        <location filename="../src/libbase/tuppaintareabase.cpp" line="472"/>
+        <source>No Layers!</source>
+        <translation>Немає шарів!</translation>
+    </message>
+</context>
+<context>
+    <name>TupPaintAreaConfig</name>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="59"/>
+        <source>Grid color</source>
+        <translation>Колір ґратки</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="65"/>
+        <source>Grid separation</source>
+        <translation>Інтервал ґратки</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="74"/>
+        <source>Background color</source>
+        <translation>Колір тла</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="80"/>
+        <source>Onion skin color</source>
+        <translation>Колір кальки</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppaintareaconfig.cpp" line="86"/>
+        <source>Onion skin background </source>
+        <translation>Тло кальки </translation>
+    </message>
+</context>
+<context>
+    <name>TupPaintAreaStatus</name>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="76"/>
+        <source>Action Safe Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="77"/>
+        <source>+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="85"/>
+        <source>Show grid</source>
+        <translation type="unfinished">Показати ґратку</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="86"/>
+        <source>#</source>
+        <translation type="unfinished">№</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="94"/>
+        <source>Full screen</source>
+        <translation type="unfinished">Повноекранний режим</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="95"/>
+        <source>F11</source>
+        <translation type="unfinished">F11</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="106"/>
+        <source>Current Frame</source>
+        <translation>Поточний кадр</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="113"/>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="127"/>
+        <source>Zoom</source>
+        <translation>Масштаб</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="147"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="159"/>
+        <source>Rotate Workspace</source>
+        <translation>Повернути робочий простір</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="182"/>
+        <source>Antialiasing</source>
+        <translation>Згладжування</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="191"/>
+        <source>Background Color</source>
+        <translation>Колір тла</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="192"/>
+        <source>Click here to change background color</source>
+        <translation>Натисніть тут, щоб змінити колір тла</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="198"/>
+        <source>Brush Color</source>
+        <translation>Колір пензля</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppaintareastatus.cpp" line="199"/>
+        <source>Click here to change brush color</source>
+        <translation>Натисніть тут, щоб змінити колір пензля</translation>
+    </message>
+</context>
+<context>
+    <name>TupPenDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="50"/>
+        <source>Pen Size</source>
+        <translation>Товщина пера</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="102"/>
+        <source>-5</source>
+        <translation>-5</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="106"/>
+        <source>-1</source>
+        <translation>-1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="114"/>
+        <source>+1</source>
+        <translation>+1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuppendialog.cpp" line="118"/>
+        <source>+5</source>
+        <translation>+5</translation>
+    </message>
+</context>
+<context>
+    <name>TupPenWidget</name>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="52"/>
+        <source>Pen Properties</source>
+        <translation>Властивості пера</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="63"/>
+        <source>Thickness</source>
+        <translation>Товщина</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="76"/>
+        <source>Dashes</source>
+        <translation>Пунктир</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="83"/>
+        <source>Solid</source>
+        <translation>Суцільна</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="85"/>
+        <source>Dash</source>
+        <translation>Штрихова</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="87"/>
+        <source>Dot</source>
+        <translation>Пунктирна</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="89"/>
+        <source>Dash dot</source>
+        <translation>Штрих-пунктир</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="91"/>
+        <source>Dash dot dot</source>
+        <translation>Штрих-подвійний пунктир</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="108"/>
+        <source>Cap</source>
+        <translation>Кінчик</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="114"/>
+        <source>Flat</source>
+        <translation>Плоский</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="115"/>
+        <source>Square</source>
+        <translation>Квадрат</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="116"/>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="132"/>
+        <source>Round</source>
+        <translation>Округлені</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="125"/>
+        <source>Join</source>
+        <translation>З&apos;єднати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="130"/>
+        <source>Miter</source>
+        <translation>Накласти</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="131"/>
+        <source>Bevel</source>
+        <translation>Фаска</translation>
+    </message>
+    <message>
+        <location filename="../src/components/pen/tuppenwidget.cpp" line="141"/>
+        <source>Brush</source>
+        <translation>Пензель</translation>
+    </message>
+</context>
+<context>
+    <name>TupPreferences</name>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="202"/>
+        <source>Application TupPreferences</source>
+        <translation>Параметри роботи Tupi</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="205"/>
+        <source>General</source>
+        <translation>Загальне</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="208"/>
+        <source>Theme</source>
+        <translation>Тема</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="211"/>
+        <source>Font</source>
+        <translation>Шрифт</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="214"/>
+        <source>Workspace</source>
+        <translation>Робочий простір</translation>
+    </message>
+</context>
+<context>
+    <name>TupPreferences::GeneralPage</name>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
+        <source>Tupi Home</source>
+        <translation>Домівка Tupi</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
+        <source>Cache</source>
+        <translation>Кеш</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="127"/>
+        <source>Browser</source>
+        <translation>Навігатор</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
+        <source>Open last project</source>
+        <translation>Відкрити останній проект</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tuppreferences.cpp" line="128"/>
+        <source>Auto save (minutes)</source>
+        <translation>Автозбереження (у хвилинах)</translation>
+    </message>
+</context>
+<context>
+    <name>TupProjectActionBar</name>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="97"/>
+        <source>Insert a layer</source>
+        <translation>Вставити шар</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="98"/>
+        <source>F5</source>
+        <translation>F5</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="109"/>
+        <source>Remove the layer</source>
+        <translation>Вилучити шар</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="110"/>
+        <source>F6</source>
+        <translation>F6</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="121"/>
+        <source>Move layer up</source>
+        <translation>Пересунути шар вище</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="122"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="197"/>
+        <source>F9</source>
+        <translation>F9</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="132"/>
+        <source>Move layer down</source>
+        <translation>Пересунути шар нижче</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="133"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="208"/>
+        <source>F10</source>
+        <translation>F10</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="148"/>
+        <source>Insert frame</source>
+        <translation>Вставити кадр</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="159"/>
+        <source>Remove the frame</source>
+        <translation>Вилучити кадр</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="177"/>
+        <source>Move frame up</source>
+        <translation>Пересунути кадр вище</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="178"/>
+        <source>F8</source>
+        <translation>F8</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="196"/>
+        <source>Move frame down</source>
+        <translation>Пересунути кадр нижче</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="207"/>
+        <source>Lock frame</source>
+        <translation>Заблокувати кадр</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="218"/>
+        <source>Lock layer</source>
+        <translation>Заблокувати шар</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="228"/>
+        <source>Insert a scene</source>
+        <translation>Вставити сцену</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="238"/>
+        <source>Remove the scene</source>
+        <translation>Вилучити сцену</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="248"/>
+        <source>Move scene up</source>
+        <translation>Пересунути сцену вище</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="258"/>
+        <source>Move scene down</source>
+        <translation>Пересунути сцену нижче</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="268"/>
+        <source>Lock scene</source>
+        <translation>Заблокувати сцену</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
+        <source>Do you want to remove this frame?</source>
+        <translation>Хочете вилучити цей кадр?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="345"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
+        <source>Remove?</source>
+        <translation>Вилучити?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="366"/>
+        <source>Do you want to remove this layer?</source>
+        <translation>Хочете вилучити цей шар?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtupi/tupprojectactionbar.cpp" line="386"/>
+        <source>Do you want to remove this scene?</source>
+        <translation>Хочете вилучити цю сцену?</translation>
+    </message>
+</context>
+<context>
+    <name>TupProjectManager</name>
+    <message>
+        <location filename="../src/store/tupprojectmanager.cpp" line="207"/>
+        <source>Scene %1</source>
+        <translation>Сцена %1</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectmanager.cpp" line="210"/>
+        <source>Layer %1</source>
+        <translation>Шар %1</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupprojectmanager.cpp" line="213"/>
+        <source>Frame %1</source>
+        <translation>Кадр %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupScene</name>
+    <message>
+        <location filename="../src/store/tupscene.cpp" line="190"/>
+        <source>Sound layer %1</source>
+        <translation>Звуковий шар %1</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupscene.cpp" line="648"/>
+        <source>Layer %1</source>
+        <translation>Шар %1</translation>
+    </message>
+    <message>
+        <location filename="../src/store/tupscene.cpp" line="649"/>
+        <source>Frame %1</source>
+        <translation>Кадр %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupSceneTabWidget</name>
+    <message>
+        <location filename="../src/components/exposure/tupscenetabwidget.cpp" line="77"/>
+        <source>Layers</source>
+        <translation>Шари</translation>
+    </message>
+</context>
+<context>
+    <name>TupScenesWidget</name>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="57"/>
+        <source>Scenes Manager</source>
+        <translation>Керування сценами</translation>
+    </message>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="94"/>
+        <source>Filter here...</source>
+        <translation>Введіть сюди критерій фільтрування…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="155"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="159"/>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="190"/>
+        <source>Scene %1</source>
+        <translation>Сцена %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="165"/>
+        <source>Layer %1</source>
+        <translation>Шар %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/scenes/tupsceneswidget.cpp" line="168"/>
+        <source>Frame %1</source>
+        <translation>Кадр %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupScreen</name>
+    <message>
+        <location filename="../src/components/animation/tupscreen.cpp" line="482"/>
+        <source>Rendering...</source>
+        <translation type="unfinished">Обробка…</translation>
+    </message>
+</context>
+<context>
+    <name>TupSplash</name>
+    <message>
+        <location filename="../src/shell/tupsplash.cpp" line="53"/>
+        <source>Version </source>
+        <translation>Версія </translation>
+    </message>
+</context>
+<context>
+    <name>TupStoryBoardDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="117"/>
+        <source>Storyboard Settings</source>
+        <translation>Параметри сценарію</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="128"/>
+        <source>&amp;PDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="129"/>
+        <source>Export as PDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="132"/>
+        <source>&amp;HTML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="133"/>
+        <source>Export as HTML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="137"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="146"/>
+        <source>&amp;Post</source>
+        <translation>&amp;Надіслати</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="202"/>
+        <source>Storyboard General Information</source>
+        <translation>Загальна інформація щодо сценарію</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="206"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="269"/>
+        <source>Title</source>
+        <translation>Заголовок</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="212"/>
+        <source>Author</source>
+        <translation>Автор</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="217"/>
+        <source>Summary</source>
+        <translation>Резюме</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="236"/>
+        <source>Topics</source>
+        <translation>Теми</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="265"/>
+        <source>Scene Information</source>
+        <translation>Інформація щодо сцени</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="274"/>
+        <source>Duration</source>
+        <translation>Тривалість</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="279"/>
+        <source>Description</source>
+        <translation>Опис</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="314"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="334"/>
+        <source>Cover</source>
+        <translation>Обкладинка</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="328"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="411"/>
+        <source>Storyboard</source>
+        <translation>Сценарій</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="360"/>
+        <source>Scene</source>
+        <translation type="unfinished">Сцена</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="374"/>
+        <source>Scene No %1 - Information</source>
+        <translation>Сцена №%1 — інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="570"/>
+        <source>Choose a directory...</source>
+        <translation>Вибрати каталог…</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
+        <source>Info</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="574"/>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="612"/>
+        <source>Storyboard exported successfully!</source>
+        <translation>Сценарій успішно експортовано!</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
+        <source>Save PDF file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="587"/>
+        <source>PDF file (*.pdf)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="700"/>
+        <source>PDF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tupstoryboarddialog.cpp" line="702"/>
+        <source>Html</source>
+        <translation type="unfinished">HTML</translation>
+    </message>
+</context>
+<context>
+    <name>TupSymbolEditor</name>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="74"/>
+        <source>Symbol editor</source>
+        <translation>Редактор символів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="84"/>
+        <source>Brushes</source>
+        <translation>Пензлі</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="87"/>
+        <source>Selection</source>
+        <translation>Позначення</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="90"/>
+        <source>Fill</source>
+        <translation>Заповнити</translation>
+    </message>
+    <message>
+        <location filename="../src/components/library/tupsymboleditor.cpp" line="93"/>
+        <source>View</source>
+        <translation>Перегляд</translation>
+    </message>
+</context>
+<context>
+    <name>TupThemeSelector</name>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="73"/>
+        <source>General</source>
+        <translation>Загальне</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
+        <source>Text</source>
+        <translation>Текст</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
+        <source>Base</source>
+        <translation>Основа</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
+        <source>Foreground</source>
+        <translation>Передній план</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="77"/>
+        <source>Background</source>
+        <translation>Тло</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
+        <source>Button</source>
+        <translation>Кнопка</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="78"/>
+        <source>Button Text</source>
+        <translation>Текст кнопки</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="101"/>
+        <source>Effects</source>
+        <translation>Ефекти</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
+        <source>Light</source>
+        <translation>Світлий</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
+        <source>Midlight</source>
+        <translation>Напівсвітлий</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
+        <source>Dark</source>
+        <translation>Темний</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="105"/>
+        <source>Mid</source>
+        <translation>Середній</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="127"/>
+        <source>Selections</source>
+        <translation>Позначення</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
+        <source>Highlight</source>
+        <translation>Підсвічування</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="131"/>
+        <source>Highlighted Text</source>
+        <translation>Підсвічений текст</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="148"/>
+        <source>Text effects</source>
+        <translation>Ефекти тексту</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
+        <source>Bright Text</source>
+        <translation>Світлий текст</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
+        <source>Link</source>
+        <translation>Пов&apos;язати</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="151"/>
+        <source>Link Visited</source>
+        <translation>Відвідане посилання</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="169"/>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
+        <source>Schema</source>
+        <translation>Схема</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
+        <source>Owner</source>
+        <translation>Власник</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="173"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="182"/>
+        <source>Save schema</source>
+        <translation>Зберегти схему</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="189"/>
+        <source>Style</source>
+        <translation>Стиль</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="193"/>
+        <source>Use this colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
+        <source>Name</source>
+        <translation>Назва</translation>
+    </message>
+    <message>
+        <location filename="../src/libui/tupthemeselector.cpp" line="282"/>
+        <source>Please choose a theme name</source>
+        <translation>Будь ласка, виберіть назву теми</translation>
+    </message>
+</context>
+<context>
+    <name>TupTimeLine</name>
+    <message>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="60"/>
+        <source>Time Line</source>
+        <translation>Монтажний стіл</translation>
+    </message>
+    <message>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="476"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="486"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="558"/>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="564"/>
+        <source>Frame %1</source>
+        <translation>Кадр %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="553"/>
+        <source>Layer %1</source>
+        <translation>Шар %1</translation>
+    </message>
+    <message>
+        <location filename="../src/components/timeline/tuptimeline.cpp" line="613"/>
+        <source>Scene %1</source>
+        <translation>Сцена %1</translation>
+    </message>
+</context>
+<context>
+    <name>TupToolStatus</name>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="46"/>
+        <location filename="../src/components/paintarea/tuptoolstatus.cpp" line="49"/>
+        <source>Current Tool</source>
+        <translation>Поточний інструмент</translation>
+    </message>
+</context>
+<context>
+    <name>TupToolsDialog</name>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="59"/>
+        <source>Pencil</source>
+        <translation>Олівець</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="67"/>
+        <source>Ink</source>
+        <translation>Чорнило</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="75"/>
+        <source>Polyline</source>
+        <translation>Ламана</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="83"/>
+        <source>Ellipse</source>
+        <translation>Еліпс</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="91"/>
+        <source>Rectangle</source>
+        <translation>Прямокутник</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="99"/>
+        <source>Object Selection</source>
+        <translation>Позначення об’єктів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="108"/>
+        <source>Nodes Selection</source>
+        <translation>Позначення лінії</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="116"/>
+        <source>Color Palette</source>
+        <translation>Палітра кольорів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="124"/>
+        <source>Pen Size</source>
+        <translation>Товщина пера</translation>
+    </message>
+    <message>
+        <location filename="../src/components/paintarea/tuptoolsdialog.cpp" line="132"/>
+        <source>Opacity Value</source>
+        <translation>Значення непрозорості</translation>
+    </message>
+</context>
+<context>
+    <name>TupTwitter</name>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="270"/>
+        <source>Latest version</source>
+        <translation type="unfinished">Найсвіжіша версія</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="271"/>
+        <source>Revision</source>
+        <translation type="unfinished">Модифікація</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="272"/>
+        <source>Code Name</source>
+        <translation type="unfinished">Кодова назва</translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="275"/>
+        <source>It&apos;s time to upgrade! Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/components/twitter/tuptwitter.cpp" line="279"/>
+        <source>Want to help us to make a better project? Click here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TupTwitterWidget</name>
+    <message>
+        <location filename="../src/components/twitter/tuptwitterwidget.cpp" line="47"/>
+        <source>News!</source>
+        <translation>Новини!</translation>
+    </message>
+</context>
+<context>
+    <name>TupViewColorCells</name>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="111"/>
+        <source>Default Palette</source>
+        <translation>Типова палітра</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="120"/>
+        <source>Named Colors</source>
+        <translation>Іменовані кольори</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="127"/>
+        <source>Custom Color Palette</source>
+        <translation>Нетипова палітра кольорів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="132"/>
+        <source>Custom Gradient Palette</source>
+        <translation>Нетипова палітра градієнтів</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="373"/>
+        <source>Add Color</source>
+        <translation>Додати колір</translation>
+    </message>
+    <message>
+        <location filename="../src/components/colorpalette/tupviewcolorcells.cpp" line="380"/>
+        <source>Remove Color</source>
+        <translation>Вилучити колір</translation>
+    </message>
+</context>
+<context>
+    <name>TupWebHunter</name>
+    <message>
+        <location filename="../src/libbase/tupwebhunter.cpp" line="101"/>
+        <source>Information Temporarily Unavailable</source>
+        <translation>Інформація тимчасово недоступна</translation>
+    </message>
+</context>
+<context>
+    <name>TweenManager</name>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="56"/>
+        <source>Create a new Tween</source>
+        <translation>Створити анімацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="131"/>
+        <source>Tween name already exists!</source>
+        <translation>Анімація з такою назвою вже існує!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="179"/>
+        <source>Edit</source>
+        <translation>Змінити</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="181"/>
+        <source>Remove</source>
+        <translation>Вилучити</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/common/tweenmanager.cpp" line="184"/>
+        <source>Options</source>
+        <translation>Параметри</translation>
+    </message>
+</context>
+<context>
+    <name>Tweener</name>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="101"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="239"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="243"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="527"/>
+        <source>Coloring Tween</source>
+        <translation>Анімація розфарбовування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="157"/>
+        <source>Coloring Tween can&apos;t be applied to raster images</source>
+        <translation>Анімацію з розфарбовування не можна застосовувати до растрових зображень</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="164"/>
+        <source>Coloring Tween can&apos;t be applied to SVG files</source>
+        <translation>Анімацію з розфарбовування не можна застосовувати до файлів SVG</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="241"/>
+        <source>Shift+C</source>
+        <translation>Shift+C</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="403"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="472"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="377"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="537"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="427"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="418"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="427"/>
+        <source>Tween name is missing!</source>
+        <translation>Не вказано назви анімації!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="505"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="619"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="480"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="654"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="533"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="523"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="540"/>
+        <source>Frame %1</source>
+        <translation>Кадр %1</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
+        <source>Info</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/color/tweener.cpp" line="516"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="635"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="491"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="665"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="544"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="535"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="551"/>
+        <source>Tween %1 applied!</source>
+        <translation>Застосовано анімацію %1!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="144"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="379"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="383"/>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="758"/>
+        <source>Compound Tween</source>
+        <translation>Комбінована анімація</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweener.cpp" line="381"/>
+        <source>Shift+X</source>
+        <translation>Shift+X</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="117"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="226"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="230"/>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="502"/>
+        <source>Opacity Tween</source>
+        <translation>Анімація зміни прозорості</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/opacity/tweener.cpp" line="228"/>
+        <source>Shift+O</source>
+        <translation>Shift+O</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="161"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="359"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="363"/>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="768"/>
+        <source>Position Tween</source>
+        <translation>Анімація розташовування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/position/tweener.cpp" line="361"/>
+        <source>Shift+W</source>
+        <translation>Shift+W</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="134"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="257"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="261"/>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="555"/>
+        <source>Rotation Tween</source>
+        <translation>Анімація обертання</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/rotation/tweener.cpp" line="259"/>
+        <source>Shift+R</source>
+        <translation>Shift+R</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="129"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="250"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="254"/>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="546"/>
+        <source>Scale Tween</source>
+        <translation>Анімація масштабування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/scale/tweener.cpp" line="252"/>
+        <source>Shift+S</source>
+        <translation>Shift+S</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="133"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="256"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="260"/>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="562"/>
+        <source>Shear Tween</source>
+        <translation>Анімація перекошування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/shear/tweener.cpp" line="258"/>
+        <source>Shift+H</source>
+        <translation>Shift+H</translation>
+    </message>
+</context>
+<context>
+    <name>TweenerPanel</name>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="84"/>
+        <source>Name</source>
+        <translation>Назва</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="119"/>
+        <source>Options</source>
+        <translation>Параметри</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="120"/>
+        <source>Select object</source>
+        <translation>Позначити об’єкт</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="121"/>
+        <source>Set Tweeners</source>
+        <translation>Встановити набори анімацій</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="145"/>
+        <source>Tweeners</source>
+        <translation>Набори анімацій</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Position</source>
+        <translation>Розташування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Rotation</source>
+        <translation>Обертання</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Scale</source>
+        <translation>Масштабування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Shear</source>
+        <translation>Перекошення</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Opacity</source>
+        <translation>Непрозорість</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="210"/>
+        <source>Coloring</source>
+        <translation>Зафарбовування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="275"/>
+        <source>Save Tween</source>
+        <translation>Зберегти анімацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="277"/>
+        <source>Cancel Tween</source>
+        <translation>Скасувати анімацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="369"/>
+        <source>Info</source>
+        <translation>Інформація</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="327"/>
+        <source>Select objects for Tweening first!</source>
+        <translation>Для анімування спочатку позначте об’єкти!</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="421"/>
+        <source>Update Tween</source>
+        <translation>Оновити анімацію</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenerpanel.cpp" line="423"/>
+        <source>Close Tween properties</source>
+        <translation>Властивості замикання анімації</translation>
+    </message>
+</context>
+<context>
+    <name>TweenerTable</name>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Position</source>
+        <translation>Розташування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Rotation</source>
+        <translation>Обертання</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Scale</source>
+        <translation>Масштабувати</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Shear</source>
+        <translation>Перекошення</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Opacity</source>
+        <translation>Непрозорість</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/compound/tweenertable.cpp" line="52"/>
+        <source>Coloring</source>
+        <translation>Зафарбовування</translation>
+    </message>
+</context>
+<context>
+    <name>VideoProperties</name>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="877"/>
+        <source>Set Animation Properties</source>
+        <translation>Встановити властивості анімації</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="889"/>
+        <source>Title</source>
+        <translation>Заголовок</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="890"/>
+        <source>My Video</source>
+        <translation>Мої відео</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="895"/>
+        <source>Topics</source>
+        <translation>Теми</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="896"/>
+        <source>#topic1 #topic2 #topic3</source>
+        <translation>#тема1 #тема2 #тема3</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="901"/>
+        <source>Description</source>
+        <translation>Опис</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="907"/>
+        <source>Just a little taste of my style :)</source>
+        <translation>Лише часточка мого стилю :)</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="968"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="988"/>
+        <source>Set a title for the picture here!</source>
+        <translation>Тут можна вказати заголовок зображення!</translation>
+    </message>
+    <message>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="975"/>
+        <location filename="../src/components/export/tupexportwidget.cpp" line="999"/>
+        <source>Set some topic tags for the picture here!</source>
+        <translation>Тут можна вказати мітки тем для зображення!</translation>
+    </message>
+</context>
+<context>
+    <name>ViewTool</name>
+    <message>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="103"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="108"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="145"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="241"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="263"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="336"/>
+        <source>Zoom In</source>
+        <translation>Збільшити</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="110"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="115"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="206"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="245"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="265"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="338"/>
+        <source>Zoom Out</source>
+        <translation>Зменшити</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="91"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="96"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="101"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="143"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="184"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="288"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="304"/>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="334"/>
+        <source>Shift</source>
+        <translation>Рука</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="104"/>
+        <source>Z</source>
+        <translation>Z</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="111"/>
+        <source>Shift+Z</source>
+        <translation>Shift+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/hand/viewtool.cpp" line="97"/>
+        <source>H</source>
+        <translation>H</translation>
+    </message>
+</context>
+<context>
+    <name>ZoomConfigurator</name>
+    <message>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="54"/>
+        <source>Scale Factor</source>
+        <translation>Коефіцієнт масштабування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="67"/>
+        <source>Tips</source>
+        <translation>Підказки</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
+        <source>Zoom Square mode</source>
+        <translation>Режим квадратного масштабування</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tools/hand/zoomconfigurator.cpp" line="74"/>
+        <source>Press Ctrl key + Mouse left button</source>
+        <translation>Натисніть клавішу Ctrl + ліва кнопка миші</translation>
+    </message>
+</context>
+</TS>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ca/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/ca/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/ca/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ca/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Fatal error" />
+	<Message text="Querido Animador:" color="red" />
+	<Button text="Cerrar" />
+	<Default text="Tupí se ha cerrado inesperadamente debido a una infame falla de programación! Estamos terriblemente apenados contigo :(&lt;br&gt;&lt;br&gt;Pero, no todo está perdido! Puedes potencialmente ayudarnos a mejorar el programa.&lt;br&gt;Por favor, realiza un reporte del error en &lt;a href=http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug &gt;http://maefloresta.com/&lt;/a&gt; para que nosotros podamos repararlo pronto. &lt;br&gt;&lt;br&gt;Muchas gracias,&lt;br&gt;&lt;br&gt;--El &lt;i&gt;apenado&lt;/i&gt; equipo de desarrollo :S" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ca/credits.xml tupi-0.2+git05/src/shell/data/xml/ca/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/ca/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ca/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,122 @@
+<xml>
+<credits>
+Tupí - Magia 2D Libre 
+Versión 0.2 git05 [ Código: Amandy ]
+
+http://www.maefloresta.com
+
+Desarrolladores 
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - Versión &#60; 0.9 
+
+Desarrolladores 
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Versión &#60;= 0.7 
+
+Desarrolladores
+   Simena Dinas 
+   Fernando Jose Roldán Correa 
+
+---------------------------- 
+Traductores 
+
+Alemán:
+   Alexander Greye
+
+Catalán: 
+   José Ángel Gallegos Gómez 
+   Edelweiss Garcia i Fuentes 
+
+Checo:
+   Pavel Fric
+
+Español: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+Inglés:
+   Tim Wootton
+
+Portugués: 
+   Alyne Castro 
+
+Ruso: 
+   Sergey Garkusha
+
+---------------------------- 
+Diseño Iconográfico 
+   Gustav Gonzalez
+
+----------------------------
+Port para MacOSX
+   Cristian Cepeda
+
+----------------------------
+Pruebas de Software
+   Gustavo Deveze 
+
+---------------------------- 
+Donantes Campaña Indiegogo (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare 
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+---------------------------- 
+Agradecimientos especiales a: 
+   Markus Bongard por su colaboración 
+   incondicional en este proyecto 
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Sueña como si fueras a vivir por siempre, 
+ vive como si fueras a morir hoy" 
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ca/license.html tupi-0.2+git05/src/shell/data/xml/ca/license.html
--- tupi-0.2+git04/src/shell/data/xml/ca/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ca/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ca/tips.xml tupi-0.2+git05/src/shell/data/xml/ca/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/ca/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ca/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,9 @@
+<TipOfDay>
+        <tip>Tupi is a Free Software project. Do you want to help us to make it better? From USD 1 you can make de difference, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;click here&lt;/a&gt; for more information!</tip>
+        <tip>Una vez abierto un proyecto, usando el atajo de teclado &lt;b&gt;F11&lt;/b&gt;, se puede visualizar el entorno de trabajo en &lt;b&gt;Pantalla Completa&lt;/b&gt;. Para retornar a la interfaz habitual, volver a presionar &lt;b&gt;F11&lt;/b&gt;.</tip>
+        <tip>Es posible acercar o alejar (zoom in / zoom out) el área de trabajo girando la rueda del ratón.</tip>
+        <tip>Eligiendo un color para el relleno desde el panel &lt;b&gt;Paleta de Colores&lt;/b&gt;, se pueden dibujar formas opacas con el color elegido. Para volver a obtener trazos sin relleno, hacer clic sobre el ícono que se encuentra junto a los cuadros de color de borde y relleno en el mismo panel.</tip> 
+        <tip>Seleccionando un marco y usando el atajo de teclado &lt;b&gt;Ctrl + Avpag&lt;/b&gt;, se obtiene una copia exacta de dicho marco en la posición siguiente. Es muy útil cuando se anima con la técnica de recorte (cutout) para desplazar un objeto paso a paso.</tip>
+        <tip>Con el atajo &lt;b&gt;Alt + R&lt;/b&gt; se activa la rotación del elemento seleccionado. Para restringir su giro, presionar la tecla &lt;b&gt;Shift&lt;/b&gt; durante la acción.</tip>
+        <tip>Clic derecho sobre el panel de la &lt;b&gt;Biblioteca&lt;/b&gt;, permite crear imágenes raster (mapa de bits) y svg desde programas externos como Gimp, Krita, MyPaint e Inkscape.</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/cs/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/cs/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/cs/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/cs/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Vážná chyba" />
+	<Message text="Drazí animátoři:" color="red" />
+	<Button text="Zavřít" />
+	<Default text="Tupi spadl kvůli ohavné chybě v programu! Je nám to velice líto:(&lt;br&gt;&lt;br&gt;Ale ještě není všechno ztraceno! Můžete nám pomoci při opravě příčin tohoto pádu.&lt;br&gt;Chybu, prosím, nahlašte na &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; a pomozte nám program udělat lepší.&lt;br&gt;&lt;br&gt;Díky,&lt;br&gt;&lt;br&gt;--Zahanbené &lt;i&gt;ashamed&lt;/i&gt; družstvo vývojářů" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/cs/credits.xml tupi-0.2+git05/src/shell/data/xml/cs/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/cs/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/cs/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,118 @@
+<xml>
+<credits>
+Tupi - Open 2D Magic
+Version 0.2 git05 [ Code Name: Amandy ]
+http://www.maefloresta.com
+
+Vývojáři
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - Verze &#60; 0.9 
+
+Vývojáři
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Verze &#60;= 0.7 
+
+Vývojáři
+   Simena Dinas 
+   Fernando Jose Roldan Correa 
+
+---------------------------- 
+Překladatelé
+
+Čeština: 
+   Pavel Fric
+
+Katalánština: 
+   José Ángel Gallegos Gómez
+   Edelweiss Garcia i Fuentes 
+
+Španělština: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+Portugalština: 
+   Alyne Castro 
+
+Ruština: 
+   Sergey Garkusha
+
+German: 
+   Alexander Greye 
+
+---------------------------- 
+Ikony
+   Gustav Gonzalez
+
+----------------------------
+MacOSX port
+   Cristian Cepeda
+
+----------------------------
+Software Tester
+   Gustavo Deveze
+
+----------------------------
+Indiegogo Crowdfunders (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+---------------------------- 
+Zvláštní poděkování: 
+   Markus Bongard za jeho bezpodmínečnou 
+   podporu tomuto projektu 
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Dream as if you'll live forever, 
+ live as if you'll die today"
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/cs/gpl.css tupi-0.2+git05/src/shell/data/xml/cs/gpl.css
--- tupi-0.2+git04/src/shell/data/xml/cs/gpl.css	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/cs/gpl.css	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,25 @@
+body {
+     background-color:#00ff00;
+}
+
+.title {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:underline;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:16px;
+     font-weight:bold;
+}
+
+.paragraph {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:none;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:14px;
+     font-weight:normal;
+}
diff -Nru tupi-0.2+git04/src/shell/data/xml/cs/license.html tupi-0.2+git05/src/shell/data/xml/cs/license.html
--- tupi-0.2+git04/src/shell/data/xml/cs/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/cs/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/cs/tips.xml tupi-0.2+git05/src/shell/data/xml/cs/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/cs/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/cs/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+<TipOfDay>
+        <tip>Tupi is a Free Software project. Do you want to help us to make it better? From USD 1 you can make de difference, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;click here&lt;/a&gt; for more information!</tip>
+	<tip>Můžete si vytvořit vlastní štětce výběrem volby &quot;Nástroje -> Štětce -> Tvar štětce&quot;.</tip>
+	<tip>Pokud v programu naleznete chyby, nebo máte nějaké návrhy týkající se Tupi, oznamte je, prosím, na &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>Pokud objevíte nějakou novou radu a budete ji chtít sdílet, dejte nám, prosím vědět na &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>Můžete si vybrat, jak se bude rozhraní Tupi chovat. Pokud dvakrát klepnete na jakýkoli název okna s nástrojem, ukotvené okno se změní v plovoucí okno</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/da/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/da/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/da/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/da/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Ødelæggende fejl" />
+	<Message text="Kære Animator:" color="red" />
+	<Button text="Luk" />
+	<Default text="Tupi gik ned på grund af en famøs software fejl! Det er vi meget kede af :(&lt;br&gt;&lt;br&gt;Men - alt er ikke tabt! Du kan hjælpe os med at fikse problemet.&lt;br&gt;Lav venligst en bug rapport på &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; og hjælp os med at lave et bedre program.&lt;br&gt;&lt;br&gt;Tak,&lt;br&gt;&lt;br&gt;--Det &lt;i&gt;flove&lt;/i&gt; udviklings team" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/da/credits.xml tupi-0.2+git05/src/shell/data/xml/da/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/da/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/da/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,124 @@
+<xml>
+<credits>
+Tupi - Open 2D Magic
+Version 0.2 git05 [ Code Name: Amandy ]
+http://www.maefloresta.com
+
+Udviklere
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - Version &#60; 0.9 
+
+Udviklere
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Version &#60;= 0.7 
+
+Udviklere
+   Simena Dinas 
+   Fernando Jose Roldan Correa 
+
+---------------------------- 
+Oversættere
+
+Catalansk: 
+   José Ángel Gallegos Gómez
+   Edelweiss Garcia i Fuentes 
+
+Tjekkisk:
+   Pavel Fric
+
+Engelsk:
+   Tim Wootton
+
+Tysk:
+   Alexander Greye
+
+Spansk: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+Portugisisk: 
+   Alyne Castro 
+
+Russisk: 
+   Sergey Garkusha
+
+Dansk:
+   David Lamhauge
+
+---------------------------- 
+Ikonografi
+   Gustav Gonzalez
+
+----------------------------
+MacOSX port 
+   Cristian Cepeda
+
+----------------------------
+Software Tester
+   Gustavo Deveze
+
+----------------------------
+Indiegogo Crowdfunders (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+---------------------------- 
+Speciel tak tel: 
+   Markus Bongard for hans uforbeholdne 
+   støtte til dette projekt 
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Dream as if you'll live forever, 
+ live as if you'll die today"
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/da/license.html tupi-0.2+git05/src/shell/data/xml/da/license.html
--- tupi-0.2+git04/src/shell/data/xml/da/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/da/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/da/tips.xml tupi-0.2+git05/src/shell/data/xml/da/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/da/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/da/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+<TipOfDay>
+        <tip>Tupi is a Free Software project. Do you want to help us to make it better? From USD 1 you can make de difference, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;click here&lt;/a&gt; for more information!</tip>
+	<tip>Du kan tilpasse penslerne ved at vælge &quot;Pen Egenskaber i venstre side&quot;.</tip>
+	<tip>Finder du fejl i programmet, eller har du forslag omkring Tupi, må du meget gerne sende dem til &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; så vi kan gøre Tupi bedre for alle.</tip>
+	<tip>Har du forslag til nyt tip, og vil dele det, så send det venligst til &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>Hvis du dobbeltklikker på hvilket som helst vindues titel, vil vinduet blive et flydende vindue.</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/de/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/de/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/de/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/de/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Schwerer Fehler" />
+	<Message text="Lieber Animator:" color="red" />
+	<Button text="Close" />
+	<Default text="Tupi ist wegen eines schwerwiegenden Softwarefehlers abgestuerzt! Wir bedauern dieses sehr! &lt;br;&gt;&lt;br&gt;Aber, noch ist nicht alles verloren! Sie koennen uns helfen diesen Fehler zu beseitigen.&lt;br&gt;Bitte senden Sie uns einen Fehlerreport an &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; und helfen Sie uns die Software zu verbessern.&lt;br&gt;&lt;br&gt;Vielen Dank,&lt;br&gt;&lt;br&gt;--Das &lt;i&gt;beschaemted&lt;/i&gt; Entwicklerteam" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/de/credits.xml tupi-0.2+git05/src/shell/data/xml/de/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/de/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/de/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,118 @@
+<xml>
+<credits>
+Tupi - Open 2D Magic
+Version 0.2 git05 [ Code Name: Amandy ]
+http://www.maefloresta.com
+
+Entwickler
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - Version &#60; 0.9 
+
+Entwickler
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Version &#60;= 0.7 
+
+Entwickler
+   Simena Dinas 
+   Fernando Jose Roldan Correa 
+
+---------------------------- 
+Uebersetzer
+
+Katalanisch: 
+   José Ángel Gallegos Gómez
+   Edelweiss Garcia i Fuentes 
+
+Spanisch: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+Portugiesisch: 
+   Alyne Castro 
+
+Russisch: 
+   Sergey Garkusha
+
+Tchechisch:
+   Pavel Fric
+
+Deutsch:  
+   Alexander Greye
+
+---------------------------- 
+Ikonografie
+   Gustav Gonzalez
+
+----------------------------
+MacOSX port
+   Cristian Cepeda 
+
+----------------------------
+Software Tester
+   Gustavo Deveze
+
+----------------------------
+Indiegogo Crowdfunders (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+---------------------------- 
+Speziellen Dank an: 
+   Markus Bongard fuer seine ausserordentliche 
+   Unterstuetzung dieses Projektes 
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Traeume als ob du fuer immer leben wuerdest, 
+ lebe als ob du heute sterben wuerdest"
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/de/gpl.css tupi-0.2+git05/src/shell/data/xml/de/gpl.css
--- tupi-0.2+git04/src/shell/data/xml/de/gpl.css	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/de/gpl.css	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,25 @@
+body {
+     background-color:#00ff00;
+}
+
+.title {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:underline;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:16px;
+     font-weight:bold;
+}
+
+.paragraph {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:none;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:14px;
+     font-weight:normal;
+}
diff -Nru tupi-0.2+git04/src/shell/data/xml/de/license.html tupi-0.2+git05/src/shell/data/xml/de/license.html
--- tupi-0.2+git04/src/shell/data/xml/de/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/de/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/de/tips.xml tupi-0.2+git05/src/shell/data/xml/de/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/de/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/de/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+<TipOfDay>
+        <tip>Tupi is a Free Software project. Do you want to help us to make it better? From USD 1 you can make de difference, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;click here&lt;/a&gt; for more information!</tip>
+	<tip>Sie koennen benutzerdefinierte Pinsel unter folgendem Menu-Punkt einstellen &quot;Werkzeuge -> Pinsel -> Pinselform&quot;.</tip>
+	<tip>Wenn Sie Fehler in dieser Software finden, oder Tips fuer die Entwicklung von Tupi haben, bitte senden Sie diese an &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>Wenn Sie einen neuen Trick entdecken und mit anderen teilen moechten, bitte lassen Sie uns es hier wissen &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>Die Benutzeroberflaeche von Tupi kann angepasst werden. Wenn Sie auf den Titel eines Werkzeugfensters doppelklicken, dann wird dieses Fenster abgedockt und kann frei bewegt werden. window.</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/en/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/en/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/en/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/en/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Fatal error" />
+	<Message text="Dear Animator:" color="red" />
+	<Button text="Close" />
+	<Default text="Tupi crashed due an infamous software bug! We're terribly sorry about this :(&lt;br&gt;&lt;br&gt;But, everything's not lost! You could potentially help us to fix the crash.&lt;br&gt;Please, make a bug report on &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; and help us to make a better software.&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;&lt;br&gt;--The &lt;i&gt;ashamed&lt;/i&gt; development team" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/en/credits.xml tupi-0.2+git05/src/shell/data/xml/en/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/en/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/en/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,125 @@
+<xml>
+<credits>
+Tupi - Open 2D Magic
+Version 0.2 git05 [ Code Name: Amandy ]
+http://www.maefloresta.com
+
+Developers
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - Version &#60; 0.9 
+
+Developers
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Version &#60;= 0.7 
+
+Developers
+   Simena Dinas 
+   Fernando Jose Roldan Correa 
+
+---------------------------- 
+Translators
+
+Catalan: 
+   José Ángel Gallegos Gómez
+   Edelweiss Garcia i Fuentes 
+
+Czech:
+   Pavel Fric
+
+English:
+   Tim Wootton
+
+German:
+   Alexander Greye
+
+Spanish: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+Portuguese: 
+   Alyne Castro 
+
+Russian: 
+   Sergey Garkusha
+
+Spanish:
+   Gustav Gonzalez
+   David A. Cuadrado
+
+---------------------------- 
+Iconography
+   Gustav Gonzalez
+
+----------------------------
+MacOSX port 
+   Cristian Cepeda
+
+----------------------------
+Software Tester
+   Gustavo Deveze 
+
+---------------------------- 
+Indiegogo Crowdfunders (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare 
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+----------------------------
+Special thanks to: 
+   Markus Bongard for his unconditional 
+   support to this project 
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Dream as if you'll live forever, 
+ live as if you'll die today"
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/en/gpl.css tupi-0.2+git05/src/shell/data/xml/en/gpl.css
--- tupi-0.2+git04/src/shell/data/xml/en/gpl.css	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/en/gpl.css	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,25 @@
+body {
+     background-color:#00ff00;
+}
+
+.title {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:underline;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:16px;
+     font-weight:bold;
+}
+
+.paragraph {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:none;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:14px;
+     font-weight:normal;
+}
diff -Nru tupi-0.2+git04/src/shell/data/xml/en/license.html tupi-0.2+git05/src/shell/data/xml/en/license.html
--- tupi-0.2+git04/src/shell/data/xml/en/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/en/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/en/tips.xml tupi-0.2+git05/src/shell/data/xml/en/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/en/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/en/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+<TipOfDay>
+        <tip>Tupi is a Free Software project. Do you want to help us to make it better? From USD 1 you can make de difference, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;click here&lt;/a&gt; for more information!</tip>
+	<tip>You can customise the brush by choosing &quot;Pen Properties in the left sidebar&quot;.</tip>
+	<tip>If you find bugs in this application, or you have suggestions about Tupi, we'd really like you to file them at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; to help us make Tupi better for everyone.</tip>
+	<tip>If you discover a new tip and you want to share it. Please, let us know at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>You can choose the behavior of the Tupi interface. If you double click on any tool window title, the docked window will change to a floating window.</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/es/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/es/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/es/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/es/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Fatal error" />
+	<Message text="Querido Animador:" color="red" />
+	<Button text="Cerrar" />
+	<Default text="Tupí se ha cerrado inesperadamente debido a una infame falla de programación! Estamos terriblemente apenados contigo :(&lt;br&gt;&lt;br&gt;Pero, no todo está perdido! Puedes potencialmente ayudarnos a mejorar el programa.&lt;br&gt;Por favor, realiza un reporte del error en &lt;a href=http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug &gt;http://maefloresta.com/&lt;/a&gt; para que nosotros podamos repararlo pronto. &lt;br&gt;&lt;br&gt;Muchas gracias,&lt;br&gt;&lt;br&gt;--El &lt;i&gt;apenado&lt;/i&gt; equipo de desarrollo :S" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/es/credits.xml tupi-0.2+git05/src/shell/data/xml/es/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/es/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/es/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,122 @@
+<xml>
+<credits>
+Tupí - Magia 2D Libre 
+Versión 0.2 git05 [ Código: Amandy ]
+
+http://www.maefloresta.com
+
+Desarrolladores 
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - Versión &#60; 0.9 
+
+Desarrolladores 
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Versión &#60;= 0.7 
+
+Desarrolladores
+   Simena Dinas 
+   Fernando Jose Roldán Correa 
+
+---------------------------- 
+Traductores 
+
+Alemán:
+   Alexander Greye
+
+Catalán: 
+   José Ángel Gallegos Gómez
+   Edelweiss Garcia i Fuentes 
+
+Checo:
+   Pavel Fric
+
+Español: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+Inglés:
+   Tim Wootton
+
+Portugués: 
+   Alyne Castro 
+
+Ruso: 
+   Sergey Garkusha
+
+---------------------------- 
+Diseño Iconográfico 
+   Gustav Gonzalez
+
+----------------------------
+Port para MacOSX
+   Cristian Cepeda
+
+----------------------------
+Pruebas de Software
+   Gustavo Deveze 
+
+---------------------------- 
+Donantes Campaña Indiegogo (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare 
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Vladimir Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+---------------------------- 
+Agradecimientos especiales a: 
+   Markus Bongard por su colaboración 
+   incondicional en este proyecto 
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Sueña como si fueras a vivir por siempre, 
+ vive como si fueras a morir hoy" 
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/es/license.html tupi-0.2+git05/src/shell/data/xml/es/license.html
--- tupi-0.2+git04/src/shell/data/xml/es/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/es/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/es/tips.xml tupi-0.2+git05/src/shell/data/xml/es/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/es/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/es/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,9 @@
+<TipOfDay>
+        <tip>Tupí es una iniciativa de Software Libre. Te gustaría convertirte en patrocinador de este proyecto? Donando desde 1 dólar puedes hacer la diferencia, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;Haz clic aquí&lt;/a&gt; para obtener más información!</tip>
+        <tip>Una vez abierto un proyecto, usando el atajo de teclado &lt;b&gt;F11&lt;/b&gt;, se puede visualizar el entorno de trabajo en &lt;b&gt;Pantalla Completa&lt;/b&gt;. Para retornar a la interfaz habitual, volver a presionar &lt;b&gt;F11&lt;/b&gt;.</tip>
+        <tip>Es posible acercar o alejar (zoom in / zoom out) el área de trabajo girando la rueda del ratón.</tip>
+        <tip>Eligiendo un color para el relleno desde el panel &lt;b&gt;Paleta de Colores&lt;/b&gt;, se pueden dibujar formas opacas con el color elegido. Para volver a obtener trazos sin relleno, hacer clic sobre el ícono que se encuentra junto a los cuadros de color de borde y relleno en el mismo panel.</tip> 
+        <tip>Seleccionando un marco y usando el atajo de teclado &lt;b&gt;Ctrl + Avpag&lt;/b&gt;, se obtiene una copia exacta de dicho marco en la posición siguiente. Es muy útil cuando se anima con la técnica de recorte (cutout) para desplazar un objeto paso a paso.</tip>
+        <tip>Con el atajo &lt;b&gt;Alt + R&lt;/b&gt; se activa la rotación del elemento seleccionado. Para restringir su giro, presionar la tecla &lt;b&gt;Shift&lt;/b&gt; durante la acción.</tip>
+        <tip>Clic derecho sobre el panel de la &lt;b&gt;Biblioteca&lt;/b&gt;, permite crear imágenes raster (mapa de bits) y svg desde programas externos como Gimp, Krita, MyPaint e Inkscape.</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/gl/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/gl/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/gl/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/gl/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Produciuse un erro fatal" />
+	<Message text="Querido animador:" color="red" />
+	<Button text="Pechar" />
+	<Default text="Tupí quebrou debido a una infame falla de programación! Estamos moi doidos por elo :(&lt;br&gt;&lt;br&gt;Mais non se perdeu todo! Podería axudarnos a mellorar o programa.&lt;br&gt;Envíenos un informe do erro empregando a páxina &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; para que poidamos arranxalo canto antes. &lt;br&gt;&lt;br&gt;Moitas grazas,&lt;br&gt;&lt;br&gt;--O &lt;i&gt;avergonzado&lt;/i&gt; equipo de desenvolvemento." image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/gl/credits.xml tupi-0.2+git05/src/shell/data/xml/gl/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/gl/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/gl/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,122 @@
+<xml>
+<credits>
+Tupí - Maxia 2D Libre 
+Versión 0.2 git05 [ Código: Amandy ]
+http://www.maefloresta.com
+
+Desenvolvedores 
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - Versión &#60; 0.9 
+
+Desenvolvedores 
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Versión &#60;= 0.7 
+
+Desenvolvedores
+   Simena Dinas 
+   Fernando Jose Roldán Correa 
+
+---------------------------- 
+Tradutores
+
+Alemán:
+   Alexander Greye
+
+Catalán:
+   José Ángel Gallegos Gómez
+   Edelweiss Garcia i Fuentes
+
+Checo:
+   Pavel Fric
+
+Galego:
+   Miguel Anxo Bouzada
+   Proxecto Trasno (trasno.net)
+
+Español:
+   Gustav Gonzalez
+   David A. Cuadrado
+
+Portugués:
+   Alyne Castro
+
+Ruso:
+   Sergey Garkusha
+
+---------------------------- 
+Deseño de iconas 
+   Gustav Gonzalez
+
+----------------------------
+Port para MacOSX
+   Cristian Cepeda
+
+----------------------------
+Pruebas de Software
+   Gustavo Deveze
+
+----------------------------
+Donantes Campaña Indiegogo (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Vladimir Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+---------------------------- 
+Agradecementos especiais a: 
+   Markus Bongard pola súa colaboración 
+   incondicional neste proyecto 
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Soña como se foses a vivir para sempre, 
+ vive como se foses a morrer hoxe" 
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/gl/gpl.css tupi-0.2+git05/src/shell/data/xml/gl/gpl.css
--- tupi-0.2+git04/src/shell/data/xml/gl/gpl.css	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/gl/gpl.css	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,25 @@
+body {
+     background-color:#00ff00;
+}
+
+.title {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:underline;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:16px;
+     font-weight:bold;
+}
+
+.paragraph {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:none;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:14px;
+     font-weight:normal;
+}
diff -Nru tupi-0.2+git04/src/shell/data/xml/gl/license.html tupi-0.2+git05/src/shell/data/xml/gl/license.html
--- tupi-0.2+git04/src/shell/data/xml/gl/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/gl/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/gl/tips.xml tupi-0.2+git05/src/shell/data/xml/gl/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/gl/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/gl/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+<TipOfDay>
+        <tip>Tupi is a Free Software project. Do you want to help us to make it better? From USD 1 you can make de difference, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;click here&lt;/a&gt; for more information!</tip>
+	<tip>Pode crear pinceis personalizados escollendo a opción &laquo;Ferramentas -> Pinceis -> Patrón&raquo;</tip>
+	<tip>Se atopa erros neste aplicativo, ou ten algunha suxestión sobre &lt;b&gt;Tupí&lt;/b&gt;, fáganolo saber en &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>Se descobre un novo truco e desexa compartilo coa comunidade de usuarios. Cóntenolo en &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>Pode escoller o comportamento da interface gráfica de &lt;b&gt;Tupí&lt;/b&gt;. Se preme dúas veces no título dunha xanela de ferramentas, a xanela incrustada converterase nun diálogo flotante</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ja/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/ja/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/ja/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ja/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="致命的なエラー" />
+	<Message text="アニメーターの方へ:" color="red" />
+	<Button text="閉じる" />
+	<Default text="Tupi はソフトウェアの重大なバグによりクラッシュしました！申し訳ありません :(&lt;br&gt;&lt;br&gt;ですが、すべての望みが失われたわけではありません！クラッシュの修正に寄与していただける可能性があります。&lt;br&gt;バグ報告を &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; までお送りいただき、ソフトウェアの改善に是非ご協力ください。&lt;br&gt;&lt;br&gt;--&lt;i&gt;ふがいない&lt;/i&gt;開発チームより" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ja/credits.xml tupi-0.2+git05/src/shell/data/xml/ja/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/ja/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ja/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,120 @@
+<xml>
+<credits>
+Tupi - オープン 2D マジック
+バージョン 0.2 git05 [ コードネーム: Amandy ]
+http://www.maefloresta.com
+
+開発者
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - バージョン &#60; 0.9 
+
+開発者
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+バージョン &#60;= 0.7 
+
+開発者
+   Simena Dinas 
+   Fernando Jose Roldan Correa 
+
+---------------------------- 
+翻訳者
+
+カタルーニャ語: 
+   José Ángel Gallegos Gómez
+   Edelweiss Garcia i Fuentes 
+
+チェコ語:
+   Pavel Fric
+
+英語:
+   Tim Wootton
+
+ドイツ語:
+   Alexander Greye
+
+スペイン語: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+ポルトガル語: 
+   Alyne Castro 
+
+ロシア語: 
+   Sergey Garkusha
+
+---------------------------- 
+アイコン作成
+   Gustav Gonzalez
+
+----------------------------
+MacOSX ポート
+   Cristian Cepeda
+
+----------------------------
+ソフトウェアテスター
+   Gustavo Deveze 
+
+---------------------------- 
+Indiegogo クラウドファンディング出資者 (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare 
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+----------------------------
+スペシャルサンクス: 
+   本プロジェクトに対する無条件のご支援を賜った Markus Bongard
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"永遠に生きるかのごとく夢を抱き、
+ 今日死ぬかのごとく生きよ"
+                                ジェームス・ディーン
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ja/license.html tupi-0.2+git05/src/shell/data/xml/ja/license.html
--- tupi-0.2+git04/src/shell/data/xml/ja/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ja/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ja/tips.xml tupi-0.2+git05/src/shell/data/xml/ja/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/ja/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ja/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+<TipOfDay>
+        <tip>Tupi はフリーソフトウェアプロジェクトです。改善のためのご寄付を 1 米ドルから歓迎しています。詳細については &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;click here&lt;/a&gt; をご覧ください！</tip>
+	<tip>左サイドバーの「ペンのプロパティ」で、ブラシをカスタマイズすることができます。</tip>
+	<tip>バグを発見したり、Tupi の仕様についてご提案がおありの場合は、Tupi の改善のため &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; にてご報告いただければ幸いです。</tip>
+	<tip>新しく発見した便利な使い方を共有したいという場合は、&lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; にて教えていただければ幸いです。</tip>
+	<tip>Tupi のインターフェースのふるまいは変更できます。ドッキングされたツールウィンドウは、タイトル部分をダブルクリックすることで独立させることができます。</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/pt/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/pt/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/pt/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/pt/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Erro fatal" />
+	<Message text="Caro Animador:" color="red" />
+	<Button text="Fechar" />
+	<Default text="Tupi parou devido a um bug de software infame! Estamos terrivelmente tristes com isso:(&lt;br&gt;&lt;br&gt;mas, nem tudo está perdido! Você poderia nos ajudar a corrigir o problema.&lt;br&gt;Por favor, faça um relatório de erros em &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; e nos ajude a facer um software melhor.&lt;br&gt;&lt;br&gt;Obrigado,&lt;br&gt;&lt;br&gt;--O &lt;i&gt;ashamed&lt;/i&gt; time de desenvolvimento" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/pt/credits.xml tupi-0.2+git05/src/shell/data/xml/pt/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/pt/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/pt/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,119 @@
+<xml>
+<credits>
+Tupí - Magia 2D Livre
+Versão  0.2 git05 [ Nome Código: Amandy ]
+http://www.maefloresta.com
+
+Desenvolvedores
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - Versão &#60; 0.9 
+
+Desenvolvedores
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Versão &#60;= 0.7 
+
+Desenvolvedores
+   Simena Dinas 
+   Fernando Jose Roldan Correa 
+
+---------------------------- 
+Tradutores
+
+Alemão:
+   Alexander Greye
+
+Catalão: 
+   José Ángel Gallegos Gómez
+   Edelweiss Garcia i Fuentes 
+
+Espanhol: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+Inglês
+   Tim Wootton
+
+Português: 
+   Alyne Castro 
+
+Russo: 
+   Sergey Garkusha
+
+Tcheco:
+   Pavel Fric
+
+---------------------------- 
+Iconografia
+   Gustav Gonzalez
+
+----------------------------
+Port para MacOSX
+   Cristian Cepeda
+
+----------------------------
+Teste de Software
+   Gustavo Deveze
+
+----------------------------
+Doadores Campanha Indiegogo (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare
+   Calvin Rawlings
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Vladimir Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+---------------------------- 
+Agradecimientos especiais a: 
+   Markus Bongard por seu apoio 
+   incondicional a este projeto
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Sonhar como se fosse viver para sempre,
+ viver como se fosse morrer hoje"
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/pt/gpl.css tupi-0.2+git05/src/shell/data/xml/pt/gpl.css
--- tupi-0.2+git04/src/shell/data/xml/pt/gpl.css	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/pt/gpl.css	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,25 @@
+body {
+     background-color:#00ff00;
+}
+
+.title {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:underline;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:16px;
+     font-weight:bold;
+}
+
+.paragraph {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:none;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:14px;
+     font-weight:normal;
+}
diff -Nru tupi-0.2+git04/src/shell/data/xml/pt/license.html tupi-0.2+git05/src/shell/data/xml/pt/license.html
--- tupi-0.2+git04/src/shell/data/xml/pt/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/pt/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/pt/tips.xml tupi-0.2+git05/src/shell/data/xml/pt/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/pt/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/pt/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+<TipOfDay>
+        <tip>Tupi é um projeto de Software Livre. Você quer nos ajudar a torná-lo melhor? A partir de 1 Dólar você pode fazer de diferença, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;clique aqui&lt;/a&gt; para mais informação!</tip>
+	<tip>Você pode personalizar o pincel, escolhendo &quot; Propriedades da caneta na barra lateral esquerda&quot;.</tip>
+	<tip>Se você encontrar falhas no aplicativo, ou se você tem sugestões sobre Tupi, nós realmente gostaríamos que você nos reportasse em &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; para nos ajudar a fazer o Tupi melhor para todos.</tip>
+	<tip>Se você descobrir uma nova dica e quiser compartilhá-la, por favor, deixe-nos saber em &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>Você pode escolher o comportamento da interface do Tupi. Se você clicar duas vezes no título de qualquer janela de ferramenta, a janela ancorada mudará para uma janela flutuante.</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ru/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/ru/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/ru/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ru/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Fatal error" />
+	<Message text="Dear Animator:" color="red" />
+	<Button text="Close" />
+	<Default text="Tupi crashed due an infamous software bug! We're terribly sorry about this :(&lt;br&gt;&lt;br&gt;But, everything's not lost! You could potentially help us to fix the crash.&lt;br&gt;Please, make a bug report on &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; and help us to make a better software.&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;&lt;br&gt;--The &lt;i&gt;ashamed&lt;/i&gt; development team" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ru/credits.xml tupi-0.2+git05/src/shell/data/xml/ru/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/ru/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ru/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,118 @@
+<xml>
+<credits>
+Tupi - Open 2D Magic
+Version 0.2 git05 [ Code Name: Amandy ]
+http://www.maefloresta.com
+
+Developers
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN - Version &#60; 0.9 
+
+Developers
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Version &#60;= 0.7 
+
+Developers
+   Simena Dinas 
+   Fernando Jose Roldan Correa 
+
+---------------------------- 
+Translators
+
+Catalan: 
+   José Ángel Gallegos Gómez
+   Edelweiss Garcia i Fuentes 
+
+Spanish: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+Portuguese: 
+   Alyne Castro 
+
+Russian: 
+   Sergey Garkusha
+
+Czech:
+   Pavel Fric
+
+German:  
+   Alexander Greye
+
+---------------------------- 
+Iconography
+   Gustav Gonzalez
+
+----------------------------
+MacOSX support
+   Cristian Cepeda
+
+----------------------------
+Software Tester
+   Gustavo Deveze
+
+----------------------------
+Indiegogo Crowdfunders (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+---------------------------- 
+Special thanks to: 
+   Markus Bongard for his unconditional 
+   support to this project 
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Dream as if you'll live forever, 
+ live as if you'll die today"
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ru/gpl.css tupi-0.2+git05/src/shell/data/xml/ru/gpl.css
--- tupi-0.2+git04/src/shell/data/xml/ru/gpl.css	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ru/gpl.css	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,25 @@
+body {
+     background-color:#00ff00;
+}
+
+.title {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:underline;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:16px;
+     font-weight:bold;
+}
+
+.paragraph {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:none;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:14px;
+     font-weight:normal;
+}
diff -Nru tupi-0.2+git04/src/shell/data/xml/ru/license.html tupi-0.2+git05/src/shell/data/xml/ru/license.html
--- tupi-0.2+git04/src/shell/data/xml/ru/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ru/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/ru/tips.xml tupi-0.2+git05/src/shell/data/xml/ru/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/ru/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/ru/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+<TipOfDay>
+        <tip>Tupi is a Free Software project. Do you want to help us to make it better? From USD 1 you can make de difference, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;click here&lt;/a&gt; for more information!</tip>
+	<tip>You can customise the brush by choosing &quot;Pen Properties in the left sidebar&quot;.</tip>
+	<tip>If you find bugs in this application, or you have suggestions about Tupi, we'd really like you to file them at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt; to help us make Tupi better for everyone.</tip>
+	<tip>If you discover a new tip and you want to share it. Please, let us know at &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>You can choose the behavior of the Tupi interface. If you double click on any tool window title, the docked window will change to a floating window.</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/data/xml/uk/crashhandler.xml tupi-0.2+git05/src/shell/data/xml/uk/crashhandler.xml
--- tupi-0.2+git04/src/shell/data/xml/uk/crashhandler.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/uk/crashhandler.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,6 @@
+<CrashHandler>
+	<Title text="Критична помилка" />
+	<Message text="Шановний художнику," color="red" />
+	<Button text="Закрити" />
+	<Default text="Tupi завершила роботу через прикру помилку у програмному коді! Ми дуже про це шкодуємо :(&lt;br&gt;&lt;br&gt;Але не варто занепадати духом! Ви можете допомогти нам виправити цю помилку.&lt;br&gt;Будь ласка, створіть повідомлення про ваду за допомогою сторінки &lt;a href='http://www.maefloresta.com/portal/project/issues?projects=&status=Open&priorities=All&categories=bug'&gt;http://maefloresta.com/&lt;/a&gt; і допоможіть нам у покращенні програми.&lt;br&gt;&lt;br&gt;Дякуємо,&lt;br&gt;&lt;br&gt;--Щиро ваша команда розробників" image="crash.png" />
+</CrashHandler>
diff -Nru tupi-0.2+git04/src/shell/data/xml/uk/credits.xml tupi-0.2+git05/src/shell/data/xml/uk/credits.xml
--- tupi-0.2+git04/src/shell/data/xml/uk/credits.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/uk/credits.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,123 @@
+<xml>
+<credits>
+Tupi — відкрите малювання на площині
+Версія 0.2 git03 [ Кодова назва: Aram ]
+http://www.maefloresta.com
+
+Розробники
+   Gustav Gonzalez &#60;info@maefloresta.com&#62; 
+
+KTooN — версія &#60; 0.9 
+
+Розробники
+   David A. Cuadrado 
+   Jorge H. Cuadrado 
+
+Версія &#60;= 0.7 
+
+Розробники
+   Simena Dinas 
+   Fernando Jose Roldan Correa 
+
+---------------------------- 
+Перекладачі
+
+Каталанською: 
+   Edelweiss Garcia i Fuentes 
+
+Чеською:
+   Pavel Fric
+
+Англійською:
+   Tim Wootton
+
+Німецькою:
+   Alexander Greye
+
+Іспанською: 
+   Gustav Gonzalez 
+   David A. Cuadrado 
+
+Португальською: 
+   Alyne Castro 
+
+Російською: 
+   Sergey Garkusha
+
+Українською:
+   Юрій Чорноіван
+
+---------------------------- 
+Іконографія
+   Gustav Gonzalez
+
+----------------------------
+Порт на MacOSX 
+   Cristian Cepeda
+
+----------------------------
+Software Tester
+   Gustavo Deveze
+
+----------------------------
+Indiegogo Crowdfunders (2014)
+   alexn83
+   Algot Runeman
+   Antonio Vanegas
+   callumgare
+   Calvin Rawlings
+   Camilo Mauricio Valenzuela
+   Carlos Andres Narvaez Barboza
+   Carved Prints
+   Denver Gingerich
+   Diana Salazar
+   Don Smith
+   Dvid Silva
+   Fernando Castro
+   fill_io
+   Fundación CorreLibre
+   Gelon1954
+   Gloria Meneses
+   hperticarati
+   itronic
+   Jairo Serrano
+   Jean Amaral
+   jimr1603
+   Joe Mcjoe
+   Kala
+   Katherine Cancelado
+   Leonardo Urrego
+   Luis Alejandro Bernal
+   Massimo D'Ambrogio
+   Matt Williams
+   Mreethmandir Gunjan Kumar Roy
+   Mike Linksvayer
+   Nelson Castillo
+   Nexxo International Group
+   Nikolardo Flamingo
+   Offray Luna
+   Oisín Mac Fhearaí
+   ragnarsun
+   redy1
+   richard0595
+   Rita Geraghty
+   Stephen Egts
+   Thiago Kolb
+   volt_storm_7
+   Xabier Villar
+
+---------------------------- 
+Особливі подяки: 
+   Markus Bongard за його безкорисливу 
+   підтримку цього проекту 
+
+----------------------------
+Mae Floresta 
+www.maefloresta.com 
+2010
+
+"Dream as if you'll live forever, 
+ live as if you'll die today"
+                                James Dean 
+</credits>
+</xml>
diff -Nru tupi-0.2+git04/src/shell/data/xml/uk/gpl.css tupi-0.2+git05/src/shell/data/xml/uk/gpl.css
--- tupi-0.2+git04/src/shell/data/xml/uk/gpl.css	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/uk/gpl.css	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,25 @@
+body {
+     background-color:#00ff00;
+}
+
+.title {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:underline;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:16px;
+     font-weight:bold;
+}
+
+.paragraph {
+     margin-left:10px;
+     color:#000000;
+     text-align:left;
+     text-decoration:none;
+     font-family:"Times New Roman", Times, serif;
+     font-style:normal;
+     font-size:14px;
+     font-weight:normal;
+}
diff -Nru tupi-0.2+git04/src/shell/data/xml/uk/license.html tupi-0.2+git05/src/shell/data/xml/uk/license.html
--- tupi-0.2+git04/src/shell/data/xml/uk/license.html	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/uk/license.html	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,354 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="gpl.css" />
+</head>
+<body>
+<center><b>GNU GENERAL PUBLIC LICENSE</b></center>
+<center><b>Version 2, June 1991</b></center>
+<p align="justify">
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</p>
+<center><b>Preamble</b></center>
+<p align="justify">
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</p><p align="justify">
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p><p align="justify">
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p><p align="justify">
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p><p align="justify">
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p><p align="justify">
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p><p align="justify">
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p><p align="justify">
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p><p align="justify">
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+</p><p align="justify">
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p><p align="justify">
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p><p align="justify">
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p><p align="justify">
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p><p align="justify">
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p><p align="justify">
+<ul>
+<li>
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</li><li>
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</li><li>
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</li>
+</ul>
+</p><p align="justify">
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p><p align="justify">
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p><p align="justify">
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p><p align="justify">
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p><p align="justify">
+<ul>
+<li>
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</li><li>
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</li><li>
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</li>
+</ul>
+</p><p align="justify">
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p><p align="justify">
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p><p align="justify">
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p><p align="justify">
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p><p align="justify">
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p><p align="justify">
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p><p align="justify">
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p><p align="justify">
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p><p align="justify">
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p><p align="justify">
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p><p align="justify">
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p><p align="justify">
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p><p align="justify">
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p><p align="justify">
+			    NO WARRANTY
+</p><p align="justify">
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p><p align="justify">
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p><p align="justify">
+		     END OF TERMS AND CONDITIONS
+</p><p align="justify">
+	    How to Apply These Terms to Your New Programs
+</p><p align="justify">
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</p><p align="justify">
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</p><p align="justify">
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+</p><p align="justify">
+Also add information on how to contact you by electronic and paper mail.
+</p><p align="justify">
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</p><p align="justify">
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</p><p align="justify">
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</p><p align="justify">
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</p><p align="justify">
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</p><p align="justify">
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+</p><p align="justify">
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</p>
+</body>
diff -Nru tupi-0.2+git04/src/shell/data/xml/uk/tips.xml tupi-0.2+git05/src/shell/data/xml/uk/tips.xml
--- tupi-0.2+git04/src/shell/data/xml/uk/tips.xml	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/shell/data/xml/uk/tips.xml	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+<TipOfDay>
+        <tip>Tupi is a Free Software project. Do you want to help us to make it better? From USD 1 you can make de difference, &lt;a href=&quot;http://www.maefloresta.com/portal/donations&quot;&gt;click here&lt;/a&gt; for more information!</tip>
+	<tip>Налаштувати пензель можна за допомогою пункту «Властивості пензля» на лівій бічній панелі.</tip>
+	<tip>Якщо ви знайдете у цій програмі вади або у вас з’явиться пропозиції щодо Tupi, створіть звіт щодо вади чи вашої пропозиції за допомогою сторінки &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;. Це допоможе у покращенні Tupi для усіх користувачів.</tip>
+	<tip>Якщо ви маєте якийсь рецепт роботи і хочете ним поділитися, надішліть ваше повідомлення за допомогою сторінки &lt;a href=&quot;http://www.maefloresta.com/portal&quot;&gt;http://www.maefloresta.com/portal&lt;/a&gt;</tip>
+	<tip>Ви можете змінити компонування інтерфейсу Tupi. Якщо ви двічі клацнете на заголовку будь-якого з вікон інструментів, пришвартоване вікно перетвориться на вікно, яке можна рухати довільним чином.</tip>
+</TipOfDay>
diff -Nru tupi-0.2+git04/src/shell/main.cpp tupi-0.2+git05/src/shell/main.cpp
--- tupi-0.2+git04/src/shell/main.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/main.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -37,12 +37,16 @@
 #include "tupmainwindow.h"
 #include "tuptwitter.h"
 #include "tapplicationproperties.h"
-#include "tdebug.h"
 #include "tcollapsiblewidget.h"
 
-#ifdef Q_OS_UNIX
+#ifdef K_DEBUG
+#ifdef Q_OS_WIN32
+#include <QDebug>
+#else
+#include "tdebug.h"
 #include "tupcrashhandler.h"
 #endif
+#endif
 
 #ifdef ENABLE_TUPISTYLE
 #include "twaitstyle.h"
@@ -74,14 +78,13 @@
     TupApplication application(argc, argv);
     QString slash = QDir::separator();
 
-#ifdef K_DEBUG
-       TDebug::setOutputChannel();
-#endif
-
 #ifdef Q_OS_UNIX
+#ifdef K_DEBUG
+    TDebug::setOutputChannel();
     // Initializing the crash handler, very useful to catch bugs
     TupCrashHandler::init();
 #endif
+#endif
 
     // Setting the current version for Tupi
     kAppProp->setVersion(VERSION);
@@ -103,9 +106,36 @@
         #else
             TCONFIG->setValue("Home", QString::fromLocal8Bit(::getenv("TUPI_HOME")));
         #endif
-        TCONFIG->setValue("Cache", QDir::tempPath());
+        
+        #ifdef Q_OS_WIN32
+            if (QSysInfo::windowsVersion() == QSysInfo::WV_XP) {
+                QDir dir("C:\temp");
+                if (!dir.exists()) {
+                    if (!dir.mkdir("C:\temp")) {
+                        #ifdef K_DEBUG
+                            qDebug() << "main.cpp - Fatal error: WinXP issue!";
+                        #endif
+                        return 0;
+                    }
+                }
+                TCONFIG->setValue("Cache", QDir::tempPath());
+            } else {
+                TCONFIG->setValue("Cache", QDir::tempPath());
+            }
+        #else
+                TCONFIG->setValue("Cache", QDir::tempPath());    
+        #endif
     }
 
+#ifdef K_DEBUG
+    QString debug = "main.cpp - CACHE path: " + TCONFIG->value("Cache").toString();
+    #ifdef Q_OS_WIN32
+        qWarning() << debug;
+    #else
+        tWarning() << debug;
+    #endif
+#endif
+    
 #if defined(Q_OS_MAC)
     kAppProp->setHomeDir(TCONFIG->value("Home").toString());
     kAppProp->setBinDir(appDirPath.absolutePath());
@@ -119,48 +149,73 @@
 #endif
 
     QString locale = QString(QLocale::system().name()).left(2);
-
     if (locale.length() < 2)
         locale = "en";
 
-    QDir dir(kAppProp->shareDir() + "data" + slash + locale + slash);
-    if (! dir.exists())
-        kAppProp->setDataDir(kAppProp->shareDir() + "data" + slash + "en" + slash);
+#ifdef Q_OS_WIN32
+    QString xmlDir = kAppProp->shareDir() + "xml" + slash;
+#else
+    QString xmlDir = kAppProp->shareDir() + "data" + slash + "xml" + slash;
+#endif
+    QDir dir(xmlDir + locale + slash);
+    if (!dir.exists())
+        kAppProp->setDataDir(xmlDir + "en" + slash);
     else
-        kAppProp->setDataDir(kAppProp->shareDir() + "data" + slash + locale + slash);
-
+        kAppProp->setDataDir(xmlDir + locale + slash);
+        
     kAppProp->setThemeDir(kAppProp->shareDir() + "themes" + slash + "default" + slash);
 
     // Setting the repository directory (where the projects are saved)
     application.createCache(TCONFIG->value("Cache").toString());
 
-    // SQA: Temporarily disabled until starting the port to Qt5
     // Downloading maefloresta Twitter status
-    // Tupwitter *twitter = new Tupwitter();
-    // twitter->start();
+    TupTwitter *twitter = new TupTwitter();
+    twitter->start();
 
     QStyle *style = QStyleFactory::create("fusion");
     QApplication::setStyle(style);
 
-    // Loading localization files... now you got Tupi in your native language
-
-    QTranslator *translator = new QTranslator;
-    translator->load(kAppProp->shareDir() + "data" + slash + "translations" + slash + "tupi_" + locale + ".qm");
-    application.installTranslator(translator);
+    if ((locale.compare("en") != 0) && ((locale.compare("es") == 0) || (locale.compare("pt") == 0))) {
+        #ifdef Q_OS_WIN32
+            QString langFile = kAppProp->shareDir() + "translations" + slash + "tupi_" + locale + ".qm";
+        #else
+            QString langFile = kAppProp->shareDir() + "data" + slash + "translations" + slash + "tupi_" + locale + ".qm";
+        #endif
+        if (QFile::exists(langFile)) {
+            // Loading localization files...
+            QTranslator *translator = new QTranslator;
+            translator->load(langFile);
+            application.installTranslator(translator);
+        } else {
+            #ifdef K_DEBUG
+                QString msg = "main.cpp - Error: Can't open file -> " + langFile;
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif    
+        }
+    }
 
     TupMainWindow mainWindow(argc);
     mainWindow.showMaximized();
 
     // Looking for plugins for Tupi
     #ifdef K_DEBUG
-           tWarning() << "main.cpp - Loading plugins from: " << kAppProp->pluginDir();
+        QString msg = "main.cpp - Loading plugins from: " + kAppProp->pluginDir();
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
     #endif
     QApplication::addLibraryPath(kAppProp->pluginDir());
 
     // Loading visual components required for the Crash Handler
-    #ifdef Q_OS_UNIX
-           CHANDLER->setConfig(DATA_DIR + "crashhandler.xml");
-           CHANDLER->setImagePath(THEME_DIR + "icons/");
+    #if defined(Q_OS_UNIX) && defined(K_DEBUG)
+        CHANDLER->setConfig(DATA_DIR + "crashhandler.xml");
+        CHANDLER->setImagePath(THEME_DIR + "icons/");
     #endif
 
     // If there is a second argument, it means to open a project from the command line
diff -Nru tupi-0.2+git04/src/shell/shell_config.pri tupi-0.2+git05/src/shell/shell_config.pri
--- tupi-0.2+git04/src/shell/shell_config.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/shell_config.pri	2014-12-15 14:21:34.000000000 +0000
@@ -1,24 +1,24 @@
 
 QT += xml opengl svg
 
+INCLUDEPATH += ../plugins/tools/selection
+
 COLORPALETTE_DIR = ../components/colorpalette
 ANIMATION_DIR = ../components/animation
 PAINTAREA_DIR = ../components/paintarea
 PEN_DIR = ../components/pen
-KINAS_DIR = ../components/kinas 
+# KINAS_DIR = ../components/kinas 
 HELP_DIR = ../components/help 
 IMPORT_DIR = ../components/import 
 EXPORT_DIR = ../components/export 
 EXPOSURE_DIR = ../components/exposure 
 TIMELINE_DIR = ../components/timeline 
-DEBUG_DIR = ../components/debug
 LIBRARY_DIR = ../components/library
 SCENES_DIR = ../components/scenes 
 TWITTER_DIR = ../components/twitter
 LIBUI_DIR = ../libui
 STORE_DIR = ../store 
 LIBTUPI_DIR = ../libtupi
-# QUAZIP_DIR = ../../3rdparty/quazip 
 LIBBASE_DIR = ../libbase
 NET_DIR = ../net
 
@@ -26,20 +26,22 @@
 include($$PAINTAREA_DIR/paintarea.pri)
 include($$ANIMATION_DIR/animation.pri)
 include($$PEN_DIR/pen.pri)
-include($$KINAS_DIR/kinas.pri)
+# include($$KINAS_DIR/kinas.pri)
 include($$HELP_DIR/help.pri)
 include($$IMPORT_DIR/import.pri)
 include($$EXPORT_DIR/export.pri)
 include($$EXPOSURE_DIR/exposure.pri)
 include($$TIMELINE_DIR/timeline.pri)
-include($$DEBUG_DIR/debug.pri)
 include($$LIBRARY_DIR/library.pri)
 include($$SCENES_DIR/scenes.pri)
 include($$TWITTER_DIR/twitter.pri)
 include($$LIBUI_DIR/libui.pri)
 include($$STORE_DIR/store.pri)
 include($$LIBTUPI_DIR/libtupi.pri)
-# include($$QUAZIP_DIR/quazip.pri)
 include($$LIBBASE_DIR/libbase.pri)
 include($$NET_DIR/net.pri)
 
+unix {
+    DEBUG_DIR = ../components/debug
+    include($$DEBUG_DIR/debug.pri)
+}
diff -Nru tupi-0.2+git04/src/shell/shell.pro tupi-0.2+git05/src/shell/shell.pro
--- tupi-0.2+git04/src/shell/shell.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/shell.pro	2014-12-15 14:21:34.000000000 +0000
@@ -1,4 +1,6 @@
-# src/shell/shell.pro
+QT += opengl core gui svg xml network
+QT += multimedia multimediawidgets printsupport
+QT += widgets
 
 macx {
     CONFIG += console static
@@ -23,7 +25,6 @@
 }
 
 unix:!mac {
-
     INSTALLS += tupidata \
                 launcher \
                 mime \
@@ -65,17 +66,12 @@
     TARGET = ../../bin/tupi.bin
 }
 
-# TRANSLATIONS += data/translations/tupi_es.ts \
-#                 data/translations/tupi_ca.ts \
-#                 data/translations/tupi_ru.ts \
-#                 data/translations/tupi_cs.ts
-
 HEADERS += tupmainwindow.h \
            tupstatusbar.h \
            tupnewproject.h \
            # tupsplash.h \
-           tupcrashhandler.h \
-           tupcrashwidget.h \
+           # tupcrashhandler.h \
+           # tupcrashwidget.h \
            tupapplication.h \
            tuplocalprojectmanagerhandler.h
 
@@ -84,36 +80,36 @@
            tupstatusbar.cpp \
            tupnewproject.cpp \
            # tupsplash.cpp \
-           tupcrashhandler.cpp \
-           tupcrashwidget.cpp \
+           # tupcrashhandler.cpp \
+           # tupcrashwidget.cpp \
            tupapplication.cpp \
            tupmainwindow_gui.cpp \
            tuplocalprojectmanagerhandler.cpp
 
+unix {
+    HEADERS += tupcrashhandler.h \
+               tupcrashwidget.h
+    SOURCES += tupcrashhandler.cpp \
+               tupcrashwidget.cpp 
+}
+		   		   
 CONFIG += warn_on
 TEMPLATE = app
 
-linux-g{
-    TARGETDEPS += ../libtupi/libtupi.so \
-  ../libui/libtupiui.so \
-  ../store/libtupistore.so \
-  ../net/libtupinet.so \
-  ../components/paintarea/libtupipaintarea.so \
-  ../components/pen/libtupipen.so \
-  ../components/kinas/libtupikinas.so \
-  ../components/help/libtupihelp.so \
-  ../components/import/libtupimport.so \
-  ../components/export/libtupiexport.so \
-  ../components/exposure/libtupiexposure.so \
-  ../components/timeline/libtupitimeline.so \
-  ../components/library/libtupilibrary.so \
-  ../components/colorpalette/libtupicolorpalette.so \
-  ../components/scenes/libtupiscenes.so \
-  ../components/twitter/libtupitwitter.so
-}
-
 FRAMEWORK_DIR = ../framework
 include($$FRAMEWORK_DIR/framework.pri)
-include(shell_config.pri)
 
-include(../../tupiglobal.pri)
+unix {
+    !include(../../tupiglobal.pri) {
+        error("Please run configure first")
+    }
+}
+
+win32 {
+    TARGET = tupi
+    DEFINES += VERSION=\\\"0.2\\\" CODE_NAME=\\\"Amandy\\\" REVISION=\\\"git05\\\"
+    include(../../win.pri)
+    include(../../quazip.win.pri)
+}
+
+include(shell_config.pri)
diff -Nru tupi-0.2+git04/src/shell/tupapplication.cpp tupi-0.2+git05/src/shell/tupapplication.cpp
--- tupi-0.2+git04/src/shell/tupapplication.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupapplication.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,10 +35,6 @@
 
 #include "tupapplication.h"
 #include "tapplicationproperties.h"
-#include "tdebug.h"
-
-#include <QDesktopWidget>
-#include <QRect>
 
 /**
  * Support Class for main.cpp
@@ -54,55 +50,36 @@
 TupApplication::~TupApplication()
 {
     #ifdef K_DEBUG
-           qDebug("[Destroying ~TupApplication]");
+        QString msg = "[Destroying ~TupApplication]";
+        #ifdef Q_OS_WIN32
+           qDebug() << msg;
+        #else
+           tDebug() << msg;
+        #endif
     #endif
 }
 
-bool TupApplication::firstRun()
-{
-    /*
-    QDesktopWidget *screen = QApplication::desktop();
-    int screenW = screen->width();     // returns desktop width
-    int screenH = screen->height();    // returns desktop height
-
-    ConfigWizard *firstDialog = new ConfigWizard();
-    QRect size = firstDialog->frameGeometry();
-    int configH = size.height();
-    int configW = size.width(); 
-    firstDialog->move((screenW-configW)/2, (screenH-configH)/2);
-
-    QApplication::setActiveWindow(firstDialog);
-
-    if (firstDialog->exec() != QDialog::Rejected) {
-        kAppProp->setHomeDir(firstDialog->home());
-        createCache(firstDialog->cache());
-
-        TCONFIG->beginGroup("General");
-        TCONFIG->setValue("Home", HOME_DIR);
-        TCONFIG->setValue("Cache", CACHE_DIR);
-        TCONFIG->sync();
-
-        delete firstDialog;
-
-        return true;
-    }
-    delete firstDialog;
-    */
-
-    return false;
-}
-
 void TupApplication::createCache(const QString &cacheDir)
 {
     QDir cache(cacheDir);
     if (!cache.exists()) {
         #ifdef K_DEBUG
-               tWarning() << "Initializing repository: " << cacheDir;
+            QString msg = "Initializing repository: " + cacheDir;
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
 
        if (!cache.mkdir(cacheDir)) {
            #ifdef K_DEBUG
-                  tError() << "TupApplication::createCache() - Fatal Error: Can't create project repository";
+               QString msg = "TupApplication::createCache() - Fatal Error: Can't create project repository";
+               #ifdef Q_OS_WIN32
+                   qDebug() << msg;
+               #else
+                   tError() << msg;
+               #endif
            #endif
        }
     }
diff -Nru tupi-0.2+git04/src/shell/tupapplication.h tupi-0.2+git05/src/shell/tupapplication.h
--- tupi-0.2+git04/src/shell/tupapplication.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupapplication.h	2014-12-15 14:21:34.000000000 +0000
@@ -38,6 +38,19 @@
 
 #include "tapplication.h"
 
+#ifdef K_DEBUG
+
+#ifdef Q_OS_WIN32
+#include <QDebug>
+#else
+#include "tdebug.h"
+#endif
+
+#endif
+
+#include <QDesktopWidget>
+#include <QRect>
+
 /**
  * Support Class for main.cpp
  * This class contains some of the basic methods required when Tupi is launched
@@ -55,17 +68,6 @@
     public slots:
         /**
          * @if english
-         * Open a settings wizard the first time Tupi is launched
-         * @endif
-         * @if spanish
-         * Lanza un wizard de configuracion la primera vez que se inicia la aplicacion
-         * @endif
-         * @return true/false if the application has the settings file created
-         */
-         virtual bool firstRun();
-
-        /**
-         * @if english
          * Create a cache directory with the path defined at cacheDir variable
          * @endif
          * @if spanish
diff -Nru tupi-0.2+git04/src/shell/tupcrashhandler.cpp tupi-0.2+git05/src/shell/tupcrashhandler.cpp
--- tupi-0.2+git04/src/shell/tupcrashhandler.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupcrashhandler.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -33,36 +33,17 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#include <QString>
-#include <QApplication>
-#include <QDomDocument>
-#include <QFile>
-#include <QTemporaryFile>
-#include <QProcess>
-#include <QTranslator>
-#include <QDesktopWidget>
-
-#include <csignal>
-#include <cstdio>
-
-extern "C"
-{
-#include <sys/types.h> //pid_t
-#include <sys/wait.h>  //waitpid
-#include <unistd.h>    //write, getpid
-#include <stdio.h>
-}
+#ifdef K_DEBUG
 
 #include "tupcrashhandler.h"
 #include "tupcrashwidget.h"
-#include "tdebug.h"
-#include "tglobal.h"
 
 TupCrashHandler *TupCrashHandler::m_instance = 0;
 
 void crashTrapper(int sig);
 
-TupCrashHandler::TupCrashHandler() : m_verbose(false)
+// TupCrashHandler::TupCrashHandler() : m_verbose(false)
+TupCrashHandler::TupCrashHandler()
 {
     m_program = QCoreApplication::applicationName();
     setTrapper(crashTrapper);
@@ -105,7 +86,6 @@
 
 void TupCrashHandler::setTrapper (void (*trapper)(int))
 {
-#ifdef Q_OS_UNIX
     if (!trapper)
         trapper = SIG_DFL;
 
@@ -121,7 +101,6 @@
     signal(SIGBUS,trapper);
     signal(SIGIOT,trapper);
     sigprocmask(SIG_UNBLOCK, &mask, 0);
-#endif
 }
 
 QString TupCrashHandler::program() const
@@ -202,10 +181,8 @@
 
 void TupCrashHandler::setConfig(const QString &filePath)
 {
-#ifdef K_DEBUG
-       T_FUNCINFO;
-       //SHOW_VAR(filePath);
-#endif
+    T_FUNCINFO;
+    //SHOW_VAR(filePath);
 
     QDomDocument doc;
     QFile file(filePath);
@@ -251,9 +228,7 @@
     static char buf[SIZE];
     QString result = "";
 
-#ifdef K_DEBUG
     tDebug() << "Running command: " << command;
-#endif
 
     FILE *process = ::popen(command.toLocal8Bit().data(), "r");
 
@@ -271,8 +246,6 @@
 
 void crashTrapper(int sig)
 {
-
-#ifdef K_DEBUG
     qDebug("\n*** Fatal error: %s is crashing with signal %d :(", CHANDLER->program().toLocal8Bit().data(), sig);
 
     if (sig == 6) {
@@ -284,7 +257,6 @@
         qDebug("Signal 11: Officially known as \"segmentation fault\", means that the program");
         qDebug("accessed a memory location that was not assigned. That's usually a bug in the program.");
     }
-#endif
 
     CHANDLER->setTrapper(0); // Unactive crash handler
 
@@ -306,8 +278,6 @@
         // so we can read stderr too
         ::dup2(fileno(stdout), fileno(stderr));
 
-#ifdef K_DEBUG
-
 #ifdef UBUNTU
         if (QFile::exists("/usr/bin/sudo") && QFile::exists("/usr/bin/gdb")) {
 #else
@@ -329,7 +299,6 @@
             bt = bt.simplified();
         } 
 
-#endif
         execInfo = runCommand("file " + BIN_DIR + "tupi.bin");
 
         // Widget
@@ -354,3 +323,5 @@
 
     exit(128);
 }
+
+#endif
diff -Nru tupi-0.2+git04/src/shell/tupcrashhandler.h tupi-0.2+git05/src/shell/tupcrashhandler.h
--- tupi-0.2+git04/src/shell/tupcrashhandler.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupcrashhandler.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,19 +36,36 @@
 #ifndef TUPCRASHHANDLER_H
 #define TUPCRASHHANDLER_H
 
+#ifdef K_DEBUG
+
 #include "tapplicationproperties.h"
+#include "tdebug.h"
+
+extern "C"
+{
+#include <sys/types.h> //pid_t
+#include <sys/wait.h>  //waitpid
+#include <unistd.h>    //write, getpid
+#include <stdio.h>
+}
 
 #include <QString>
 #include <QMap>
 #include <QColor>
 #include <QPair>
 #include <QImage>
+#include <QApplication>
+#include <QDomDocument>
+#include <QFile>
+#include <QTemporaryFile>
+#include <QProcess>
+#include <QTranslator>
+#include <QDesktopWidget>
 #include <csignal>
+#include <cstdio>
 
 class TupCrashHandler;
 
-#ifdef Q_OS_UNIX
-
 class TupCrashHandler
 {
     protected:
@@ -93,11 +110,10 @@
         static TupCrashHandler *m_instance; // Singleton
         QString m_program;
         QString m_imagePath;
-        bool m_verbose;
+        // bool m_verbose;
 };
 
 #define CHANDLER TupCrashHandler::instance()
 
-#endif // Q_OS_UNIX
-
+#endif
 #endif
diff -Nru tupi-0.2+git04/src/shell/tupcrashwidget.cpp tupi-0.2+git05/src/shell/tupcrashwidget.cpp
--- tupi-0.2+git04/src/shell/tupcrashwidget.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupcrashwidget.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -33,26 +33,9 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#include <QPainter>
-#include <QDialog>
-#include <QPushButton>
-#include <QApplication>
-#include <QFile>
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QTextBrowser>
-#include <QtDebug>
-#include <QProcess>
-#include <signal.h>
-
 #include "tupcrashwidget.h"
-#include "tupcrashhandler.h"
-
-#include "tglobal.h"
-#include "tconfig.h"
-#include "tdebug.h"
 
-#include <unistd.h>
+#ifdef K_DEBUG
 
 class TextArea : public QTextBrowser
 {
@@ -150,9 +133,7 @@
 
 void TupCrashWidget::addBacktracePage(const QString &execInfo, const QString &backtrace)
 {
-    #ifdef K_DEBUG
-        T_FUNCINFO << execInfo << " " << backtrace;
-    #endif
+    T_FUNCINFO << execInfo << " " << backtrace;
 
     QWidget *btPage = new QWidget;
     QVBoxLayout *layout = new QVBoxLayout(btPage);
@@ -183,10 +164,10 @@
 
    QString path = QString::fromLocal8Bit(::getenv("TUPI_BIN")) + "/tupi &";
    QByteArray ba = path.toLatin1();
+
    int flag = system(ba.data());
-   #ifdef K_DEBUG
-          tWarning() << "TupCrashWidget::restart() - System output: " << flag;
-   #endif
+   tWarning() << "TupCrashWidget::restart() - System output: " << flag;
+
    kill(m_pid, 9);
 }
 
@@ -195,3 +176,5 @@
    kill(m_pid, 9);
 }
 
+#endif
+
diff -Nru tupi-0.2+git04/src/shell/tupcrashwidget.h tupi-0.2+git05/src/shell/tupcrashwidget.h
--- tupi-0.2+git04/src/shell/tupcrashwidget.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupcrashwidget.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,11 +36,26 @@
 #ifndef TUPCRASHWIDGET_H
 #define TUPCRASHWIDGET_H
 
+#ifdef K_DEBUG
+
+#include "tupcrashhandler.h"
+#include "tconfig.h"
+#include "tdebug.h"
+
+#include <unistd.h>
 #include <QDialog>
 #include <QImage>
 #include <QVBoxLayout>
-
 #include <QTabWidget>
+#include <QPainter>
+#include <QPushButton>
+#include <QApplication>
+#include <QFile>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QTextBrowser>
+#include <QProcess>
+#include <signal.h>
 
 class TupCrashWidget : public QDialog
 {
@@ -66,3 +81,4 @@
 };
 
 #endif
+#endif
diff -Nru tupi-0.2+git04/src/shell/tuplocalprojectmanagerhandler.cpp tupi-0.2+git05/src/shell/tuplocalprojectmanagerhandler.cpp
--- tupi-0.2+git04/src/shell/tuplocalprojectmanagerhandler.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tuplocalprojectmanagerhandler.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -37,10 +37,6 @@
 #include "tupprojectrequest.h"
 #include "tupprojectcommand.h"
 #include "tupfilemanager.h"
-#include "tdebug.h"
-
-#include <QDomDocument>
-#include <QDomElement>
 
 /**
  * This class handles all the procedures related to the projects local format for Tupi.
@@ -126,7 +122,11 @@
 void TupLocalProjectManagerHandler::handleProjectRequest(const TupProjectRequest *request)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupLocalProjectManagerHandler::handleProjectRequest()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (request->isValid()) {
@@ -134,7 +134,12 @@
         //emit sendCommand(request, isUndoCommand(request->xml()));
     } else {
         #ifdef K_DEBUG
-               tfDebug << "TupLocalProjectManagerHandler::handleProjectRequest() - INVALID REQUEST! ID: " << request->id();
+            QString msg = "TupLocalProjectManagerHandler::handleProjectRequest() - INVALID REQUEST! ID: " + QString::number(request->id());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
diff -Nru tupi-0.2+git04/src/shell/tuplocalprojectmanagerhandler.h tupi-0.2+git05/src/shell/tuplocalprojectmanagerhandler.h
--- tupi-0.2+git04/src/shell/tuplocalprojectmanagerhandler.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tuplocalprojectmanagerhandler.h	2014-12-15 14:21:34.000000000 +0000
@@ -38,6 +38,19 @@
 
 #include "tupabstractprojectmanagerhandler.h"
 
+#ifdef K_DEBUG
+
+#ifdef Q_OS_WIN32
+#include <QDebug>
+#else
+#include "tdebug.h"
+#endif
+
+#endif
+
+#include <QDomDocument>
+#include <QDomElement>
+
 /**
  * @author David Cuadrado
 */
diff -Nru tupi-0.2+git04/src/shell/tupmainwindow.cpp tupi-0.2+git05/src/shell/tupmainwindow.cpp
--- tupi-0.2+git04/src/shell/tupmainwindow.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupmainwindow.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -43,7 +43,6 @@
 
 // Tupi Framework
 #include "tipdialog.h"
-#include "tdebug.h"
 #include "tosd.h"
 // #include "taudioplayer.h"
 
@@ -96,7 +95,11 @@
                m_viewChat(0), m_exposureSheet(0), m_scenes(0), isSaveDialogOpen(false), internetOn(false)
 {
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupMainWindow()]";
+        #else
+            TINIT;
+        #endif
     #endif
 
     // Loading audio player plugin
@@ -118,7 +121,7 @@
     m_actionManager = new TActionManager(this);
 
     setupActions();
-	
+
     // Setting up all the GUI...
     createGUI(); // This method is called from the tupmainwindow_gui class
     setupMenu();
@@ -136,7 +139,7 @@
     // Time to load plugins... 
     TupPluginManager::instance()->loadPlugins();
 
-    // Defining the Animation view, as the first interface to show up	
+    // Defining the Animation view, as the first interface to show up   
     setCurrentPerspective(Animation);
 
     TCONFIG->beginGroup("General");
@@ -167,7 +170,11 @@
 TupMainWindow::~TupMainWindow()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupMainWindow()]";
+        #else
+            TEND;
+        #endif
     #endif
 
     QClipboard *clipboard = QApplication::clipboard();
@@ -191,6 +198,14 @@
 
 void TupMainWindow::createNewLocalProject()
 {
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupMainWindow::createNewLocalProject()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
     TupMainWindow::requestType = NewLocalProject;
 
     m_projectManager->setupNewProject();
@@ -236,11 +251,14 @@
 void TupMainWindow::setWorkSpace(const QStringList &users)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupMainWindow::setWorkSpace()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (m_projectManager->isOpen()) {
-
         if (TupMainWindow::requestType == NewLocalProject || TupMainWindow::requestType == NewNetProject)
             TOsd::self()->display(tr("Information"), tr("Opening a new document..."));
 
@@ -290,13 +308,13 @@
             proportion = (double) height / (double) pHeight;
 
         if (proportion <= 0.5) {
-            animationTab->setZoomView("20");
+            animationTab->setZoomPercent("20");
         } else if (proportion > 0.5 && proportion <= 0.75) {
-                   animationTab->setZoomView("25");
+                   animationTab->setZoomPercent("25");
         } else if (proportion > 0.75 && proportion <= 1.5) {
-                   animationTab->setZoomView("50");
+                   animationTab->setZoomPercent("50");
         } else if (proportion > 1.5 && proportion < 2) {
-                   animationTab->setZoomView("75");
+                   animationTab->setZoomPercent("75");
         }
 
         // TupCamera Widget
@@ -317,38 +335,70 @@
         playerTab->setWindowTitle(tr("Player"));
         addWidget(playerTab);
 
+        connect(animationTab, SIGNAL(updateFPS(int)), cameraWidget, SLOT(setStatusFPS(int)));
+
         helpTab = new TupHelpBrowser(this);
-        // helpTab->setDataDirs(QStringList() << m_helper->helpPath());
 
         QString lang = (QLocale::system().name()).left(2);
         if (lang.length() < 2)  
             lang = "en";
-
-        QString helpPath = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator() + lang + QDir::separator() + "cover.html";
-
+         
+        QString cover = QString() + "help" + QDir::separator() + lang + QDir::separator() + "cover.html";         
+ #ifdef Q_OS_WIN32
+        QString helpPath = SHARE_DIR + cover;
+ #else
+        QString helpPath = SHARE_DIR + "data" + QDir::separator() + cover;
+ #endif
         QFile file(helpPath);
-        if (!file.exists())
-            helpPath = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator() + "en" + QDir::separator() + "cover.html";
+        if (!file.exists()) {
+            #ifdef Q_OS_WIN32
+                helpPath = SHARE_DIR + "help" + QDir::separator() + "en" + QDir::separator() + "cover.html";
+				helpPath.replace("/","\\");
+            #else
+                helpPath = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator() + "en" + QDir::separator() + "cover.html";
+            #endif
+        }
 
         helpTab->setSource(helpPath);
-
         addWidget(helpTab);
 
         QString twitterPath = QDir::homePath() + QDir::separator() + "." + QCoreApplication::applicationName() 
                               + QDir::separator() + "twitter.html";
-
+        #ifdef Q_OS_WIN32
+            twitterPath.replace("/", "\\");
+        #endif
+			  
         if (QFile::exists(twitterPath)) {
+            #ifdef K_DEBUG
+                QString msg = "TupMainWindow::setWorkSpace() - Loading page -> " + twitterPath;
+                #ifdef Q_OS_WIN32
+                    qWarning() << msg;
+                #else
+                    tWarning() << msg;
+                #endif
+            #endif
+
             internetOn = true;
             newsTab = new TupTwitterWidget(this); 
             newsTab->setSource(twitterPath);
             addWidget(newsTab);
-        } 
+        } else {
+            #ifdef K_DEBUG
+                QString msg = "TupMainWindow::setWorkSpace() - Fatal Error: Couldn't load page -> " + twitterPath;
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+        }
 
         connect(this, SIGNAL(tabHasChanged(int)), this, SLOT(updateCurrentTab(int)));
 
         exposureView->expandDock(true);
 
-        // if (!isNetworked)
+        // SQA: Code useful for future features
+        // if (!isNetworked) 
         //     connect(animationTab, SIGNAL(autoSave()), this, SLOT(callSave()));
 
         m_projectManager->undoModified();
@@ -369,6 +419,14 @@
         // connect(m_projectManager, SIGNAL(projectHasChanged(bool)), this, SLOT(updatePlayer(bool)));
         // connect(animationTab, SIGNAL(projectHasChanged()), this, SLOT(updatePlayer()));
     }
+
+    connect(this, SIGNAL(tabHasChanged(int)), this, SLOT(updateTabContext(int)));
+}
+
+void TupMainWindow::updateTabContext(int tab)
+{
+    if (tab == 0)
+        animationTab->updatePerspective();
 }
 
 /**
@@ -383,7 +441,12 @@
 void TupMainWindow::newProject()
 {
     #ifdef K_DEBUG
-           tWarning() << "Creating new project...";
+        QString msg = "Creating new project...";
+        #ifdef Q_OS_WIN32
+           qWarning() << msg;
+        #else
+           tWarning() << msg;
+        #endif
     #endif
 
     TupNewProject *wizard = new TupNewProject(this);
@@ -402,6 +465,9 @@
             setupLocalProject(wizard->parameters());
             createNewLocalProject();
         }
+#if defined(QT_GUI_LIB) && defined(K_DEBUG) && !defined(Q_OS_WIN32)
+    m_debug->setProjectStatus(true); 
+#endif
     }
 
     delete wizard;
@@ -420,14 +486,17 @@
 bool TupMainWindow::closeProject()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupMainWindow::closeProject()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (!m_projectManager->isOpen())
         return true;
 
     if (m_projectManager->isModified()) {
-
         QDesktopWidget desktop;
 
         QMessageBox msgBox;
@@ -468,7 +537,11 @@
 void TupMainWindow::resetUI()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupMainWindow::resetUI()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     // disconnect(animationTab, SIGNAL(projectHasChanged()), this, SLOT(updatePlayer()));
@@ -494,7 +567,7 @@
     //if (timeView->isExpanded())
         timeView->expandDock(false);
 
-#if defined(QT_GUI_LIB) && defined(K_DEBUG)
+#if defined(QT_GUI_LIB) && defined(K_DEBUG) && !defined(Q_OS_WIN32)
     //if (debugView->isExpanded())
         debugView->expandDock(false);
 #endif
@@ -588,6 +661,10 @@
     m_projectManager->closeProject();
 
     resetMousePointer();
+
+#if defined(QT_GUI_LIB) && defined(K_DEBUG) && !defined(Q_OS_WIN32)
+    m_debug->setProjectStatus(false);
+#endif
 }
 
 /**
@@ -662,6 +739,14 @@
 
 void TupMainWindow::setupLocalProject(TupProjectManagerParams *params)
 {
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupMainWindow::setupLocalProject()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif
+
     if (closeProject()) {
         isNetworked = false;
         m_projectManager->setHandler(new TupLocalProjectManagerHandler, false);
@@ -708,7 +793,12 @@
 void TupMainWindow::openProject(const QString &path)
 {
     #ifdef K_DEBUG
-           tWarning() << "TupMainWindow::openProject() - Opening project: " << path;
+        QString msg = "TupMainWindow::openProject() - Opening project: " + path;
+        #ifdef Q_OS_WIN32
+           qWarning() << msg;
+        #else
+           tWarning() << msg;
+        #endif
     #endif
 
     if (path.isEmpty() || !path.endsWith(".tup"))
@@ -722,7 +812,6 @@
         tabWidget()->setCurrentWidget(animationTab);
 
         if (m_projectManager->loadProject(path)) {
-
             if (QDir::isRelativePath(path))
                 m_fileName = QDir::currentPath() + QDir::separator() + path;
             else
@@ -757,8 +846,8 @@
             setWindowTitle(tr("Tupi: Open 2D Magic") + " - " + projectName + " [ " + tr("by") + " " + author + " ]");
             setWorkSpace();
         } else {
-                 setUpdatesEnabled(true);
-                 TOsd::self()->display(tr("Error"), tr("Cannot open project!"), TOsd::Error);
+            setUpdatesEnabled(true);
+            TOsd::self()->display(tr("Error"), tr("Cannot open project!"), TOsd::Error);
         }
     }
 }
@@ -805,8 +894,14 @@
 void TupMainWindow::save()
 {
     #ifdef K_DEBUG
-           tWarning("project") << "TupMainWindow::save() - Saving...";
+        QString msg = "TupMainWindow::save() - Saving...";
+        #ifdef Q_OS_WIN32
+           qWarning() << msg;
+        #else
+           tWarning("project") << msg;
+        #endif
     #endif
+
     QTimer::singleShot(0, this, SLOT(saveProject()));
 }
 
@@ -898,13 +993,23 @@
                        m_colorPalette->parsePaletteFile(importer.filePath());
                    } else {
                        #ifdef K_DEBUG
-                              tError() << "TupMainWindow::importPalettes() - Fatal Error: Couldn't import file -> " << (*file);
+                           QString msg = "TupMainWindow::importPalettes() - Fatal Error: Couldn't import file -> " + QString(*file);
+                           #ifdef Q_OS_WIN32
+                               qDebug() << msg;
+                           #else
+                               tError() << msg;
+                           #endif
                        #endif
                        isOk = false;
                    }
                } else {
                    #ifdef K_DEBUG
-                          tError() << "TupMainWindow::importPalettes() - Fatal Error: Couldn't import palette -> " << (*file);
+                       QString msg = "TupMainWindow::importPalettes() - Fatal Error: Couldn't import palette -> " + QString(*file);
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
                    #endif
                    isOk = false;
                }
@@ -1029,8 +1134,13 @@
     if (!directory.exists()) {
         TOsd::self()->display(tr("Error"), tr("Directory does not exist! Please, choose another path."), TOsd::Error);
         #ifdef K_DEBUG
-               QString file = path.toLocal8Bit();
-               tError() << "TupMainWindow::saveAs() - Fatal Error: Directory doesn't exist! -> " << file;
+            QString file = path.toLocal8Bit();
+            QString msg = "TupMainWindow::saveAs() - Fatal Error: Directory doesn't exist! -> " + file;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return;
     } else {
@@ -1094,7 +1204,6 @@
         if (isSaveDialogOpen)
             isSaveDialogOpen = false;
     } else {
-
         TupSavePackage package(lastSave);
         netProjectManager->sendPackage(package);
 
@@ -1182,7 +1291,12 @@
 {
     if (!animationTab) {
         #ifdef K_DEBUG
-               tFatal() << "TupMainWindow::createCommand() - No animationTab... Aborting!";
+            QString msg = "TupMainWindow::createCommand() - No animationTab... Aborting!"; 
+            #ifdef Q_OS_WIN32
+               qDebug() << msg;
+            #else
+               tFatal() << msg;
+            #endif
         #endif
         return;
     }
@@ -1396,7 +1510,11 @@
 void TupMainWindow::updatePlayer(bool removeAction)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupMainWindow::updatePlayer()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (!removeAction)
diff -Nru tupi-0.2+git04/src/shell/tupmainwindow_gui.cpp tupi-0.2+git05/src/shell/tupmainwindow_gui.cpp
--- tupi-0.2+git04/src/shell/tupmainwindow_gui.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupmainwindow_gui.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -40,12 +40,6 @@
 #include "toolview.h"
 #include "tviewbutton.h"
 // #include "taudioplayer.h"
-#include "tdebug.h"
-
-#include <QKeySequence>
-#include <QTextBrowser>
-#include <QToolBar>
-#include <QDesktopWidget>
 
 /**
  * This class implements the Tupi GUI
@@ -94,23 +88,23 @@
     addToPerspective(libraryView->toggleViewAction(), Animation);
 
     new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "bitmap.png"), tr("Bitmap"), QKeySequence(tr("Alt+B")), m_libraryWidget, SLOT(importBitmapGroup()),
-                m_actionManager, "importbitmap");
+		m_actionManager, "importBitmap");
 
     new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "bitmap_array.png"), tr("Bitmap Array"), QKeySequence(tr("Alt+Shift+B")), 
-                m_libraryWidget, SLOT(importBitmapArray()), m_actionManager, "importbitmaparray");
+		m_libraryWidget, SLOT(importBitmapArray()), m_actionManager, "importBitmapArray");
 
     new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "svg.png"), tr("SVG File"), QKeySequence(tr("Alt+S")), m_libraryWidget, SLOT(importSvgGroup()),
-                m_actionManager, "importsvg");
+		m_actionManager, "importSvg");
 
     new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "svg_array.png"), tr("SVG Array"), QKeySequence(tr("Alt+Shift+S")), m_libraryWidget, 
-                SLOT(importSvgArray()), m_actionManager, "importsvgarray");
+		SLOT(importSvgArray()), m_actionManager, "importSvgArray");
 
     //new TAction(QPixmap(), tr("Audio File..."), QKeySequence(), m_libraryWidget, SLOT(importSound()),
-    //            m_actionManager, "importaudiofile");
+    //            m_actionManager, "importAudioFile");
 
     // SQA: Temporary code
-    //m_actionManager->enable("importsvg", false);
-    //m_actionManager->enable("importsvgarray", false);
+    //m_actionManager->enable("importSvg", false);
+    //m_actionManager->enable("importSvgArray", false);
 
     connectWidgetToManager(m_libraryWidget);
     connectWidgetToLocalManager(m_libraryWidget);
@@ -136,7 +130,12 @@
 
     // Adding the help widget to the right side of the interface
 
-    m_helper = new TupHelpWidget(SHARE_DIR + "data/help/");
+#ifdef Q_OS_WIN32
+    QString helpPath = SHARE_DIR + "help" + QDir::separator();
+#else
+	QString helpPath = SHARE_DIR + "data" + QDir::separator() + "help" + QDir::separator();
+#endif	
+    m_helper = new TupHelpWidget(helpPath);
     helpView = addToolView(m_helper, Qt::RightDockWidgetArea, All, "Help", QKeySequence(tr("Shift+H")));
     m_actionManager->insert(helpView->toggleViewAction(), "show_help");
     addToPerspective(helpView->toggleViewAction(), All);
@@ -144,14 +143,13 @@
     TViewButton *helpButton = helpView->button();
 
     connect(helpButton, SIGNAL(helpIsOpen()), this,
-            SLOT(setHelpPerspective()));
+	    SLOT(setHelpPerspective()));
 
     connect(m_helper, SIGNAL(pageLoaded(const QString &)), this, 
-            SLOT(showHelpPage(const QString &)));
+	    SLOT(showHelpPage(const QString &)));
 
     // Adding the time line widget to the bottom side of the interface
-    m_timeLine = new TupTimeLine;
-    m_timeLine->setLibrary(m_projectManager->project()->library());
+    m_timeLine = new TupTimeLine(m_projectManager->project());
     timeView = addToolView(m_timeLine, Qt::BottomDockWidgetArea, Animation, "Time Line", QKeySequence(tr("Shift+T")));
     m_actionManager->insert(timeView->toggleViewAction(), "show_timeline");
     addToPerspective(timeView->toggleViewAction(), Animation);
@@ -159,7 +157,7 @@
     connectWidgetToManager(m_timeLine);
     connectWidgetToLocalManager(m_timeLine);
 
-#if defined(QT_GUI_LIB) && defined(K_DEBUG)
+#if defined(QT_GUI_LIB) && defined(K_DEBUG) && defined(Q_OS_UNIX)
     QDesktopWidget desktop;
     m_debug = new TupDebugWidget(this, desktop.screenGeometry().width());
     debugView = addToolView(m_debug, Qt::BottomDockWidgetArea, Animation, "Debug Term", QKeySequence(tr("Shift+D")));
@@ -193,18 +191,7 @@
     setupFileActions();
 
     // Menu File	
-    m_fileMenu = new QMenu(tr("&File"), this);
-    menuBar()->addMenu(m_fileMenu);
-
-    // Adding Option New	
-    /*
-    QMenu *newMenu = new QMenu(tr("&New"), this);
-    newMenu->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "file_new.png"));
-    m_fileMenu->addMenu(newMenu);
-    newMenu->addAction(m_actionManager->find("newproject"));
-    newMenu->addSeparator();
-    */
-
+    m_fileMenu = menuBar()->addMenu(tr("&File"));
     m_fileMenu->addAction(m_actionManager->find("newproject"));
     m_fileMenu->addAction(m_actionManager->find("openproject"));
 
@@ -214,9 +201,8 @@
 
     // Adding Option Open Recent	
     m_recentProjectsMenu = new QMenu(tr("Recents"), this);
-    // m_recentProjectsMenu->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "recent_files.png"));
 
-    TCONFIG->beginGroup("General");
+    // TCONFIG->beginGroup("General");
     QStringList recents = TCONFIG->value("Recents").toString().split(';');
     updateOpenRecentMenu(m_recentProjectsMenu, recents);	
     m_fileMenu->addMenu(m_recentProjectsMenu);
@@ -230,75 +216,57 @@
     m_fileMenu->addSeparator();
     m_fileMenu->addAction(m_actionManager->find("export"));
 
-    // SQA: This option has been moved to the Import menu
-    // m_fileMenu->addSeparator();
-    // m_fileMenu->addAction(m_actionManager->find("ImportPalettes"));
-
     m_fileMenu->addSeparator();
     m_fileMenu->addAction(m_actionManager->find("Exit"));
-    m_fileMenu->addSeparator();
 
     // Setting up the Settings menu
     setupSettingsActions();
-    m_settingsMenu = new QMenu(tr("&Edit"), this);
-    menuBar()->addMenu(m_settingsMenu);
-
-    // Adding Options wizard and preferences
-    //m_settingsMenu->addAction(m_actionManager->find("wizard"));
+    m_settingsMenu = menuBar()->addMenu(tr("&Edit"));
 
     m_settingsMenu->addAction(m_actionManager->find("preferences"));
     // Temporary out while SQA is done
     m_actionManager->enable("preferences", false);
 
-// Temporary out while SQA is done
+    // Temporary out while SQA is done
     // Setting up the insert menu
     // setupInsertActions();
     // Menu Insert
-    m_insertMenu = new QMenu(tr("&Import"), this);
-    menuBar()->addMenu(m_insertMenu);
-
-    // Adding Options insert scene, insert layer and insert frame
-    /*
-    m_insertMenu->addAction(m_actionManager->find("InsertScene"));
-    m_insertMenu->addAction(m_actionManager->find("InsertLayer"));
-    m_insertMenu->addAction(m_actionManager->find("InsertFrame"));
-    m_insertMenu->addSeparator();
-    */
+    m_insertMenu = menuBar()->addMenu(tr("&Import"));
 
     // Adding Options import bitmap and import audio file
-    m_insertMenu->addAction(m_actionManager->find("importbitmap"));
-    m_insertMenu->addAction(m_actionManager->find("importbitmaparray"));
-    m_insertMenu->addAction(m_actionManager->find("importsvg"));
-    m_insertMenu->addAction(m_actionManager->find("importsvgarray"));
-    //m_insertMenu->addAction(m_actionManager->find("importaudiofile"));
+    m_insertMenu->addAction(m_actionManager->find("importBitmap"));
+    m_insertMenu->addAction(m_actionManager->find("importBitmapArray"));
+    m_insertMenu->addAction(m_actionManager->find("importSvg"));
+    m_insertMenu->addAction(m_actionManager->find("importSvgArray"));
+    //m_insertMenu->addAction(m_actionManager->find("importAudioFile"));
 
     m_insertMenu->addSeparator();
-    m_insertMenu->addAction(m_actionManager->find("ImportPalettes"));
+    m_insertMenu->addAction(m_actionManager->find("importGimpPalettes"));
+
+    // SQA: Action disabled while Library module is fixed
+    m_insertMenu->addAction(m_actionManager->find("importPapagayoLipSync"));
 
     // Setting up the window menu
     // setupWindowActions();
-    m_windowMenu = new QMenu(tr("&Window"),this);
-    menuBar()->addMenu(m_windowMenu);
+    m_windowMenu = menuBar()->addMenu(tr("&Window"));
 
     // Adding Options show debug, palette, pen, library, timeline, scenes, exposure, help
     m_windowMenu->addAction(m_actionManager->find("show_palette"));
     m_windowMenu->addAction(m_actionManager->find("show_pen"));
     m_windowMenu->addAction(m_actionManager->find("show_library"));
     m_windowMenu->addAction(m_actionManager->find("show_timeline"));
-    m_actionManager->enable("show_timeline", false);
     m_windowMenu->addAction(m_actionManager->find("show_scenes"));
     m_windowMenu->addAction(m_actionManager->find("show_exposure"));
     m_windowMenu->addAction(m_actionManager->find("show_help"));
 
-#if defined(QT_GUI_LIB) && defined(K_DEBUG)
+#if defined(QT_GUI_LIB) && defined(K_DEBUG) && defined(Q_OS_UNIX)
     m_windowMenu->addAction(m_actionManager->find("show_debug"));
 #endif
 
-    // m_actionManager->enable("show_help", false);
     m_windowMenu->addSeparator();
 
     // Setup perspective menu
-    m_viewMenu = new QMenu(tr("Modules"),this);
+    m_viewMenu = new QMenu(tr("Modules"), this);
     QActionGroup *group = new QActionGroup(this);
     group->setExclusive(true);
 
@@ -318,7 +286,7 @@
     animationPerspective->setData(Player);
     group->addAction(animationPerspective);
 
-   // Adding Option Help 
+    // Adding Option Help 
     QAction *helpPerspective = new QAction(tr("Help"), this);
     helpPerspective->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "help_mode.png"));
     helpPerspective->setIconVisibleInMenu(true);
@@ -326,7 +294,7 @@
     helpPerspective->setData(Help);
     group->addAction(helpPerspective);
 
-   // Adding Option News 
+    // Adding Option News 
     QAction *newsPerspective = new QAction(tr("News"), this);
     newsPerspective->setIcon(QPixmap(THEME_DIR + "icons" + QDir::separator() + "news_mode.png"));
     newsPerspective->setIconVisibleInMenu(true);
@@ -340,7 +308,7 @@
 	
     // Setting up the help menu
     setupHelpActions();
-    m_helpMenu = new QMenu(tr("&Help"),this);
+    m_helpMenu = new QMenu(tr("&Help"), this);
     menuBar()->addMenu(m_helpMenu);
     m_helpMenu->addAction(m_actionManager->find("tip_of_day"));
     m_helpMenu->addSeparator();
@@ -355,7 +323,7 @@
     m_actionManager->enable("saveprojectas", flag);
     m_actionManager->enable("closeproject", flag);
     m_actionManager->enable("export", flag);
-    m_actionManager->enable("importbitmap", flag);
+    m_actionManager->enable("importBitmap", flag);
 
     m_insertMenu->setEnabled(flag);
     m_windowMenu->setEnabled(flag);
@@ -366,10 +334,10 @@
 {
 /*
     TAction *next = new TAction(QPixmap(), tr( "Back Frame" ), QKeySequence(Qt::Key_PageUp), this, 
-                    SLOT(selectBackFrame()), m_actionManager, "BackFrame");
+		    SLOT(selectBackFrame()), m_actionManager, "BackFrame");
     next->setShortcutContext ( Qt::ApplicationShortcut );
     TAction *back = new TAction( QPixmap(), tr( "Next Frame" ), QKeySequence(Qt::Key_PageDown), this, 
-                    SLOT(selectNextFrame()), m_actionManager, "Next Frame");
+		    SLOT(selectNextFrame()), m_actionManager, "Next Frame");
     back->setShortcutContext ( Qt::ApplicationShortcut );
     addAction(back);
     addAction(next);
@@ -388,50 +356,61 @@
 void TupMainWindow::setupFileActions()
 {
     TAction *newProject = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "new.png"), tr("New project"), QKeySequence(tr("Ctrl+N")),
-                                      this, SLOT(newProject()), m_actionManager);
+				      this, SLOT(newProject()), m_actionManager);
     newProject->setStatusTip(tr("Open new project"));
     m_actionManager->insert(newProject, "newproject", "file");
 
     TAction *openFile = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "open.png"), tr("Open project"), QKeySequence(tr("Ctrl+O")), 
-                                    this, SLOT(openProject()), m_actionManager);
+				    this, SLOT(openProject()), m_actionManager);
     m_actionManager->insert(openFile, "openproject", "file");
     openFile->setStatusTip(tr("Load existent project"));
 
     // SQA: This code has been disabled temporary
     /*
     TAction *openNetFile = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "net_document.png"), tr("Open project from server..."), 
-                                       tr(""), this, SLOT(openProjectFromServer()), m_actionManager);
+				       tr(""), this, SLOT(openProjectFromServer()), m_actionManager);
     m_actionManager->insert(openNetFile, "opennetproject", "file");
 
     TAction *importNetFile = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "import_project.png"), tr("Export project to server..."), tr(""), this, 
-                                         SLOT(importProjectToServer()), m_actionManager);
+					 SLOT(importProjectToServer()), m_actionManager);
     m_actionManager->insert(importNetFile, "exportprojectserver", "file");
     */
 
     TAction *save = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "save.png"), tr( "Save project" ),
-                                QKeySequence(tr("Ctrl+S")), this, SLOT(saveProject()), m_actionManager);
+				QKeySequence(tr("Ctrl+S")), this, SLOT(saveProject()), m_actionManager);
     m_actionManager->insert(save, "saveproject", "file");
     save->setStatusTip(tr("Save current project in current location"));
 
-    TAction *saveAs = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "save_as.png"), tr("Save project &As..."), 
-                                  QKeySequence(tr("Ctrl+Shift+S")), m_actionManager);
+    // TAction *saveAs = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "save_as.png"), tr("Save project &As..."),
+    //                               QKeySequence(tr("Ctrl+Shift+S")), m_actionManager);
 
-    connect(saveAs, SIGNAL(triggered()), this, SLOT(saveAs()));
+    TAction *saveAs = new TAction(QPixmap(THEME_DIR + "icons/save_as.png"), tr("Save project &As..."),
+				  QKeySequence(tr("Ctrl+Shift+S")), this, SLOT(saveAs()), m_actionManager);
+
+    // connect(saveAs, SIGNAL(triggered()), this, SLOT(saveAs()));
     saveAs->setStatusTip(tr("Open dialog box to save current project in any location"));
     m_actionManager->insert(saveAs, "saveprojectas", "file");
 
-    TAction *close = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "close.png"), tr("Cl&ose project"), 
-                                 QKeySequence(tr("Ctrl+W")), m_actionManager);
-    connect(close, SIGNAL(triggered()), this, SLOT(closeProject()));
+    // TAction *close = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "close.png"), tr("Cl&ose project"), 
+    //                              QKeySequence(tr("Ctrl+W")), m_actionManager);
+
+    TAction *close = new TAction(QPixmap(THEME_DIR + "icons/close.png"), tr("Cl&ose project"), QKeySequence(tr("Ctrl+W")),
+				 this, SLOT(closeProject()), m_actionManager);
+    // connect(close, SIGNAL(triggered()), this, SLOT(closeProject()));
     close->setStatusTip(tr("Close active project"));
     m_actionManager->insert(close, "closeproject", "file");
 
     // Import Palette action
 
     TAction *importPalette = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "import.png"), tr("&Import GIMP palettes"),
-                                         QKeySequence(tr("Shift+G")), this, SLOT(importPalettes()), m_actionManager);
+					 QKeySequence(tr("Shift+G")), this, SLOT(importPalettes()), m_actionManager);
     importPalette->setStatusTip(tr("Import palettes"));
-    m_actionManager->insert(importPalette, "importpalettes", "file");
+    m_actionManager->insert(importPalette, "importGimpPalettes", "file");
+
+    TAction *importPapagayo = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "papagayo.png"), tr("&Import Papagayo Lip-sync"),
+                                         QKeySequence(tr("Alt+P")), this, SLOT(importPapagayoLipSync()), m_actionManager);
+    importPapagayo->setStatusTip(tr("Import Papagayo lip-sync"));
+    m_actionManager->insert(importPapagayo, "importPapagayoLipSync", "file");
 
     // Export Project action
     TAction *exportProject = new TAction(QPixmap(THEME_DIR + "icons" + QDir::separator() + "export.png"), tr("&Export Project"), QKeySequence(tr("Ctrl+R")),
@@ -500,7 +479,7 @@
 void TupMainWindow::setupWindowActions()
 {
     // Temporary commented code - SQA required 
-    #if defined(QT_GUI_LIB) && defined(K_DEBUG)
+    #if defined(QT_GUI_LIB) && defined(K_DEBUG) && defined(Q_OS_UNIX)
         new TAction(QPixmap(), tr("Show Debug Dialog"), QKeySequence(), TDebug::browser(), SLOT(show()), m_actionManager,
                     "show debug");
     #endif
@@ -566,7 +545,7 @@
 */
 
 void TupMainWindow::updateOpenRecentMenu(QMenu *menu, QStringList recents)
-{	
+{
     if (recents.count() > 10) {
         int limit = recents.count() - 10;
         for(int i=0; i<limit; i++)
@@ -619,8 +598,7 @@
             widget = m_libraryWidget;
             position = DiDockWidget::Left;
             actionText = "library widget";
-	}
-	else if ( action == m_actionManager->find("show_scenes") ) {
+        } else if ( action == m_actionManager->find("show_scenes") ) {
             widget = m_scenes;
             position = DiDockWidget::Right;
             actionText = "scenes widget";
@@ -628,14 +606,14 @@
             widget = m_helper;
             position = DiDockWidget::Right;
             actionText = "help widget";
- 	} else if ( action == m_actionManager->find("show_palette") ) {
+        } else if ( action == m_actionManager->find("show_palette") ) {
             widget = m_colorPalette;
             position = DiDockWidget::Left;
             actionText = "color palette widget";
         }
 
-        if ( widget ) {
-            if ( widget->isVisible() ) {
+        if (widget) {
+            if (widget->isVisible()) {
                 toolWindow( position)->centralWidget()->setExpanded(false);
                 action->setText("Show "+actionText);
             } else {
@@ -697,3 +675,8 @@
     kApp->insertGlobalAction(undo, "undo");
     kApp->insertGlobalAction(redo, "redo");
 }
+
+void TupMainWindow::importPapagayoLipSync()
+{
+    animationTab->importPapagayoLipSync();
+}
diff -Nru tupi-0.2+git04/src/shell/tupmainwindow.h tupi-0.2+git05/src/shell/tupmainwindow.h
--- tupi-0.2+git04/src/shell/tupmainwindow.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupmainwindow.h	2014-12-15 14:21:34.000000000 +0000
@@ -43,13 +43,12 @@
 
 // modules
 #include "tupexposuresheet.h"
-#include "kinaswidget.h"
+// #include "kinaswidget.h"
 #include "tuppenwidget.h"
 #include "tupcolorpalette.h"
 #include "tupsceneswidget.h"
 #include "tuplibrarywidget.h"
 #include "tuptimeline.h"
-#include "tupdebugwidget.h"
 #include "tupcamerawidget.h"
 #include "tuphelpwidget.h"
 #include "tuphelpbrowser.h"
@@ -65,6 +64,15 @@
 #include "tupprojectmanager.h"
 #include "tupnetprojectmanagerhandler.h"
 
+#ifdef K_DEBUG
+#ifdef Q_OS_WIN32
+#include <QDebug>
+#else
+#include "tdebug.h"
+#include "tupdebugwidget.h"
+#endif
+#endif
+
 #include <QMainWindow>
 #include <QMenu>
 #include <QMenuBar>
@@ -72,6 +80,10 @@
 #include <QResizeEvent>
 #include <QCloseEvent>
 #include <QUndoStack>
+#include <QKeySequence>
+#include <QTextBrowser>
+#include <QToolBar>
+#include <QDesktopWidget>
 
 class TupProjectManagerParams;
 class TupNetProjectManagerParams;
@@ -168,6 +180,7 @@
 
     private slots:
           void setWorkSpace(const QStringList &users = QStringList() = QStringList());
+          void updateTabContext(int tab);
           void createNewLocalProject();
           void newProject();
           bool closeProject();
@@ -213,6 +226,7 @@
           // void postVideo(const QString &title, const QString &topics, const QString &description, int fps, const QList<int> sceneIndexes);
           void resetMousePointer();
           void updateUsersOnLine(const QString &login, int state);
+          void importPapagayoLipSync();
 
     private:
           TupProjectManager *m_projectManager;
@@ -250,7 +264,7 @@
           TupScenesWidget *m_scenes;
           TupTimeLine *m_timeLine;
 
-#if defined(QT_GUI_LIB) && defined(K_DEBUG)
+#if defined(QT_GUI_LIB) && defined(K_DEBUG) && defined(Q_OS_UNIX)
           TupDebugWidget *m_debug;
 #endif
           TupHelpWidget *m_helper;
diff -Nru tupi-0.2+git04/src/shell/tupnewproject.cpp tupi-0.2+git05/src/shell/tupnewproject.cpp
--- tupi-0.2+git04/src/shell/tupnewproject.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupnewproject.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -40,15 +40,6 @@
 #include "tconfig.h"
 #include "tapplication.h"
 #include "tosd.h"
-#include "tdebug.h"
-
-#include <QLineEdit>
-#include <QPlainTextEdit>
-#include <QCheckBox>
-#include <QColorDialog>
-#include <QStyleOptionButton>
-#include <QComboBox>
-#include <QLineEdit>
 
 //SQA: Add a field to define the project description 
 
diff -Nru tupi-0.2+git04/src/shell/tupnewproject.h tupi-0.2+git05/src/shell/tupnewproject.h
--- tupi-0.2+git04/src/shell/tupnewproject.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupnewproject.h	2014-12-15 14:21:34.000000000 +0000
@@ -41,6 +41,24 @@
 #include "twizard.h"
 #include "txyspinbox.h"
 
+#ifdef K_DEBUG
+
+#ifdef Q_OS_WIN32
+#include <QDebug>
+#else
+#include "tdebug.h"
+#endif
+
+#endif
+
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QCheckBox>
+#include <QColorDialog>
+#include <QStyleOptionButton>
+#include <QComboBox>
+#include <QLineEdit>
+
 class TupProjectManagerParams;
 
 /**
diff -Nru tupi-0.2+git04/src/shell/tupsplash.cpp tupi-0.2+git05/src/shell/tupsplash.cpp
--- tupi-0.2+git04/src/shell/tupsplash.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupsplash.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,8 +34,6 @@
  ***************************************************************************/
 
 #include "tupsplash.h"
-#include "tdebug.h"
-#include "tglobal.h"
 
 #include <QPixmap>
 #include <QBitmap>
diff -Nru tupi-0.2+git04/src/shell/tupsplash.h tupi-0.2+git05/src/shell/tupsplash.h
--- tupi-0.2+git04/src/shell/tupsplash.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupsplash.h	2014-12-15 14:21:34.000000000 +0000
@@ -44,6 +44,16 @@
 
 #include "tapplicationproperties.h"
 
+#ifdef K_DEBUG
+
+#ifdef Q_OS_WIN32
+#include <QDebug>
+#else
+#include "tdebug.h"
+#endif
+
+#endif
+
 #include <QPainter>
 #include <QSplashScreen>
 #include <QTimer>
diff -Nru tupi-0.2+git04/src/shell/tupstatusbar.cpp tupi-0.2+git05/src/shell/tupstatusbar.cpp
--- tupi-0.2+git04/src/shell/tupstatusbar.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupstatusbar.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupstatusbar.h"
-#include "tdebug.h"
 
 TupStatusBar::TupStatusBar(QWidget *parent)
  : QStatusBar(parent)
diff -Nru tupi-0.2+git04/src/shell/tupstatusbar.h tupi-0.2+git05/src/shell/tupstatusbar.h
--- tupi-0.2+git04/src/shell/tupstatusbar.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/shell/tupstatusbar.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,6 +36,16 @@
 #ifndef TUPSTATUSBAR_H
 #define TUPSTATUSBAR_H
 
+#ifdef K_DEBUG
+
+#ifdef Q_OS_WIN32
+#include <QDebug>
+#else
+#include "tdebug.h"
+#endif
+
+#endif
+
 #include <QProgressBar>
 #include <QLabel>
 #include <QTimer>
diff -Nru tupi-0.2+git04/src/store/store.pri tupi-0.2+git05/src/store/store.pri
--- tupi-0.2+git04/src/store/store.pri	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/store.pri	2014-12-15 14:21:34.000000000 +0000
@@ -1,6 +1,10 @@
+unix {
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR -ltupistore
+}
 
-INCLUDEPATH += $$STORE_DIR
-
-LIBS += -L$$STORE_DIR -ltupistore
-
+win32 {
+    INCLUDEPATH += $$STORE_DIR
+    LIBS += -L$$STORE_DIR/release/ -ltupistore
+}
 
diff -Nru tupi-0.2+git04/src/store/store.pro tupi-0.2+git05/src/store/store.pro
--- tupi-0.2+git04/src/store/store.pro	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/store.pro	2014-12-15 14:21:34.000000000 +0000
@@ -1,10 +1,14 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: ./src/store
-# Target is a library:  
+QT += opengl core gui svg xml network
 
-!include(../../tupiglobal.pri) {
-    error("Please configure first")
+unix {
+    !include(../../tupiglobal.pri) {
+        error("Please configure first")
+    }
+}
+
+win32 {
+    include(../../quazip.win.pri)
+    include(../../win.pri)
 }
 
 INSTALLS += target
@@ -38,7 +42,7 @@
            tupbuttonitem.h \
            tupitemfactory.h \
            tupellipseitem.h \
-           tupglobal_store.h \
+           # tupglobal_store.h \
            tuppaintareaevent.h \
            tupserializer.h \
            tuplineitem.h \
@@ -64,7 +68,8 @@
            tupsvgitem.h \
            tupbackgroundscene.h \
            tupbackground.h \
-           tupstoryboard.h
+           tupstoryboard.h \
+           tuplipsync.h
 
 SOURCES += tuplayer.cpp \
            tuppalettedocument.cpp \
@@ -111,7 +116,8 @@
            tupsvgitem.cpp \
            tupbackgroundscene.cpp \
            tupbackground.cpp \
-           tupstoryboard.cpp
+           tupstoryboard.cpp \
+           tuplipsync.cpp
 
 *:!macx{
     CONFIG += dll warn_on
diff -Nru tupi-0.2+git04/src/store/tupabstractprojectmanagerhandler.cpp tupi-0.2+git05/src/store/tupabstractprojectmanagerhandler.cpp
--- tupi-0.2+git04/src/store/tupabstractprojectmanagerhandler.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupabstractprojectmanagerhandler.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,7 +35,6 @@
 
 #include "tupabstractprojectmanagerhandler.h"
 #include "tupprojectresponse.h"
-#include "tdebug.h"
 
 TupAbstractProjectHandler::TupAbstractProjectHandler(QObject *parent) : QObject(parent)
 {
diff -Nru tupi-0.2+git04/src/store/tupabstractprojectmanagerhandler.h tupi-0.2+git05/src/store/tupabstractprojectmanagerhandler.h
--- tupi-0.2+git04/src/store/tupabstractprojectmanagerhandler.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupabstractprojectmanagerhandler.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,8 @@
 #ifndef TUPABSTRACTPROJECTHANDLER_H
 #define TUPABSTRACTPROJECTHANDLER_H
 
-#include "tupglobal_store.h"
+#include "tglobal.h"
+
 #include <QObject>
 #include <QStringList>
 
@@ -50,7 +51,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupAbstractProjectHandler : public QObject
+class TUPI_EXPORT TupAbstractProjectHandler : public QObject
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/store/tupabstractprojectresponsehandler.cpp tupi-0.2+git05/src/store/tupabstractprojectresponsehandler.cpp
--- tupi-0.2+git04/src/store/tupabstractprojectresponsehandler.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupabstractprojectresponsehandler.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -37,8 +37,6 @@
 #include "tupprojectresponse.h"
 #include "tuppaintareaevent.h"
 
-#include "tdebug.h"
-
 TupAbstractProjectResponseHandler::TupAbstractProjectResponseHandler()
 {
 }
@@ -83,8 +81,14 @@
             default:
             {
                  #ifdef K_DEBUG
-                        tError() << "TupAbstractProjectResponseHandler::handleResponse() - Unknown project response: " << response->part();
+                     QString msg = "TupAbstractProjectResponseHandler::handleResponse() - Error: Unknown project response: " + QString::number(response->part());
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
+
                  return false;
             }
             break;
diff -Nru tupi-0.2+git04/src/store/tupabstractprojectresponsehandler.h tupi-0.2+git05/src/store/tupabstractprojectresponsehandler.h
--- tupi-0.2+git04/src/store/tupabstractprojectresponsehandler.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupabstractprojectresponsehandler.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,8 @@
 #ifndef TUPABSTRACTPROJECTRESPONSEHANDLER_H
 #define TUPABSTRACTPROJECTRESPONSEHANDLER_H
 
-#include "tupglobal_store.h"
+#include "tglobal.h"
+
 #include <QObject>
 
 class TupPaintAreaEvent;
@@ -51,7 +52,7 @@
  * @author David Cuadrado
 **/
 
-class STORE_EXPORT TupAbstractProjectResponseHandler
+class TUPI_EXPORT TupAbstractProjectResponseHandler
 {
     public:
         TupAbstractProjectResponseHandler();
diff -Nru tupi-0.2+git04/src/store/tupabstractserializable.h tupi-0.2+git05/src/store/tupabstractserializable.h
--- tupi-0.2+git04/src/store/tupabstractserializable.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupabstractserializable.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef TUPABSTRACTSERIALIZABLE_H
 #define TUPABSTRACTSERIALIZABLE_H
 
-#include "tupglobal_store.h"
+#include "tglobal.h"
 
 #include <QString>
 #include <QDomDocument>
@@ -49,7 +49,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupAbstractSerializable
+class TUPI_EXPORT TupAbstractSerializable
 {
     protected:
         TupAbstractSerializable() {};
diff -Nru tupi-0.2+git04/src/store/tupbackground.cpp tupi-0.2+git05/src/store/tupbackground.cpp
--- tupi-0.2+git04/src/store/tupbackground.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupbackground.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,6 @@
 #include "tupbackground.h"
 #include "tupserializer.h"
 #include "tupbackgroundscene.h"
-#include "tdebug.h"
 
 #include <cmath>
 
@@ -73,11 +72,9 @@
     QDomNode n = root.firstChild();
 
     while (!n.isNull()) {
-
            QDomElement e = n.toElement();
 
            if (e.tagName() == "frame") {
-
                QString type = e.attribute("name", "none");
 
                if (type == "landscape_static") {
@@ -94,7 +91,6 @@
 
                        staticBg->fromXml(newDoc);
                    }
-
                } else if (type == "landscape_dynamic") {
                           dynamicBg = new TupFrame(this, "landscape_dynamic");
                           // dynamicBg->setFrameName("landscape_dynamic");
@@ -115,7 +111,12 @@
                           }
                } else {
                    #ifdef K_DEBUG
-                          tError() << "TupBackground::fromXml() - Error: The background input is invalid";
+                       QString msg = "TupBackground::fromXml() - Error: The background input is invalid";
+                       #ifdef Q_OS_WIN32
+                           qDebug() << msg;
+                       #else
+                           tError() << msg;
+                       #endif
                    #endif
                }
            }
@@ -158,9 +159,13 @@
 void TupBackground::renderDynamicView()
 {
     #ifdef K_DEBUG
-       T_FUNCINFO;
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupBackground::renderDynamicView()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif 
+	
     TupBackgroundScene bgScene(dimension, bgColor, dynamicBg);
     QImage image(dimension, QImage::Format_ARGB32);
     {
diff -Nru tupi-0.2+git04/src/store/tupbackground.h tupi-0.2+git05/src/store/tupbackground.h
--- tupi-0.2+git04/src/store/tupbackground.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupbackground.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,8 +36,8 @@
 #ifndef TUPBACKGROUND_H
 #define TUPBACKGROUND_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 #include "tupscene.h"
 
 #include <QImage>
@@ -47,7 +47,7 @@
  * @author Gustav Gonzalez
 */
 
-class STORE_EXPORT TupBackground : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupBackground : public QObject, public TupAbstractSerializable
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/store/tupbackgroundscene.h tupi-0.2+git05/src/store/tupbackgroundscene.h
--- tupi-0.2+git04/src/store/tupbackgroundscene.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupbackgroundscene.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,15 +36,15 @@
 #ifndef TUPBACKGROUNDSCENE_H
 #define TUPBACKGROUNDSCENE_H
 
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QPainter>
-
-#include "tupglobal.h"
+#include "tglobal.h"
 #include "tupframe.h"
 #include "tupgraphicobject.h"
 #include "tupsvgitem.h"
 
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QPainter>
+
 class TUPI_EXPORT TupBackgroundScene : public QGraphicsScene
 {
     Q_OBJECT
diff -Nru tupi-0.2+git04/src/store/tupbuttonitem.cpp tupi-0.2+git05/src/store/tupbuttonitem.cpp
--- tupi-0.2+git04/src/store/tupbuttonitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupbuttonitem.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,6 +34,7 @@
  ***************************************************************************/
 
 #include "tupbuttonitem.h"
+
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
@@ -41,9 +42,10 @@
 #include <QStyleOptionButton>
 #include <QApplication>
 
-TupButtonItem::TupButtonItem(QGraphicsItem *parent, QGraphicsScene *scene) : QGraphicsItem(parent, scene)
+// TupButtonItem::TupButtonItem(QGraphicsItem *parent, QGraphicsScene *scene) : QGraphicsItem(parent, scene)
+TupButtonItem::TupButtonItem(QGraphicsItem *parent) : QGraphicsItem(parent)
 {
-    QGraphicsItem::setCursor(QCursor(Qt::PointingHandCursor ));
+    QGraphicsItem::setCursor(QCursor(Qt::PointingHandCursor));
     setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
     
     m_iconSize = QSize(22,22);
diff -Nru tupi-0.2+git04/src/store/tupbuttonitem.h tupi-0.2+git05/src/store/tupbuttonitem.h
--- tupi-0.2+git04/src/store/tupbuttonitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupbuttonitem.h	2014-12-15 14:21:34.000000000 +0000
@@ -37,7 +37,7 @@
 #define TUPBUTTONITEM_H
 
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
+#include "tglobal.h"
 
 #include <QGraphicsItem>
 #include <QIcon>
@@ -47,12 +47,13 @@
  * @author David Cuadrado
 **/
 
-class STORE_EXPORT TupButtonItem : public QObject, public QGraphicsItem, public TupAbstractSerializable
+class TUPI_EXPORT TupButtonItem : public QObject, public QGraphicsItem, public TupAbstractSerializable
 {
     Q_OBJECT
+    Q_INTERFACES(QGraphicsItem)
 
     public:
-        TupButtonItem(QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
+        TupButtonItem(QGraphicsItem *parent = 0);
         ~TupButtonItem();
         
         virtual void fromXml(const QString &xml);
diff -Nru tupi-0.2+git04/src/store/tupcommandexecutor.cpp tupi-0.2+git05/src/store/tupcommandexecutor.cpp
--- tupi-0.2+git04/src/store/tupcommandexecutor.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupcommandexecutor.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -39,7 +39,6 @@
 #include "tuprequestbuilder.h"
 #include "tupprojectrequest.h"
 #include "tupprojectresponse.h"
-#include "tdebug.h"
 
 TupCommandExecutor::TupCommandExecutor(TupProject *project) : QObject(project), m_project(project)
 {
@@ -58,7 +57,11 @@
 bool TupCommandExecutor::createScene(TupSceneResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::createScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     int position = response->sceneIndex();
@@ -96,8 +99,12 @@
 bool TupCommandExecutor::removeScene(TupSceneResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif    
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::removeScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif	
 
     int position = response->sceneIndex();
     int scenesTotal = m_project->scenesTotal();
@@ -124,7 +131,12 @@
         } 
     } else {
         #ifdef K_DEBUG
-               tError() << "TupCommandExecutor::removeScene() - Scene doesn't exist (" << position << ")";
+            QString msg = "TupCommandExecutor::removeScene() - Scene index doesn't exist -> " + QString::number(position);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError("library") << msg;
+            #endif
         #endif
     }
     
@@ -149,8 +161,13 @@
     bool lock = response->arg().toBool();
 
     #ifdef K_DEBUG
-        tWarning() << "Lock scene: " << lock;
-    #endif    
+        QString msg = "TupCommandExecutor::lockScene() - Scene is locked: " + QString::number(lock);
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning("library") << msg;
+        #endif
+    #endif  
 
     TupScene *scene = m_project->scene(position);
     
@@ -198,7 +215,6 @@
         return false;
     
     scene->setVisible(view);
-    
     emit responsed(response);
     
     return true;
@@ -214,7 +230,6 @@
         return false;
 
     scene->reset(name);
-
     emit responsed(response);
 
     return true;
@@ -226,4 +241,4 @@
     m_project->setBgColor(QColor(colorName));
 
     emit responsed(response);
-}
+}
\ No newline at end of file
diff -Nru tupi-0.2+git04/src/store/tupcommandexecutor_frames.cpp tupi-0.2+git05/src/store/tupcommandexecutor_frames.cpp
--- tupi-0.2+git04/src/store/tupcommandexecutor_frames.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupcommandexecutor_frames.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -41,12 +41,14 @@
 #include "tupframe.h"
 #include "tupprojectresponse.h"
 
-#include "tdebug.h"
-
 bool TupCommandExecutor::createFrame(TupFrameResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::createFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     int scenePosition = response->sceneIndex();
@@ -186,8 +188,13 @@
             return true;
         } else {
             #ifdef K_DEBUG
-                   tWarning() << "TupCommandExecutor::moveFrame() - Failed moving frame";
-            #endif
+                QString msg = "TupCommandExecutor::moveFrame() - Error while moving frame";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif  
             return false;
         }
     }
@@ -215,8 +222,13 @@
             return true;
         } else {
             #ifdef K_DEBUG
-                   tWarning() << "Failed moving frame";
-            #endif
+                QString msg = "TupCommandExecutor::exchangeFrame() - Error while exchanging frames";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif  
             return false;
         }
     }
@@ -257,8 +269,12 @@
 bool TupCommandExecutor::renameFrame(TupFrameResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::renameFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif	
 
     int scenePos = response->sceneIndex();
     int layerPos = response->layerIndex();
@@ -297,9 +313,13 @@
 bool TupCommandExecutor::selectFrame(TupFrameResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::selectFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif	
+	
     int scenePos = response->sceneIndex();
     int layerPos = response->layerIndex();
     int position = response->frameIndex();
@@ -313,16 +333,24 @@
     TupLayer *layer = scene->layer(layerPos);
     
     if (layer) {
-
         if (position < layer->framesTotal()) {
             TupFrame *frame = layer->frame(position);
-        
             if (! frame) 
                 return false;
         
             emit responsed(response);
             return true;
-        } 
+        } else {
+            #ifdef K_DEBUG
+                QString msg = "TupCommandExecutor::selectFrame() - Invalid frame index -> " + QString::number(position);
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif
+            return false;
+        }
     } 
     
     return false;
@@ -385,9 +413,13 @@
 bool TupCommandExecutor::pasteFrame(TupFrameResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::pasteFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif	
+	
     int scenePos = response->sceneIndex();
     int layerPos = response->layerIndex();
     int position = response->frameIndex();
diff -Nru tupi-0.2+git04/src/store/tupcommandexecutor.h tupi-0.2+git05/src/store/tupcommandexecutor.h
--- tupi-0.2+git04/src/store/tupcommandexecutor.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupcommandexecutor.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,9 @@
 #ifndef TUPCOMMANDEXECUTOR_H
 #define TUPCOMMANDEXECUTOR_H
 
+#include "tglobal.h"
 #include "tupscene.h"
+
 #include <QObject>
 
 class TupProject;
@@ -52,7 +54,7 @@
  * @author David Cuadrado
 */
 
-class TupCommandExecutor : public QObject
+class TUPI_EXPORT TupCommandExecutor : public QObject
 {
     Q_OBJECT
 
@@ -63,9 +65,12 @@
         void getScenes(TupSceneResponse *response);
         bool createScene(TupSceneResponse *response);
         bool createLayer(TupLayerResponse *response);
+        bool addLipSync(TupLayerResponse *response);
         bool createFrame(TupFrameResponse *response);
         
         bool createItem(TupItemResponse *response);
+
+        bool updateLipSync(TupLayerResponse *response);
         
         bool convertItem(TupItemResponse *response);
         bool transformItem(TupItemResponse *response);
@@ -73,6 +78,7 @@
         
         bool removeScene(TupSceneResponse *response);
         bool removeLayer(TupLayerResponse *response);
+        bool removeLipSync(TupLayerResponse *response);
         bool removeFrame(TupFrameResponse *response);
         bool resetFrame(TupFrameResponse *response);
         
diff -Nru tupi-0.2+git04/src/store/tupcommandexecutor_items.cpp tupi-0.2+git05/src/store/tupcommandexecutor_items.cpp
--- tupi-0.2+git04/src/store/tupcommandexecutor_items.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupcommandexecutor_items.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -55,16 +55,18 @@
 #include "tuplayer.h"
 #include "tupbackground.h"
 
-#include "tdebug.h"
-
 #include <QGraphicsItem>
 
 bool TupCommandExecutor::createItem(TupItemResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("items");
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::createItem()]";
+        #else
+            T_FUNCINFOX("items");
+        #endif
+    #endif        
+    
     int scenePosition = response->sceneIndex();
     int layerPosition = response->layerIndex();
     int framePosition = response->frameIndex();
@@ -86,10 +88,15 @@
                         TupSvgItem *svg = frame->createSvgItem(point, xml);
                         if (svg) {
                             response->setItemIndex(frame->svgItemsCount()-1);
-                        } else {
+                        } else {                            
                             #ifdef K_DEBUG
-                                   tError() << "TupCommandExecutor::createItem() - Fatal Error: Svg object is invalid!";
-                            #endif
+                                QString msg = "TupCommandExecutor::createItem() - Error: Svg object is invalid!";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
+                            #endif                            
                             return false;
                         }
                     } else {
@@ -98,8 +105,13 @@
                             response->setItemIndex(frame->graphicItemsCount()-1);
                         } else {
                             #ifdef K_DEBUG
-                                   tError() << "TupCommandExecutor::createItem() - Fatal Error: QGraphicsItem object is invalid!";
-                            #endif
+                                QString msg = "TupCommandExecutor::createItem() - Error: QGraphicsItem object is invalid!";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
+                            #endif    
                             return false;
                         }
                     }
@@ -109,13 +121,23 @@
 
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::createItem() - Fatal Error: Frame doesn't exist! [ " << framePosition << " ]";
-                    #endif
+                        QString msg = "TupCommandExecutor::createItem() - Error: Frame index doesn't exist! -> " + QString::number(framePosition);
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif    
                     return false;
                 }
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupCommandExecutor::createItem() - Fatal Error: Layer doesn't exist! [ " << layerPosition << " ]";
+                    QString msg = "TupCommandExecutor::createItem() - Error: Layer index doesn't exist! -> " + QString::number(layerPosition);
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -130,9 +152,13 @@
                            frame = bg->dynamicFrame();
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::createItem() - Fatal Error: Invalid mode!";
-                    #endif
-
+                        QString msg = "TupCommandExecutor::createItem() - Error: Invalid mode!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif    
                     return false;
                 }
 
@@ -143,8 +169,13 @@
                             response->setItemIndex(frame->indexOf(svg));
                         } else {
                             #ifdef K_DEBUG
-                                   tError() << "TupCommandExecutor::createItem() - Fatal Error: Svg object is invalid!";
-                            #endif
+                                QString msg = "TupCommandExecutor::createItem() - Error: Svg object is invalid!";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
+                            #endif    
                             return false;
                         }
                     } else {
@@ -153,8 +184,13 @@
                             response->setItemIndex(frame->indexOf(item));
                         } else {
                             #ifdef K_DEBUG
-                                   tError() << "TupCommandExecutor::createItem() - Fatal Error: QGraphicsItem object is invalid!";
-                            #endif
+                                QString msg = "TupCommandExecutor::createItem() - Error: QGraphicsItem object is invalid!";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
+                            #endif    
                             return false;
                         }
                     }
@@ -162,22 +198,37 @@
                     emit responsed(response);
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::createItem() - Fatal Error: Invalid background frame!";
-                    #endif
+                        QString msg = "TupCommandExecutor::createItem() - Error: Invalid background frame!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif    
                     return false;
                 }
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupCommandExecutor::createItem() - Fatal Error: Invalid background data structure!";
-                #endif
+                    QString msg = "TupCommandExecutor::createItem() - Error: Invalid background data structure!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
+                #endif                
                 return false;
             }
         }
 
     } else {
         #ifdef K_DEBUG
-               tError() << "TupCommandExecutor::createItem() - Fatal Error: Invalid scene index!";
-        #endif
+            QString msg = "TupCommandExecutor::createItem() - Error: Invalid scene index!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif    
         return false;
     }
     
@@ -187,8 +238,12 @@
 bool TupCommandExecutor::removeItem(TupItemResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("items");
-    #endif
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::removeItem()]";
+        #else
+            T_FUNCINFOX("items");
+        #endif
+    #endif    
 
     int scenePosition = response->sceneIndex();
     int layerPosition = response->layerIndex();
@@ -226,8 +281,13 @@
 
                         } else {
                             #ifdef K_DEBUG
-                                   tError() << "TupCommandExecutor::removeItem() - Error: " << "Invalid object index (value: " << response->itemIndex() << ")";
-                            #endif
+                                QString msg = "TupCommandExecutor::removeItem() - Error: Invalid object index (value: " + QString::number(response->itemIndex()) + ")";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
+                            #endif                                
                             return false;
                         }
                     }
@@ -244,7 +304,12 @@
                            frame = bg->dynamicFrame();
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::removeItem() - Invalid mode!";
+                        QString msg = "TupCommandExecutor::removeItem() - Error: Invalid mode!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
@@ -259,13 +324,23 @@
                     return true;
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::removeItem() - Invalid background frame!";
+                        QString msg = "TupCommandExecutor::removeItem() - Error: Invalid background frame!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupCommandExecutor::removeItem() - Invalid background data structure!";
+                    QString msg = "TupCommandExecutor::removeItem() - Error: Invalid background data structure!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -273,7 +348,12 @@
 
     } else {
         #ifdef K_DEBUG
-               tError() << "TupCommandExecutor::removeItem() - Error: Invalid scene index!";
+            QString msg = "TupCommandExecutor::removeItem() - Error: Invalid scene index!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return false;
     }
@@ -282,10 +362,14 @@
 }
 
 bool TupCommandExecutor::moveItem(TupItemResponse *response)
-{
+{    
     #ifdef K_DEBUG
-           T_FUNCINFOX("items");
-    #endif
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::moveItem()]";
+        #else
+            T_FUNCINFOX("items");
+        #endif
+    #endif    
 
     int scenePosition = response->sceneIndex();
     int layerPosition = response->layerIndex();
@@ -314,7 +398,7 @@
                         return true;
                     }
                 }
-            }
+            } 
         } else {
             TupBackground *bg = scene->background();
             if (bg) {
@@ -325,7 +409,12 @@
                            frame = bg->dynamicFrame();
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::moveItem() - Invalid mode!";
+                        QString msg = "TupCommandExecutor::moveItem() - Error: Invalid mode!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
@@ -335,15 +424,25 @@
                         emit responsed(response);
                         return true;
                     }
-                } else {
+                } else {                    
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::moveItem() - Invalid background frame!";
+                        QString msg = "TupCommandExecutor::moveItem() - Error: Invalid background frame!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupCommandExecutor::moveItem() - Invalid background data structure!";
+                    QString msg = "TupCommandExecutor::moveItem() - Error: Invalid background data structure!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -357,27 +456,33 @@
 bool TupCommandExecutor::groupItems(TupItemResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("items");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::groupItems()]";
+        #else
+            T_FUNCINFOX("items");
+        #endif
     #endif
-    
+
     int scenePosition = response->sceneIndex();
     int layerPosition = response->layerIndex();
     int framePosition = response->frameIndex();
     int position = response->itemIndex();
     TupProject::Mode mode = response->spaceMode();
     QString strList = response->arg().toString();
+
     TupScene *scene = m_project->scene(scenePosition);
     
     if (scene) {
         if (mode == TupProject::FRAMES_EDITION) {
-
             TupLayer *layer = scene->layer(layerPosition);
             if (layer) {
                 TupFrame *frame = layer->frame(framePosition);
                 if (frame) {
                     QString::const_iterator itr = strList.constBegin();
-                    QList<qreal> positions = TupSvg2Qt::parseNumbersList(++itr);
-                    response->setItemIndex(frame->indexOf(frame->createItemGroupAt(position, positions)));
+                    QList<int> positions = TupSvg2Qt::parseIntList(++itr);
+                    qSort(positions.begin(), positions.end());
+                    int itemIndex = frame->createItemGroup(position, positions);
+                    response->setItemIndex(itemIndex);
                 
                     emit responsed(response);
                     return true;
@@ -393,28 +498,44 @@
                            frame = bg->dynamicFrame();
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::groupItems() - Invalid mode!";
-                    #endif
+                        QString msg = "TupCommandExecutor::groupItems() - Error: Invalid mode!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif                    
                     return false;
                 }
 
                 if (frame) {
                     QString::const_iterator itr = strList.constBegin();
-                    QList<qreal> positions = TupSvg2Qt::parseNumbersList(++itr);
-                    response->setItemIndex(frame->indexOf(frame->createItemGroupAt(position, positions)));
+                    QList<int> positions = TupSvg2Qt::parseIntList(++itr);
+                    int itemIndex = frame->createItemGroup(position, positions);
+                    response->setItemIndex(itemIndex);
 
                     emit responsed(response);
                     return true;
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::groupItems() - Invalid background frame!";
-                    #endif
+                        QString msg = "TupCommandExecutor::groupItems() - Error: Invalid background frame!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
+                    #endif 
                     return false;
                 }
 
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupCommandExecutor::groupItems() - Invalid background data structure!";
+                    QString msg = "TupCommandExecutor::groupItems() - Error: Invalid background data structure!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -427,9 +548,13 @@
 bool TupCommandExecutor::ungroupItems(TupItemResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("items");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::ungroupItems()]";
+        #else
+            T_FUNCINFOX("items");
+        #endif
     #endif
-    
+
     int scenePosition = response->sceneIndex();
     int layerPosition = response->layerIndex();
     int framePosition = response->frameIndex();
@@ -445,7 +570,7 @@
                 TupFrame *frame = layer->frame(framePosition);
                 if (frame) {
                     QString strItems = "";
-                    QList<QGraphicsItem *> items = frame->destroyItemGroup(position);
+                    QList<QGraphicsItem *> items = frame->splitItemsGroup(position);
                     foreach (QGraphicsItem *item, items) {
                              if (frame->indexOf(item) != -1) {
                                  if (strItems.isEmpty()) {
@@ -473,14 +598,19 @@
                            frame = bg->dynamicFrame();
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::ungroupItems() - Invalid mode!";
+                        QString msg = "TupCommandExecutor::ungroupItems() - Error: Invalid mode!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
 
                 if (frame) {
                     QString strItems = "";
-                    QList<QGraphicsItem *> items = frame->destroyItemGroup(position);
+                    QList<QGraphicsItem *> items = frame->splitItemsGroup(position);
                     foreach (QGraphicsItem *item, items) {
                              if (frame->indexOf(item) != -1) {
                                  if (strItems.isEmpty()) {
@@ -496,14 +626,24 @@
                     return true;
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::ungroupItems() - Invalid background frame!";
+                        QString msg = "TupCommandExecutor::ungroupItems() - Error: Invalid background frame!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
 
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupCommandExecutor::ungroupItems() - Invalid background data structure!";
+                    QString msg = "TupCommandExecutor::ungroupItems() - Error: Invalid background data structure!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -555,7 +695,12 @@
             default:
             {
             #ifdef K_DEBUG
-                tWarning() << "unknown item " << toType ;
+                QString msg = "TupCommandExecutor::convert() - Error: Unknown item type -> " + QString::number(toType);
+                #ifdef Q_OS_WIN32
+                    qWarning() << msg;
+                #else
+                    tWarning() << msg;
+                #endif
             #endif
             }
             break;
@@ -565,9 +710,13 @@
 }
 
 bool TupCommandExecutor::convertItem(TupItemResponse *response)
-{
+{    
     #ifdef K_DEBUG
-        T_FUNCINFOX("items");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::convertItem()]";
+        #else
+            T_FUNCINFOX("items");
+        #endif
     #endif
 
     int scenePosition = response->sceneIndex();
@@ -580,7 +729,6 @@
     TupScene *scene = m_project->scene(scenePosition);
 
     if (scene) {
-
         if (mode == TupProject::FRAMES_EDITION) {
 
             TupLayer *layer = scene->layer(layerPosition);
@@ -589,14 +737,13 @@
                 if (frame) {
                     QGraphicsItem *item = frame->item(position);
                     if (item) {
-                        tDebug("items") << item->type();
+                        // tDebug("items") << item->type();
                     
                         if (toType == item->type()) 
                             return false;
                     
                         QGraphicsItem *itemConverted = convert(item, toType);
-
-                        tFatal() << "TupCommandExecutor::convertItem() - item new type: " << toType;
+                        // tFatal() << "TupCommandExecutor::convertItem() - item new type: " << toType;
                     
                         if (itemConverted) {
                             // scene->removeItem(item); // FIXME?
@@ -622,15 +769,19 @@
                            frame = bg->dynamicFrame();
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::convertItem() - Invalid mode!";
+                        QString msg = "TupCommandExecutor::convertItem() - Error: Invalid mode!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
-
                     return false;
                 }
                 if (frame) {
                     QGraphicsItem *item = frame->item(position);
                     if (item) {
-                        tDebug("items") << item->type();
+                        // tDebug("items") << item->type();
 
                         if (toType == item->type())
                             return false;
@@ -648,19 +799,34 @@
                         }
                     } else {
                         #ifdef K_DEBUG
-                               tError() << "TupCommandExecutor::convertItem() - Invalid item index!";
+                            QString msg = "TupCommandExecutor::convertItem() - Error: Invalid item index!";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
                         #endif
                         return false;
                     }
-                } else {
+                } else {                    
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::convertItem() - Invalid background frame!";
+                        QString msg = "TupCommandExecutor::convertItem() - Error: Invalid background frame!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupCommandExecutor::convertItem() - Invalid background data structure!";
+                    QString msg = "TupCommandExecutor::convertItem() - Error: Invalid background data structure!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -673,7 +839,11 @@
 bool TupCommandExecutor::transformItem(TupItemResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFOX("items");
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::transformItem()]";
+        #else
+            T_FUNCINFOX("items");
+        #endif
     #endif
 
     int scenePosition = response->sceneIndex();
@@ -724,7 +894,12 @@
                            frame = bg->dynamicFrame();
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::transformItem() - Fatal Error: Invalid spaceMode!";
+                        QString msg = "TupCommandExecutor::transformItem() - Error: Invalid spaceMode!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
@@ -751,20 +926,35 @@
                         return true;
                     } else {
                         #ifdef K_DEBUG
-                               tError() << "TupCommandExecutor::transformItem() - Fatal Error: Invalid item index!";
+                            QString msg = "TupCommandExecutor::transformItem() - Error: Invalid item index!";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
                         #endif
                         return false;
                     }
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::transformItem() - Fatal Error: Invalid background frame!";
+                        QString msg = "TupCommandExecutor::transformItem() - Error: Invalid background frame!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
 
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupCommandExecutor::transformItem() - Fatal Error: Invalid background data structure!";
+                    QString msg = "TupCommandExecutor::transformItem() - Error: Invalid background data structure!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -778,8 +968,13 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFOX("items");
-           SHOW_VAR(xml);
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::setPathItem()]";
+            qDebug() << xml;
+        #else
+            T_FUNCINFOX("items");
+            SHOW_VAR(xml);
+        #endif
     #endif
     */
     
@@ -835,7 +1030,12 @@
                            frame = bg->dynamicFrame();
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::setPathItem() - Invalid mode!";
+                        QString msg = "TupCommandExecutor::setPathItem() - Error: Invalid mode!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
@@ -861,20 +1061,35 @@
                         }
                     } else {
                         #ifdef K_DEBUG
-                               tError() << "TupCommandExecutor::setPathItem() - Invalid item index!";
+                            QString msg = "TupCommandExecutor::setPathItem() - Invalid item index!";
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
                         #endif
                         return false;
                     }
                 } else {
                     #ifdef K_DEBUG
-                           tError() << "TupCommandExecutor::setPathItem() - Invalid background frame!";
+                        QString msg = "TupCommandExecutor::setPathItem() - Error: Invalid background frame!";
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 }
 
             } else {
                 #ifdef K_DEBUG
-                       tError() << "TupCommandExecutor::setPathItem() - Invalid background data structure!";
+                    QString msg = "TupCommandExecutor::setPathItem() - Error: Invalid background data structure!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             }
@@ -885,10 +1100,14 @@
 }
 
 bool TupCommandExecutor::setTween(TupItemResponse *response)
-{
+{    
     #ifdef K_DEBUG
-        T_FUNCINFO;
-        SHOW_VAR(response);
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::setTween()]";
+        #else
+            T_FUNCINFO;
+            SHOW_VAR(response);
+        #endif
     #endif
 
     int scenePosition = response->sceneIndex();
@@ -916,7 +1135,12 @@
                         scene->addTweenObject(item);
                     } else {
                         #ifdef K_DEBUG
-                               tError() << "TupCommandExecutor::setTween() - Fatal Error: Invalid graphic index [ " << position << " ]";
+                            QString msg = "TupCommandExecutor::setTween() - Error: Invalid graphic index -> " + QString::number(position);
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
                         #endif
                         return false;
                     }
@@ -927,7 +1151,12 @@
                         scene->addTweenObject(svg);
                     } else {
                         #ifdef K_DEBUG
-                               tError() << "TupCommandExecutor::setTween() - Fatal Error: Invalid svg index [ " << position << " ]";
+                            QString msg = "TupCommandExecutor::setTween() - Error: Invalid svg index -> " + QString::number(position);
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
                         #endif
                         return false;
                     }
diff -Nru tupi-0.2+git04/src/store/tupcommandexecutor_layers.cpp tupi-0.2+git05/src/store/tupcommandexecutor_layers.cpp
--- tupi-0.2+git04/src/store/tupcommandexecutor_layers.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupcommandexecutor_layers.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,20 +34,20 @@
  ***************************************************************************/
 
 #include "tupcommandexecutor.h"
-
 #include "tupscene.h"
 #include "tuplayer.h"
-
 #include "tupprojectrequest.h"
 #include "tuprequestbuilder.h"
 #include "tupprojectresponse.h"
 
-#include "tdebug.h"
-
 bool TupCommandExecutor::createLayer(TupLayerResponse *response)
-{
+{	
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::createLayer()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     int scenePosition = response->sceneIndex();
@@ -88,9 +88,13 @@
 bool TupCommandExecutor::removeLayer(TupLayerResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::removeLayer()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
-
+		
     int scenePos = response->sceneIndex();
     int position = response->layerIndex();
 
@@ -127,8 +131,13 @@
 
     if (! scene->moveLayer(position, newPosition)) {
         #ifdef K_DEBUG
-               tWarning() << "Failed moving layer";
-        #endif
+            QString msg = "TupCommandExecutor::moveLayer() - Error while moving layer!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif	
         return false;
     } else {
         emit responsed(response);
@@ -165,12 +174,17 @@
     int scenePos = response->sceneIndex();
     int position = response->layerIndex();
     QString newName = response->arg().toString();
-
+	
     #ifdef K_DEBUG
-           tWarning() << "Renamed layer: " << newName;
-    #endif
+        QString msg = "TupCommandExecutor::renameLayer() - Renaming layer to: " + newName;
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif	
 
-    QString oldName;
+    // QString oldName;
 
     TupScene *scene = m_project->scene(scenePos);
 
@@ -199,7 +213,6 @@
     return true;
 }
 
-
 bool TupCommandExecutor::setLayerVisibility(TupLayerResponse *response)
 {
     int scenePos = response->sceneIndex();
@@ -222,3 +235,94 @@
 
     return false;
 }
+
+bool TupCommandExecutor::addLipSync(TupLayerResponse *response)
+{
+    #ifdef K_DEBUG
+        QString msg = "TupCommandExecutor::addLipSync() - Adding lipsync...";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif
+
+    int scenePos = response->sceneIndex();
+    int position = response->layerIndex();
+    QString xml = response->arg().toString();
+
+    TupScene *scene = m_project->scene(scenePos);
+
+    if (!scene)
+        return false;
+
+    TupLayer *layer = scene->layer(position);
+
+    if (layer) {
+        TupLipSync *lipsync = new TupLipSync();
+        lipsync->fromXml(xml);
+        layer->addLipSync(lipsync);
+
+        emit responsed(response);
+        return true;
+    }
+
+    return false;
+}
+
+bool TupCommandExecutor::updateLipSync(TupLayerResponse *response)
+{
+    #ifdef K_DEBUG
+        QString msg = "TupCommandExecutor::updateLipSync() - Updating lipsync...";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif
+
+    int scenePos = response->sceneIndex();
+    QString xml = response->arg().toString();
+
+    TupScene *scene = m_project->scene(scenePos);
+
+    if (!scene)
+        return false;
+
+    TupLipSync *lipsync = new TupLipSync();
+    lipsync->fromXml(xml);
+    if (scene->updateLipSync(lipsync)) {
+        emit responsed(response);
+        return true;
+    }
+
+    return false;
+}
+
+bool TupCommandExecutor::removeLipSync(TupLayerResponse *response)
+{
+    #ifdef K_DEBUG
+        QString msg = "TupCommandExecutor::removeLipSync() - Adding lipsync...";
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
+    #endif
+
+    int scenePos = response->sceneIndex();
+    QString name = response->arg().toString();
+
+    TupScene *scene = m_project->scene(scenePos);
+
+    if (!scene)
+        return false;
+
+    if (scene->removeLipSync(name)) {
+        emit responsed(response);
+        return true;
+    }
+
+    return false;
+}
+
diff -Nru tupi-0.2+git04/src/store/tupcommandexecutor_library.cpp tupi-0.2+git05/src/store/tupcommandexecutor_library.cpp
--- tupi-0.2+git04/src/store/tupcommandexecutor_library.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupcommandexecutor_library.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -40,22 +40,31 @@
 #include "tupframe.h"
 #include "tupprojectrequest.h"
 #include "tupprojectresponse.h"
-#include "tdebug.h"
 
 // This method adds an object into the library
 
 bool TupCommandExecutor::createSymbol(TupLibraryResponse *response)
 {
     #ifdef K_DEBUG
-           tFatal() << "TupCommandExecutor::createSymbol() - Creating object: " << response->arg().toString();
+        QString msg = "TupCommandExecutor::createSymbol() - Creating object: " + response->arg().toString();
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tFatal() << msg;
+        #endif
     #endif
 
-    if (m_project->createSymbol(response->symbolType(), response->arg().toString(), 
-                                response->data(), response->parent())) {
-        emit responsed(response);
-
-        return true;
-    } 
+    if (response->symbolType() == TupLibraryObject::Folder) {
+        if (m_project->addFolder(response->arg().toString())) {
+            emit responsed(response);
+            return true;
+        }
+    } else {
+        if (m_project->createSymbol(response->symbolType(), response->arg().toString(), response->data(), response->parent())) {
+            emit responsed(response);
+            return true;
+        } 
+    }
 
     return false;
 }
@@ -65,23 +74,40 @@
 bool TupCommandExecutor::removeSymbol(TupLibraryResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::removeSymbol()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
-    if ((response->sceneIndex() > -1) && (response->layerIndex() > -1) && (response->frameIndex() > -1)) {
-
-        if (m_project->removeSymbol(response->arg().toString(), response->symbolType(), response->spaceMode(), 
-            response->sceneIndex(), response->layerIndex(), response->frameIndex())) {
+    if (response->symbolType() == TupLibraryObject::Folder) {
+        if (m_project->removeFolder(response->arg().toString())) {
             emit responsed(response);
             return true;
-        } 
+        }
     } else {
-        if (m_project->removeSymbol(response->arg().toString())) {
-            emit responsed(response);
-            return true;
+        if (response->symbolType() == TupLibraryObject::Sound) {
+            if (m_project->removeSound(response->arg().toString())) {
+                emit responsed(response);
+                return true;
+            }
+        } else {
+            if ((response->sceneIndex() > -1) && (response->layerIndex() > -1) && (response->frameIndex() > -1)) {
+                if (m_project->removeSymbol(response->arg().toString(), response->symbolType(), response->spaceMode(),
+                    response->sceneIndex(), response->layerIndex(), response->frameIndex())) {
+                    emit responsed(response);
+                    return true;
+                }
+            } else {
+                if (m_project->removeSymbol(response->arg().toString())) {
+                    emit responsed(response);
+                    return true;
+                }
+            }
         }
     }
-    
+
     return false;
 }
 
@@ -90,7 +116,12 @@
 bool TupCommandExecutor::insertSymbolIntoFrame(TupLibraryResponse *response)
 {
     #ifdef K_DEBUG
-           tFatal() << "TupCommandExecutor::insertSymbolIntoFrame() - Adding symbol to project: " << response->arg().toString();
+        QString msg = "TupCommandExecutor::insertSymbolIntoFrame() - Adding symbol to project: " + response->arg().toString();
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tFatal() << msg;
+        #endif
     #endif
 
     if (m_project->scenesTotal() > 0) {
@@ -110,7 +141,12 @@
         } 
     } else {
         #ifdef K_DEBUG
-               tError() << "TupCommandExecutor::insertSymbolIntoFrame() - No scenes available!";
+            QString msg = "TupCommandExecutor::insertSymbolIntoFrame() - No scenes available!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     } 
 
@@ -122,7 +158,11 @@
 bool TupCommandExecutor::removeSymbolFromFrame(TupLibraryResponse *response)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupCommandExecutor::removeSymbolFromFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     if (m_project->scenesTotal() > 0) {
@@ -140,12 +180,22 @@
             return true;
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupCommandExecutor::removeSymbolFromFrame() - Error: Symbol can't be removed from project!";
+                QString msg = "TupCommandExecutor::removeSymbolFromFrame() - Error: Symbol can't be removed from project!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
         }
     } else {
         #ifdef K_DEBUG
-               tError() << "TupCommandExecutor::removeSymbolFromFrame() - No scenes available!";
+            QString msg = "TupCommandExecutor::removeSymbolFromFrame() - No scenes available!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 
diff -Nru tupi-0.2+git04/src/store/tupellipseitem.cpp tupi-0.2+git05/src/store/tupellipseitem.cpp
--- tupi-0.2+git04/src/store/tupellipseitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupellipseitem.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -41,23 +41,21 @@
 #include <QGraphicsSceneDragDropEvent>
 #include <QMimeData>
 #include <QBrush>
-#include "tdebug.h"
 #include <QPainter>
 #include <QPainterPath>
 
-TupEllipseItem::TupEllipseItem(QGraphicsItem * parent, QGraphicsScene * scene): QGraphicsEllipseItem(parent, scene), m_dragOver(false)
+TupEllipseItem::TupEllipseItem(QGraphicsItem *parent): QGraphicsEllipseItem(parent), m_dragOver(false)
 {
     setAcceptDrops(true);
 }
 
-TupEllipseItem::TupEllipseItem(const QRectF & rect, QGraphicsItem * parent, QGraphicsScene * scene): QGraphicsEllipseItem(rect, parent, scene), m_dragOver(false)
+TupEllipseItem::TupEllipseItem(const QRectF &rect, QGraphicsItem *parent): QGraphicsEllipseItem(rect, parent), m_dragOver(false)
 {
     setAcceptDrops(true);
 }
 
 TupEllipseItem::~TupEllipseItem()
 {
-    
 }
 
 void TupEllipseItem::fromXml(const QString &xml)
@@ -68,11 +66,16 @@
 QDomElement TupEllipseItem::toXml(QDomDocument &doc) const
 {
     QDomElement root = doc.createElement("ellipse");
-    
-    root.setAttribute("cx", rect().center().x());
-    root.setAttribute("cy", rect().center().y());
-    root.setAttribute("rx", rect().width()/2);
-    root.setAttribute("ry", rect().height()/2);
+
+    QString cx = QString::number(rect().center().x());
+    QString cy = QString::number(rect().center().y());
+    QString rx = QString::number(rect().width()/2);
+    QString ry = QString::number(rect().height()/2);
+    
+    root.setAttribute("cx", cx);
+    root.setAttribute("cy", cy);
+    root.setAttribute("rx", rx);
+    root.setAttribute("ry", ry);
     
     root.appendChild(TupSerializer::properties(this, doc));
     
@@ -134,9 +137,13 @@
 {
     m_dragOver = false;
     if (event->mimeData()->hasColor()) {
-        setBrush(QBrush(qVariantValue<QColor>(event->mimeData()->colorData())));
+        // setBrush(QBrush(qVariantValue<QColor>(event->mimeData()->colorData())));
+        QVariant color = event->mimeData()->colorData();
+        setBrush(QBrush(color.value<QColor>()));
     } else if (event->mimeData()->hasImage()) {
-        setBrush(QBrush(qVariantValue<QPixmap>(event->mimeData()->imageData())));
+               // setBrush(QBrush(qVariantValue<QPixmap>(event->mimeData()->imageData())));
+               QVariant pixmap = event->mimeData()->imageData();
+               setBrush(QBrush(pixmap.value<QPixmap>()));
     }
     update();
 }
diff -Nru tupi-0.2+git04/src/store/tupellipseitem.h tupi-0.2+git05/src/store/tupellipseitem.h
--- tupi-0.2+git04/src/store/tupellipseitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupellipseitem.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,8 +36,8 @@
 #ifndef TUPELLIPSEITEM_H 
 #define TUPELLIPSEITEM_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
 #include <QGraphicsEllipseItem>
 
@@ -45,11 +45,11 @@
  * @author Jorge Cuadrado
 */
 
-class STORE_EXPORT TupEllipseItem: public TupAbstractSerializable, public QGraphicsEllipseItem
+class TUPI_EXPORT TupEllipseItem: public TupAbstractSerializable, public QGraphicsEllipseItem
 {
     public:
-        TupEllipseItem(QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
-        TupEllipseItem(const QRectF & rect, QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
+        TupEllipseItem(QGraphicsItem *parent = 0);
+        TupEllipseItem(const QRectF &rect, QGraphicsItem *parent = 0);
         ~TupEllipseItem();
         virtual void fromXml(const QString &xml);
         virtual QDomElement toXml(QDomDocument &doc) const;
diff -Nru tupi-0.2+git04/src/store/tupfilemanager.cpp tupi-0.2+git05/src/store/tupfilemanager.cpp
--- tupi-0.2+git04/src/store/tupfilemanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupfilemanager.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -39,7 +39,6 @@
 #include "tuplibrary.h"
 #include "tuppackagehandler.h"
 #include "talgorithm.h"
-#include "tdebug.h"
 
 #include <QDir>
 
@@ -54,15 +53,24 @@
 bool TupFileManager::save(const QString &fileName, TupProject *project)
 {
     #ifdef K_DEBUG
-           tDebug() << "TupFileManager::save() - Saving file " << fileName;
+        QString msg = "TupFileManager::save() - Saving file -> " + fileName;
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+        #endif
     #endif
 
+	/* 
     int indexPath = fileName.lastIndexOf(QDir::separator());
     int indexFile = fileName.length() - indexPath;
     QString name = fileName.right(indexFile - 1);
     int indexDot = name.lastIndexOf(".");
     name = name.left(indexDot);
-
+    */
+	
+	QFileInfo info(fileName);
+	QString name = info.baseName();	
     QString oldDirName = CACHE_DIR + project->projectName();
     QDir projectDir(oldDirName);
 
@@ -73,18 +81,33 @@
         if (!projectDir.exists()) {
             if (projectDir.rename(oldDirName, projectDir.path())) {
                 #ifdef K_DEBUG
-                       tDebug() << "TupFileManager::save() - Directory renamed to " << projectDir.path();
+                    QString msg = "TupFileManager::save() - Directory renamed to -> " + projectDir.path(); 
+                    #ifdef Q_OS_WIN32
+                        qWarning() << msg;
+                    #else
+                        tWarning() << msg;
+                    #endif
                 #endif
             } else {
                 // SQA: Check if these lines are really needed
                 if (! projectDir.mkdir(projectDir.path())) {
                     #ifdef K_DEBUG
-                           tError() << "TupFileManager::save() - Error: Can't create path " << projectDir.path();
+                        QString msg = "TupFileManager::save() - Error: Can't create path -> " + projectDir.path();
+                        #ifdef Q_OS_WIN32
+                            qDebug() << msg;
+                        #else
+                            tError() << msg;
+                        #endif
                     #endif
                     return false;
                 } else {
                     #ifdef K_DEBUG
-                           tDebug() << "TupFileManager::save() - Directory " << projectDir.path() << " created successfully";
+                        QString msg = "TupFileManager::save() - Directory was created successfully -> " + projectDir.path();
+                        #ifdef Q_OS_WIN32
+                            qWarning() << msg;
+                        #else
+                            tWarning() << msg;
+                        #endif
                     #endif
                 }
             }
@@ -93,12 +116,22 @@
         if (!projectDir.exists()) {
             if (! projectDir.mkdir(projectDir.path())) {
                 #ifdef K_DEBUG
-                       tError() << "TupFileManager::save() - Error: Can't create path " << projectDir.path();
+                    QString msg = "TupFileManager::save() - Error: Can't create path -> " + projectDir.path();
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
                 return false;
             } else {
                 #ifdef K_DEBUG
-                       tDebug() << "TupFileManager::save() - Directory " << projectDir.path() << " created successfully";
+                    QString msg = "TupFileManager::save() - Directory was created successfully -> " + projectDir.path();
+                    #ifdef Q_OS_WIN32
+                        qWarning() << msg;
+                    #else
+                        tWarning() << msg;
+                    #endif
                 #endif
             }
         }
@@ -117,7 +150,12 @@
          projectFile.close();
      } else {
          #ifdef K_DEBUG
-                tError() << "TupFileManager::save() - Error: Can't create file " << projectDir.path() + QDir::separator() + "project.tpp";
+             QString msg = "TupFileManager::save() - Error: Can't create file -> " + projectDir.path() + QDir::separator() + "project.tpp";
+             #ifdef Q_OS_WIN32
+                 qDebug() << msg;
+             #else
+                 tError() << msg;
+             #endif
          #endif
      }
     }
@@ -125,23 +163,29 @@
     // Save scenes
     {
      int index = 0;
-     foreach (TupScene *scene, project->scenes().values()) {
-              QDomDocument doc;
-              doc.appendChild(scene->toXml(doc));
-
-              QString scenePath = projectDir.path() + QDir::separator() + "scene" + QString::number(index) + ".tps";
-              QFile sceneFile(scenePath);
-
-              if (sceneFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-                  QTextStream st(&sceneFile);
-                  st << doc.toString();
-                  index += 1;
-                  sceneFile.close();
-              } else {
-                  #ifdef K_DEBUG
-                         tError() << "TupFileManager::save() - Error: Can't create file " << scenePath;
+     int totalScenes = project->scenes().size();
+     for (int i = 0; i < totalScenes; i++) {
+          TupScene *scene = project->scenes().at(i);
+          QDomDocument doc;
+          doc.appendChild(scene->toXml(doc));
+          QString scenePath = projectDir.path() + QDir::separator() + "scene" + QString::number(index) + ".tps";
+          QFile sceneFile(scenePath);
+
+          if (sceneFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+              QTextStream st(&sceneFile);
+              st << doc.toString();
+              index += 1;
+              sceneFile.close();
+          } else {
+              #ifdef K_DEBUG
+                  QString msg = "TupFileManager::save() - Error: Can't create file -> " + scenePath;
+                  #ifdef Q_OS_WIN32
+                      qDebug() << msg;
+                  #else
+                      tError() << msg;
                   #endif
-              }
+              #endif
+          }
      }
     }
 
@@ -159,7 +203,12 @@
          lbr.close();
      } else {
          #ifdef K_DEBUG
-                tError() << "TupFileManager::save() - Error: Can't create file " << projectDir.path() + QDir::separator() + "library.tpl";
+             QString msg = "TupFileManager::save() - Error: Can't create file -> " + projectDir.path() + QDir::separator() + "library.tpl";
+             #ifdef Q_OS_WIN32
+                 qDebug() << msg;
+             #else
+                 tError() << msg;
+             #endif
          #endif
      }
     }
@@ -169,11 +218,21 @@
 
     if (ok) {
         #ifdef K_DEBUG
-               tWarning() << "TupFileManager::save() - Project saved in " << fileName;
+            QString msg = "TupFileManager::save() - Project saved in -> " + fileName;
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
     } else {
         #ifdef K_DEBUG
-               tError() << "TupFileManager::save() - Error: Project couldn't be saved in " << fileName;
+            QString msg = "TupFileManager::save() - Error: Project couldn't be saved in -> " + fileName;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 
@@ -183,13 +242,16 @@
 bool TupFileManager::load(const QString &fileName, TupProject *project)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO << fileName;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupFileManager::load()] - fileName: " + fileName;
+        #else
+            T_FUNCINFO << fileName; 
+        #endif
     #endif
 
     TupPackageHandler packageHandler;
 
     if (packageHandler.importPackage(fileName)) {
-
         QDir projectDir(packageHandler.importedProjectPath());
         QFile pfile(projectDir.path() + QDir::separator() + "project.tpp");
 
@@ -198,11 +260,20 @@
             pfile.close();
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupFileManager::load() - Error while open .tpp file. Name: " << pfile.fileName();
-                   tError() << "TupFileManager::load() - Path: " << projectDir.path();
-                   tError() << "TupFileManager::load() - Error Description: " << pfile.errorString();
-                   tError() << "TupFileManager::load() - Error type: " << pfile.error();
+                QString msg1 = "TupFileManager::load() - Error while open .tpp file. Name: " + pfile.fileName();
+                QString msg2 = "TupFileManager::load() - Path: " + projectDir.path();
+                QString msg3 = "TupFileManager::load() - Error Description: " + pfile.errorString(); 
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg1;
+                    qDebug() << msg2;
+                    qDebug() << msg3;
+                #else
+                    tError() << msg1;
+                    tError() << msg2;
+                    tError() << msg3;
+                #endif
             #endif
+
             return false;
         }
 
@@ -231,7 +302,12 @@
                          file.close();
                      } else {
                          #ifdef K_DEBUG
-                                tError() << "TupFileManager::load() - Error: Can't open file " << scenePath;
+                             QString msg = "TupFileManager::load() - Error: Can't open file -> " + scenePath;
+                             #ifdef Q_OS_WIN32
+                                 qDebug() << msg;
+                             #else
+                                 tError() << msg;
+                             #endif
                          #endif
                          return false;
                      }
@@ -243,15 +319,24 @@
 
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupFileManager::load() - Error: No scene files found (*.tps)";
+                QString msg = "TupFileManager::load() - Error: No scene files found (*.tps)";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
             return false;
         }
     }
 
     #ifdef K_DEBUG
-           tError() << "TupFileManager::load() - Error: Can't import package (" << fileName << ")";
+        QString msg = "TupFileManager::load() - Error: Can't import package -> " + fileName;
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
-
     return false;
 }
diff -Nru tupi-0.2+git04/src/store/tupfilemanager.h tupi-0.2+git05/src/store/tupfilemanager.h
--- tupi-0.2+git04/src/store/tupfilemanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupfilemanager.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,6 +36,8 @@
 #ifndef TUPFILEMANAGER_H 
 #define TUPFILEMANAGER_H
 
+#include "tglobal.h"
+
 #include <QObject>
 
 class TupProject;
@@ -44,7 +46,7 @@
  * @author David Cuadrado
 */
 
-class TupFileManager : public QObject
+class TUPI_EXPORT TupFileManager : public QObject
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/store/tupframe.cpp tupi-0.2+git05/src/store/tupframe.cpp
--- tupi-0.2+git04/src/store/tupframe.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupframe.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -47,7 +47,6 @@
 #include "tupprojectloader.h"
 #include "tupscene.h"
 #include "tuplayer.h"
-#include "tdebug.h"
 
 #include <QApplication>
 #include <QGraphicsItem>
@@ -57,6 +56,7 @@
 
 struct TupFrame::Private
 {
+    TupLayer *layer;
     QString name;
     FrameType type;
     bool isLocked;
@@ -71,7 +71,7 @@
     QList<QString> svgIndexes;
     int repeat;
     int zLevelIndex;
-    int layerIndex;
+    // int layerIndex;
 };
 
 TupFrame::TupFrame() : k(new Private)
@@ -80,7 +80,8 @@
 
 TupFrame::TupFrame(TupLayer *parent) : QObject(parent), k(new Private)
 {
-    k->layerIndex = parent->layerIndex();
+    k->layer = parent;
+    // k->layerIndex = parent->layerIndex();
     k->name = "Frame";
     k->type = Regular;
 
@@ -91,12 +92,13 @@
     k->shift = "0";
 
     k->repeat = 1;
-    k->zLevelIndex = (k->layerIndex + 1)*10000; // Layers levels starts from 2
+    // k->zLevelIndex = (k->layerIndex + 1)*10000; // Layers levels starts from 2
+    k->zLevelIndex = (k->layer->layerIndex() + 1)*10000; // Layers levels starts from 2
 }
 
 TupFrame::TupFrame(TupBackground *bg, const QString &label) : QObject(bg), k(new Private)
 {
-    k->layerIndex = 0;
+    // k->layerIndex = 0;
     k->name = label;
     k->isLocked = false;
     k->isVisible = true;
@@ -187,17 +189,29 @@
 void TupFrame::fromXml(const QString &xml)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupFrame::fromXml()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     QDomDocument document;
-	
-    if (! document.setContent(xml)) {
+    
+    if (! document.setContent(xml)) {    
         #ifdef K_DEBUG
-               tError() << "TupFrame::fromXml() - File corrupted!";
-               tWarning() << "Content:";
-               tWarning() << xml;
+            QString msg = "TupFrame::fromXml() - File corrupted!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+                qWarning() << "Content:";
+                qWarning() << xml;
+            #else
+                tError() << msg;
+                tWarning() << "Content:";
+                tWarning() << xml;            
+            #endif
         #endif
+        
         return;
     }
 
@@ -252,6 +266,7 @@
                                      }
                                      n3 = n3.nextSibling();
                               }
+
                               createItem(point, newDoc);
                               last = k->graphics.at(k->graphics.size()-1);
                           }
@@ -291,14 +306,19 @@
 
                                      n2 = n2.nextSibling(); 
                               }
-                          } else {
+                          } else {                              
                               #ifdef K_DEBUG
-                                     tError() << "TupFrame::fromXml() - Fatal Error: Object id is NULL!";
-                              #endif
+                                  QString msg = "TupFrame::fromXml() - Fatal Error: Object id is NULL!";
+                                  #ifdef Q_OS_WIN32
+                                      qDebug() << msg;
+                                  #else
+                                      tError() << msg;
+                                  #endif
+                              #endif    
                           }
                } 
            }
-		
+        
            n = n.nextSibling();
     }
 }
@@ -368,9 +388,13 @@
 void TupFrame::addSvgItem(const QString &id, TupSvgItem *item)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO << id;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupFrame::addSvgItem()] - id: " << id;
+        #else
+            T_FUNCINFO << id;
+        #endif
     #endif
-
+    
     k->svgIndexes.append(id);
     item->setZValue(k->zLevelIndex);
     k->zLevelIndex++;
@@ -398,70 +422,69 @@
     }
 }
 
-// SQA: This method is really required?
-/*
 void TupFrame::insertItem(int position, QGraphicsItem *item)
 {
-    QGraphicsItem *oldItem = k->graphics.at(position)->item();
-    int zLevel = oldItem->zValue();
-
-    item->setZValue(zLevel);
     TupGraphicObject *object = new TupGraphicObject(item, this);
-    k->graphics[position] = object;
-}
-*/
 
-/*
-void TupFrame::addSvgItem(int position, TupSvgItem *item)
-{
-    item->setZValue(k->zLevelIndex);
-    k->zLevelIndex++;
+    k->graphics.insert(position, object);
+    k->objectIndexes.insert(position, "path");
+
+    for (int i=position+1; i < k->graphics.size(); ++i) {
+         int zLevel = k->graphics.at(i)->itemZValue();
+         k->graphics.at(i)->setItemZValue(zLevel + 1);
+    }
+    for (int i=0; i < k->svg.size(); ++i) {
+         int zLevel = k->svg.at(i)->zValue();
+         if (zLevel < item->zValue())
+             k->svg.at(i)->setZValue(zLevel + 1);
+    }
 
-    k->svg[position] = item;
+    k->zLevelIndex++;
 }
-*/
 
-// SQA: This method requires tests + refactoring
-QGraphicsItemGroup *TupFrame::createItemGroupAt(int position, QList<qreal> group)
+int TupFrame::createItemGroup(int position, QList<int> group)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupFrame::createItemGroup()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
-    Q_UNUSED(position);
 
-    qSort(group.begin(), group.end());
+    int zBase = this->item(position)->zValue();
+    TupItemGroup *itemGroup = new TupItemGroup;
 
-    TupItemGroup *itemGroup = new TupItemGroup(0);
-    int count = 0;
-
-    foreach (qreal p, group) {
-             int pos = (int)p - count;
-             QGraphicsItem *item = this->item(pos);
-             TupGraphicObject *object = this->graphic(pos);
-             object->setItem(0);
-             removeGraphicAt(pos);
+    foreach (int index, group) {
+             QGraphicsItem *item = this->item(index);
              itemGroup->addToGroup(item);
-             delete object;
-             count++;
     }
 
-    // QGraphicsItem *block = qgraphicsitem_cast<QGraphicsItem *>(itemGroup);
-    // insertItem(position, block);
+    for (int index = group.size() - 1; index >= 0; index--)
+         removeGraphicAt(group.at(index));
+
+    QGraphicsItem *block = qgraphicsitem_cast<QGraphicsItem *>(itemGroup);
+    block->setZValue(zBase);
+
+    insertItem(position, block);
 
-    return itemGroup;
+    return position;
 }
 
-// SQA: This method requires tests + refactoing
-QList<QGraphicsItem *> TupFrame::destroyItemGroup(int position)
+QList<QGraphicsItem *> TupFrame::splitItemsGroup(int position)
 {
     QList<QGraphicsItem *> items;
 
-    if (TupItemGroup *group = qgraphicsitem_cast<TupItemGroup *>(item(position))) {
-        removeGraphicAt(position);
-        items = group->childs();
-        foreach (QGraphicsItem *child, group->childs()) {
-                 group->removeFromGroup(child);
-                 // addItem(child);
+    QGraphicsItem *object = qgraphicsitem_cast<TupItemGroup *>(item(position));
+
+    if (object) {
+        if (TupItemGroup *group = qgraphicsitem_cast<TupItemGroup *>(item(position))) {
+            removeGraphicAt(position);
+            items = group->childs();
+            foreach (QGraphicsItem *child, group->childs()) {
+                     group->removeFromGroup(child);
+                     addItem("path", child);
+            }
         }
     }
 
@@ -478,16 +501,32 @@
 
 bool TupFrame::moveItem(TupLibraryObject::Type type, int currentIndex, int action)
 {
+    if ((k->svg.size() + k->graphics.size()) == 1)  
+        return true;
+
+    int layerIndex = 0;
+    if (k->type == Regular)
+        layerIndex = k->layer->layerIndex();
+
     MoveItemType move = MoveItemType(action); 
     switch(move) {
            case MoveBack :
              {
-                int zMin = (k->layerIndex + 1)*10000;
+                int zMin = (layerIndex + 1)*10000;
 
                 if (type == TupLibraryObject::Svg) {
                     int zLimit = k->svg.at(currentIndex)->zValue();
-                    if (zLimit == zMin)
+                    if (zLimit == zMin) {
+                        #ifdef K_DEBUG
+                            QString msg = "TupFrame::moveItem() - MoveBack: Minimum level has been reached! (SVG)";
+                            #ifdef Q_OS_WIN32
+                                qWarning() << msg;
+                            #else
+                                tWarning() << msg;
+                            #endif
+                        #endif
                         return true;
+                    }
 
                     if (k->svg.size() > 1) {
                         TupSvgItem *object = k->svg.takeAt(currentIndex);
@@ -515,8 +554,17 @@
                     return true;
                 } else {
                     int zLimit = k->graphics.at(currentIndex)->itemZValue();
-                    if (zLimit == zMin)
+                    if (zLimit == zMin) {
+                        #ifdef K_DEBUG
+                            QString msg = "TupFrame::moveItem() - MoveBack: Minimum level has been reached! (VECTOR/RASTER)";
+                            #ifdef Q_OS_WIN32
+                                qWarning() << msg; 
+                            #else
+                                tWarning() << msg;
+                            #endif
+                        #endif
                         return true;
+                    }
 
                     if (k->graphics.size() > 1) {
                         TupGraphicObject *object = k->graphics.takeAt(currentIndex);
@@ -551,8 +599,17 @@
                 int zMax = k->zLevelIndex - 1;
                 if (type == TupLibraryObject::Svg) {
                     int zLimit = k->svg.at(currentIndex)->zValue();
-                    if (zLimit == zMax)
+                    if (zLimit == zMax) {
+                        #ifdef K_DEBUG
+                            QString msg = "TupFrame::moveItem() - MoveToFront: Maximum level has been reached! (SVG)";
+                            #ifdef Q_OS_WIN32
+                                qWarning() << msg;
+                            #else
+                                tWarning() << msg;
+                            #endif
+                        #endif
                         return true;
+                    }
 
                     if (k->svg.size() > 1) {
                         TupSvgItem *object = k->svg.takeAt(currentIndex);
@@ -579,8 +636,17 @@
                     return true;
                 } else {
                     int zLimit = k->graphics.at(currentIndex)->itemZValue();
-                    if (zLimit == zMax)
+                    if (zLimit == zMax) {
+                        #ifdef K_DEBUG
+                            QString msg = "TupFrame::moveItem() - MoveToFront: Maximum level has been reached! (VECTOR/RASTER)";
+                            #ifdef Q_OS_WIN32
+                                qWarning() << msg;
+                            #else
+                                tWarning() << msg;
+                            #endif
+                        #endif
                         return true;
+                    }
 
                     if (k->graphics.size() > 1) {
                         TupGraphicObject *object = k->graphics.takeAt(currentIndex);
@@ -610,11 +676,21 @@
            break;
            case MoveOneLevelBack :
              {
-                int zMin = (k->layerIndex + 1)*10000;
+                // int zMin = (k->layerIndex + 1)*10000;
+                int zMin = (layerIndex + 1)*10000;
 
                 if (type == TupLibraryObject::Svg) {
-                    if (k->svg.at(currentIndex)->zValue() == zMin)
+                    if (k->svg.at(currentIndex)->zValue() == zMin) {
+                        #ifdef K_DEBUG
+                            QString msg = "TupFrame::moveItem() - MoveOneLevelBack: Minimum level has been reached! (SVG)";
+                            #ifdef Q_OS_WIN32
+                                qWarning() << msg;
+                            #else
+                                tWarning() << msg;
+                            #endif
+                        #endif
                         return true;
+                    }
 
                     TupSvgItem *object = k->svg.at(currentIndex);
                     int zLimit = object->zValue();
@@ -648,16 +724,31 @@
                                      return true;
                                  }
                             }
-                        } else {
+                        } else {                            
                             #ifdef K_DEBUG
-                                   tError() << "TupFrame::moveItem() - Fatal Error: Something went wrong [ case MoveOneLevelBack/Svg ]";
+                                QString msg = "TupFrame::moveItem() - Fatal Error: Something went wrong [ case MoveOneLevelBack/Svg ]";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
                             #endif
+
                             return false;
                         }
                     }
                 } else {
-                    if (k->graphics.at(currentIndex)->itemZValue() == zMin)
+                    if (k->graphics.at(currentIndex)->itemZValue() == zMin) {
+                        #ifdef K_DEBUG
+                            QString msg = "TupFrame::moveItem() - MoveOneLevelBack: Minimum level has been reached! (VECTOR/RASTER)";
+                            #ifdef Q_OS_WIN32
+                                qWarning() << msg;
+                            #else
+                                tWarning() << msg;
+                            #endif
+                        #endif
                         return true;
+                    }
 
                     TupGraphicObject *object = k->graphics.at(currentIndex);
                     int zLimit = object->itemZValue();
@@ -691,10 +782,16 @@
                                      return true;
                                  }
                             }
-                        } else {
+                        } else {                            
                             #ifdef K_DEBUG
-                                   tError() << "TupFrame::moveItem() - Fatal Error: Something went wrong [ case MoveOneLevelBack/Items ]";
+                                QString msg = "TupFrame::moveItem() - Fatal Error: Something went wrong [ case MoveOneLevelBack/Items ]";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
                             #endif
+                            
                             return false;
                         }
                     }
@@ -706,8 +803,17 @@
                 int zMax = k->zLevelIndex - 1;
 
                 if (type == TupLibraryObject::Svg) {
-                    if (k->svg.at(currentIndex)->zValue() == zMax)
+                    if (k->svg.at(currentIndex)->zValue() == zMax) {
+                        #ifdef K_DEBUG
+                            QString msg = "TupFrame::moveItem() - MoveOneLevelToFront: Maximum level has been reached! (SVG)";
+                            #ifdef Q_OS_WIN32
+                                qWarning() << msg;
+                            #else
+                                tWarning() << msg;
+                            #endif
+                        #endif
                         return true;
+                    }
 
                     TupSvgItem *object = k->svg.at(currentIndex);
                     int zLimit = object->zValue();
@@ -741,16 +847,31 @@
                                      return true;
                                  }
                             }
-                        } else {
+                        } else {                            
                             #ifdef K_DEBUG
-                                   tError() << "TupFrame::moveItem() - Fatal Error: Something went wrong [ case MoveOneLevelToFront/Svg ]";
+                                QString msg = "TupFrame::moveItem() - Fatal Error: Something went wrong [ case MoveOneLevelToFront/Svg ]";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
                             #endif
+                            
                             return false;
                         }
                     }
                 } else {
-                    if (k->graphics.at(currentIndex)->itemZValue() == zMax)
+                    if (k->graphics.at(currentIndex)->itemZValue() == zMax) {
+                        #ifdef K_DEBUG
+                            QString msg = "TupFrame::moveItem() - MoveOneLevelToFront: Maximum level has been reached! (VECTOR/RASTER)";
+                            #ifdef Q_OS_WIN32
+                                qWarning() << msg;
+                            #else
+                                tWarning() << msg;
+                            #endif
+                        #endif
                         return true;
+                    }
 
                     TupGraphicObject *object = k->graphics.at(currentIndex);
                     int zLimit = object->itemZValue();
@@ -786,7 +907,12 @@
                             }
                         } else {
                             #ifdef K_DEBUG
-                                   tError() << "TupFrame::moveItem() - Fatal Error: Something went wrong [ case MoveOneLevelToFront/Items ]";
+                                QString msg = "TupFrame::moveItem() - Fatal Error: Something went wrong [ case MoveOneLevelToFront/Items ]";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg;
+                                #else
+                                    tError() << msg;
+                                #endif
                             #endif
                             return false;
                         }
@@ -797,9 +923,14 @@
     }
 
     #ifdef K_DEBUG
-           tError() << "TupFrame::moveItem() - Fatal Error: Something went wrong!";
+        QString msg = "TupFrame::moveItem() - Fatal Error: Something went wrong!";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
-
+    
     return false;
 }
 
@@ -807,7 +938,12 @@
 {
     if ((position < 0) || (position >= k->graphics.size())) {
         #ifdef K_DEBUG
-               tError() << "TupFrame::removeGraphicAt() - Fatal Error: invalid object index! [ " << position << " ]";
+            QString msg = "TupFrame::removeGraphicAt() - Fatal Error: invalid object index! [ " + QString::number(position) + " ]";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return false;
     }
@@ -836,7 +972,12 @@
     } 
 
     #ifdef K_DEBUG
-           tError() << "TupFrame::removeGraphicAt() - Error: Object at position " << position << " is NULL!";
+        QString msg = "TupFrame::removeGraphicAt() - Error: Object at position " + QString::number(position) + " is NULL!";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
 
     return false;
@@ -845,12 +986,21 @@
 bool TupFrame::removeSvgAt(int position)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupFrame::removeSvgAt()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
-
-    if ((position < 0) || (position >= k->svg.size())) {
+    
+    if ((position < 0) || (position >= k->svg.size())) {    
         #ifdef K_DEBUG
-               tError() << "TupFrame::removeSvgAt() - Fatal Error: invalid object index! [ " << position << " ]";
+            QString msg = "TupFrame::removeSvgAt() - Fatal Error: invalid object index! [ " + QString::number(position) + " ]";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return false;
     }
@@ -878,14 +1028,24 @@
         k->zLevelIndex--;
 
         #ifdef K_DEBUG
-               tFatal() << "TupFrame::removeSvgAt() - SVG object has been removed (" << position << ")";
+            QString msg = "TupFrame::removeSvgAt() - SVG object has been removed (" + QString::number(position) + ")";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
 
         return true;
     }
 
     #ifdef K_DEBUG
-           tError() << "TupFrame::removeSvgAt() - Error: Couldn't find SVG object (" << position << ")";
+        QString msg = "TupFrame::removeSvgAt() - Error: Couldn't find SVG object (" + QString::number(position) + ")";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
 
     return false;
@@ -895,10 +1055,11 @@
 {
     TupItemFactory itemFactory;
     itemFactory.setLibrary(project()->library());
+
     QGraphicsItem *graphicItem = itemFactory.create(xml);
-    graphicItem->setPos(coords);
 
     if (graphicItem) {
+        graphicItem->setPos(coords);
         QString id = "path";
         if (itemFactory.type() == TupItemFactory::Library)
             id = itemFactory.itemID(xml);
@@ -912,9 +1073,17 @@
     }
 
     #ifdef K_DEBUG
-           tError() << "TupFrame::createItem() - Fatal Error: Couldn't create QGraphicsItem object";
-           tError() << "TupFrame::createItem() - xml: ";
-           tError() << xml;
+        QString msg1 = "TupFrame::createItem() - Fatal Error: Couldn't create QGraphicsItem object";
+        QString msg2 = "TupFrame::createItem() - xml: ";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg1;
+            qDebug() << msg2;
+            qDebug() << xml;
+        #else
+            tError() << msg1;
+            tError() << msg2;    
+            tError() << xml;
+        #endif
     #endif
 
     return 0;
@@ -925,9 +1094,17 @@
     QDomDocument document;
     if (!document.setContent(xml)) {
         #ifdef K_DEBUG
-               tError() << "TupFrame::createSvgItem() - Fatal Error: Svg xml content is invalid!";
-               tError() << "TupFrame::createSvgItem() - xml: ";
-               tError() << xml;
+            QString msg1 = "TupFrame::createSvgItem() - Fatal Error: Svg xml content is invalid!";
+            QString msg2 = "TupFrame::createSvgItem() - xml: ";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg1;
+                qDebug() << msg2;
+                qDebug() << xml;
+            #else
+                tError() << msg1;
+                tError() << msg2;    
+                tError() << xml;
+            #endif
         #endif
         return 0;
     }
@@ -946,18 +1123,28 @@
                 TupProjectLoader::createItem(scene()->objectIndex(), layer()->objectIndex(), index(), 
                                              k->svg.size() - 1, coords, TupLibraryObject::Svg, xml, project());
             return item;
-        } else {
+        } else {        
             #ifdef K_DEBUG
-                   tError() << "TupFrame::createSvgItem() - Fatal Error: Svg object is invalid!";
+                QString msg = "TupFrame::createSvgItem() - Fatal Error: Svg object is invalid!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
             return 0;
         }
     }
 
     #ifdef K_DEBUG
-           tError() << "TupFrame::createSvgItem() - Fatal Error: TupLibraryObject variable is NULL!";
+        QString msg = "TupFrame::createSvgItem() - Fatal Error: TupLibraryObject variable is NULL!";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
-
+    
     return 0;
 }
 
@@ -985,9 +1172,14 @@
 {
     if ((position < 0) || (position >= k->graphics.count())) {
         #ifdef K_DEBUG
-               tError() << "TupFrame::graphic() - Fatal Error: index out of bound [ " << position << " ] /  Total items: " << k->graphics.count();
+            QString msg = "TupFrame::graphic() - Fatal Error: index out of bound [ " + QString::number(position) + " ] /  Total items: " + QString::number(k->graphics.count());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
-
+        
         return 0;
     } 
 
@@ -998,9 +1190,14 @@
 {
     if ((position < 0) || (position >= k->svg.count())) {
         #ifdef K_DEBUG
-               tError() << "TupFrame::svg() -  Fatal Error: index out of bound [ " << position << " ] / Total items: " << k->svg.count();
+            QString msg = "TupFrame::svg() -  Fatal Error: index out of bound [ " + QString::number(position) + " ] / Total items: " + QString::number(k->svg.count());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
-
+        
         return 0;
     }
 
@@ -1011,7 +1208,12 @@
 {
     if ((position < 0) || (position >= k->graphics.count())) {
         #ifdef K_DEBUG
-               tError() << "TupFrame::item() -  Fatal Error: index out of bound [ " << position << " ] / Total items: " << k->graphics.count();
+            QString msg = "TupFrame::item() -  Fatal Error: index out of bound [ " + QString::number(position) + " ] / Total items: " + QString::number(k->graphics.count());
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
 
         return 0;
@@ -1024,15 +1226,26 @@
             return item;
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupFrame::item() -  Fatal Error: QGraphicsItem object is NULL!";
+                QString msg = "TupFrame::item() -  Fatal Error: QGraphicsItem object is NULL!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
-            return 0;
+            return 0;        
         }
     }
 
     #ifdef K_DEBUG
-           tError() << "TupFrame::item() -  Fatal Error: TupGraphicObject is NULL!";
+        QString msg = "TupFrame::item() -  Fatal Error: TupGraphicObject is NULL!";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
+
     return 0;
 }
 
@@ -1099,6 +1312,11 @@
     return k->svg.count();
 }
 
+int TupFrame::itemsTotalCount()
+{
+    return k->graphics.count() + k->svg.count();
+}
+
 int TupFrame::getTopZLevel()
 {
     return k->zLevelIndex;
@@ -1157,3 +1375,34 @@
          }
     }
 }
+
+void TupFrame::updateZLevel(int zLevelIndex)
+{
+    int max = 0;
+    int graphicsSize = k->graphics.size();
+    for (int i = 0; i < graphicsSize; ++i) {
+         TupGraphicObject *object = k->graphics.at(i); 
+         int currentZValue = object->itemZValue();
+         int zLevel = zLevelIndex + (currentZValue % 10000);
+         object->setItemZValue(zLevel);
+         if (i == (graphicsSize-1)) {
+             if (zLevel > max)
+                 max = zLevel;
+         }
+    }
+
+    graphicsSize = k->svgIndexes.size(); 
+    for (int i = 0; i < graphicsSize; ++i) {
+         TupSvgItem *item = k->svg.value(i);
+         int currentZValue = item->zValue();
+         int zLevel = zLevelIndex + (currentZValue % 10000);
+         item->setZValue(zLevel);
+         if (i == (graphicsSize-1)) {
+             if (zLevel > max)
+                 max = zLevel;
+         }
+    }
+ 
+    k->zLevelIndex = max;
+    k->zLevelIndex++;
+}
diff -Nru tupi-0.2+git04/src/store/tupframegroup.cpp tupi-0.2+git05/src/store/tupframegroup.cpp
--- tupi-0.2+git04/src/store/tupframegroup.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupframegroup.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,7 +35,7 @@
 
 #include "tupframegroup.h"
 
-TupFrameGroup::TupFrameGroup(TupLayer *parent ) : TupFrame(parent)
+TupFrameGroup::TupFrameGroup(TupLayer *parent) : TupFrame(parent)
 {
 }
 
@@ -45,10 +45,8 @@
 
 void TupFrameGroup::addFrame(TupFrame *frame)
 {
-	if ( ! m_frames.contains(frame ) && frame != this )
-	{
-		m_frames << frame;
-	}
+    if (! m_frames.contains(frame) && frame != this)
+        m_frames << frame;
 }
 
 
diff -Nru tupi-0.2+git04/src/store/tupframegroup.h tupi-0.2+git05/src/store/tupframegroup.h
--- tupi-0.2+git04/src/store/tupframegroup.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupframegroup.h	2014-12-15 14:21:34.000000000 +0000
@@ -37,13 +37,13 @@
 #define TUPFRAMEGROUP_H
 
 #include "tupframe.h"
-#include "tupglobal_store.h"
+#include "tglobal.h"
 
 /**
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupFrameGroup : public TupFrame
+class TUPI_EXPORT TupFrameGroup : public TupFrame
 {
     public:
         TupFrameGroup(TupLayer *parent = 0);
diff -Nru tupi-0.2+git04/src/store/tupframe.h tupi-0.2+git05/src/store/tupframe.h
--- tupi-0.2+git04/src/store/tupframe.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupframe.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,10 +36,10 @@
 #ifndef TUPFRAME_H
 #define TUPFRAME_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
 #include "tupsvgitem.h"
 #include "tupbackground.h"
-#include "tupglobal_store.h"
 
 #include <QGraphicsScene>
 #include <QDomDocument>
@@ -62,7 +62,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupFrame : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupFrame : public QObject, public TupAbstractSerializable
 {
     public:
        enum FrameType { DynamicBg = 0, StaticBg, Regular };
@@ -95,12 +95,9 @@
        void updateIdFromFrame(const QString &oldId, const QString &newId);
 
        void addSvgItem(const QString &id, TupSvgItem *item);
-       // void addSvgItem(int position, TupSvgItem *item);
        void removeSvgItemFromFrame(const QString &id);
        void updateSvgIdFromFrame(const QString &oldId, const QString &newId);
 
-       // void insertItem(int position, QGraphicsItem *item);
-       
        void replaceItem(int position, QGraphicsItem *item);
        bool moveItem(TupLibraryObject::Type type, int currentPosition, int action);
        
@@ -119,8 +116,8 @@
        TupSvgItem *svg(int position) const; 
        QGraphicsItem *item(int position) const;
        
-       QGraphicsItemGroup *createItemGroupAt(int position, QList<qreal> group);
-       QList<QGraphicsItem *> destroyItemGroup(int position);
+       int createItemGroup(int position, QList<int> group);
+       QList<QGraphicsItem *> splitItemsGroup(int position);
              
        TupLayer *layer() const;
        TupScene *scene() const;
@@ -138,6 +135,7 @@
        void clear();
        int graphicItemsCount();
        int svgItemsCount();
+       int itemsTotalCount();
 
        int getTopZLevel();
 
@@ -145,12 +143,14 @@
 
        void reloadGraphicItem(const QString &id, const QString &path);
        void reloadSVGItem(const QString &id, TupLibraryObject *object);
+       void updateZLevel(int zLevelIndex);
        
     public:
        virtual void fromXml(const QString &xml);
        virtual QDomElement toXml(QDomDocument &doc) const;
        
     private:
+       void insertItem(int position, QGraphicsItem *item);
        struct Private;
        Private *const k;
 };
diff -Nru tupi-0.2+git04/src/store/tupglobal_store.h tupi-0.2+git05/src/store/tupglobal_store.h
--- tupi-0.2+git04/src/store/tupglobal_store.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupglobal_store.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/***************************************************************************
- *   Project TUPI: Magia 2D                                                *
- *   Project Contact: info@maefloresta.com                                 *
- *   Project Website: http://www.maefloresta.com                           *
- *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
- *                                                                         *
- *   Developers:                                                           *
- *   2010:                                                                 *
- *    Gustavo Gonzalez / xtingray                                          *
- *                                                                         *
- *   KTooN's versions:                                                     * 
- *                                                                         *
- *   2006:                                                                 *
- *    David Cuadrado                                                       *
- *    Jorge Cuadrado                                                       *
- *   2003:                                                                 *
- *    Fernado Roldan                                                       *
- *    Simena Dinas                                                         *
- *                                                                         *
- *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
- *   License:                                                              *
- *   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, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef TUPGLOBAL_STORE_H
-#define TUPGLOBAL_STORE_H
-
-#include "tupglobal.h"
-
-#define STORE_EXPORT T_CORE_EXPORT
-
-
-#endif // TUPGLOBAL_STORE_H
-
-
-
-
diff -Nru tupi-0.2+git04/src/store/tupgraphiclibraryitem.cpp tupi-0.2+git05/src/store/tupgraphiclibraryitem.cpp
--- tupi-0.2+git04/src/store/tupgraphiclibraryitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupgraphiclibraryitem.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -36,10 +36,6 @@
 #include "tupgraphiclibraryitem.h"
 #include "tupserializer.h"
 
-#include <QGraphicsTextItem>
-
-#include "tdebug.h"
-
 struct TupGraphicLibraryItem::Private
 {
     QString symbolName;
@@ -64,7 +60,7 @@
     delete k;
 }
 
-TupLibraryObject::Type TupGraphicLibraryItem::type()
+TupLibraryObject::Type TupGraphicLibraryItem::itemType()
 {
     return k->itemType;
 }
@@ -87,18 +83,27 @@
 {
     if (!object) {
         #ifdef K_DEBUG
-            tWarning("library") << "Setting null library object";
+            QString msg = "TupGraphicLibraryItem::setObject() - Setting null library object";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         return;
     }
     
     #ifdef K_DEBUG
-        T_FUNCINFOX("library") << object->symbolName();
+        #ifdef Q_OS_WIN32
+            qWarning() << "TupGraphicLibraryItem::setObject() - object->symbolName(): " << object->symbolName();
+        #else
+            T_FUNCINFOX("library") << object->symbolName();
+        #endif
     #endif
 
     k->symbolName = object->symbolName();
-    switch(object->type())
-    {
+    switch(object->type()) {
         case TupLibraryObject::Item:
         case TupLibraryObject::Text:
         case TupLibraryObject::Image:
diff -Nru tupi-0.2+git04/src/store/tupgraphiclibraryitem.h tupi-0.2+git05/src/store/tupgraphiclibraryitem.h
--- tupi-0.2+git04/src/store/tupgraphiclibraryitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupgraphiclibraryitem.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,11 +36,12 @@
 #ifndef TUPGRAPHICLIBRARYITEM_H
 #define TUPGRAPHICLIBRARYITEM_H
 
+#include "tglobal.h"
 #include "tupproxyitem.h"
 #include "tuplibraryobject.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
+#include <QGraphicsTextItem>
 
 // class TupLibraryObject;
 
@@ -48,14 +49,14 @@
  * @author David Cuadrado
 **/
 
-class STORE_EXPORT TupGraphicLibraryItem : public TupProxyItem, public TupAbstractSerializable
+class TUPI_EXPORT TupGraphicLibraryItem : public TupProxyItem, public TupAbstractSerializable
 {
     public:
         TupGraphicLibraryItem();
         TupGraphicLibraryItem(TupLibraryObject *object);
         ~TupGraphicLibraryItem();
 
-        TupLibraryObject::Type type();
+        TupLibraryObject::Type itemType();
         
         QDomElement toXml(QDomDocument &doc) const;
         void fromXml(const QString &xml);
diff -Nru tupi-0.2+git04/src/store/tupgraphicobject.cpp tupi-0.2+git05/src/store/tupgraphicobject.cpp
--- tupi-0.2+git04/src/store/tupgraphicobject.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupgraphicobject.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -38,11 +38,6 @@
 #include "tupscene.h"
 #include "tupitemtweener.h"
 
-#include <QMatrix>
-#include <QGraphicsItem>
-
-#include "tdebug.h"
-
 struct TupGraphicObject::Private
 {
     QString name;
@@ -57,8 +52,12 @@
 {
     /*
     #ifdef K_DEBUG
-           TINIT;
-    #endif
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupGraphicObject()]";
+        #else
+            TINIT;
+        #endif
+    #endif	
     */
 
     k->item = item;
@@ -73,20 +72,24 @@
 {
     /*
     #ifdef K_DEBUG
-           TEND;
-    #endif
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupGraphicObject()]";
+        #else
+            TEND;
+        #endif
+    #endif	
     */
 
+    /*
     if (k->item)
         delete k->item;
 
-    /*
-    if (k->tween && k->frame->scene()) {
+    if (k->tween && k->frame->scene())
         k->frame->scene()->removeTweenObject(this);
     }
-    */
 
     delete k;
+    */
 }
 
 void TupGraphicObject::fromXml(const QString &xml)
@@ -114,7 +117,12 @@
         initItemData();
     } else {
         #ifdef K_DEBUG
-               tError() << "TupGraphicObject::setItem() - Fatal Error: QGraphicsItem is null!";
+            QString msg = "TupGraphicObject::setItem() - Fatal Error: QGraphicsItem is null!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     } 
 }
diff -Nru tupi-0.2+git04/src/store/tupgraphicobject.h tupi-0.2+git05/src/store/tupgraphicobject.h
--- tupi-0.2+git04/src/store/tupgraphicobject.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupgraphicobject.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,11 +36,13 @@
 #ifndef TUPGRAPHICOBJECT_H
 #define TUPGRAPHICOBJECT_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
 #include "tupframe.h"
-#include "tupglobal_store.h"
 
 #include <QObject>
+#include <QMatrix>
+#include <QGraphicsItem>
 
 class QGraphicsItem;
 class TupItemTweener;
@@ -48,7 +50,7 @@
 /**
  * @author David Cuadrado
 */
-class STORE_EXPORT TupGraphicObject : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupGraphicObject : public QObject, public TupAbstractSerializable
 {
     public:
         enum Transformations { ScaleX = 1, ScaleY, Rotate, TranslateX, TranslateY };
diff -Nru tupi-0.2+git04/src/store/tupitemconverter.cpp tupi-0.2+git05/src/store/tupitemconverter.cpp
--- tupi-0.2+git04/src/store/tupitemconverter.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupitemconverter.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -41,11 +41,6 @@
 #include "tupproxyitem.h"
 #include "tupitemgroup.h"
 
-#include "tdebug.h"
-
-#include <QBrush>
-#include <QPen>
-
 TupItemConverter::TupItemConverter()
 {
 }
@@ -81,12 +76,11 @@
     if (!item) 
         return 0;
     
-    TupPathItem *path = new TupPathItem(item->parentItem(), 0);
+    TupPathItem *path = new TupPathItem(item->parentItem());
     
     QPainterPath ppath;
     
     switch (item->type()) {
-
         case TupPathItem::Type:
         {
             ppath = qgraphicsitem_cast<TupPathItem *>(item)->path();
@@ -95,7 +89,6 @@
 
         case TupRectItem::Type:
         {
-            tFatal() << "TupItemConverter::convertToPath() - Converting rectangle to path!";
             ppath.addRect(qgraphicsitem_cast<TupRectItem *>(item)->rect());
         }
         break;
@@ -125,8 +118,13 @@
         case TupItemGroup::Type:
         {
             #ifdef K_DEBUG
-                tWarning() << "TupItemConverter::convertToPath no support groups";
-            #endif
+                QString msg = "TupItemConverter::convertToPath - Error: Group items are not supported";
+                #ifdef Q_OS_WIN32
+                    qWarning() << msg;
+                #else
+                    tWarning() << msg;
+                #endif
+            #endif	
             delete path;
             return 0;
         }
@@ -135,8 +133,13 @@
         default:
         {
             #ifdef K_DEBUG
-                tWarning() << "TupItemConverter::convertToPath use default";
-            #endif
+                QString msg = "TupItemConverter::convertToPath - Using default converter...";
+                #ifdef Q_OS_WIN32
+                    qWarning() << msg;
+                #else
+                    tWarning() << msg;
+                #endif
+            #endif			
             ppath = item->shape(); // TODO
         }
         break;
@@ -224,4 +227,3 @@
     
     return line;
 }
-
diff -Nru tupi-0.2+git04/src/store/tupitemconverter.h tupi-0.2+git05/src/store/tupitemconverter.h
--- tupi-0.2+git04/src/store/tupitemconverter.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupitemconverter.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,18 +36,22 @@
 #ifndef TUPITEMCONVERTER_H
 #define TUPITEMCONVERTER_H
 
+#include "tglobal.h"
+
+#include <QAbstractGraphicsShapeItem>
+#include <QBrush>
+#include <QPen>
+
 class TupPathItem;
 class TupEllipseItem;
 class TupRectItem;
 class TupLineItem;
 
-#include <QAbstractGraphicsShapeItem>
-
 /**
  * @author David Cuadrado
 */
 
-class TupItemConverter
+class TUPI_EXPORT TupItemConverter
 {
     private:
         TupItemConverter();
diff -Nru tupi-0.2+git04/src/store/tupitemfactory.cpp tupi-0.2+git05/src/store/tupitemfactory.cpp
--- tupi-0.2+git04/src/store/tupitemfactory.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupitemfactory.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupitemfactory.h"
-#include "tdebug.h"
 #include "tupsvg2qt.h"
 #include "tuppathitem.h"
 #include "tuppixmapitem.h"
@@ -49,8 +48,6 @@
 #include "tupgraphicalgorithm.h"
 #include "tupserializer.h"
 
-#include <QGraphicsItem>
-
 struct TupItemFactory::Private
 {
     QGraphicsItem *item;
@@ -59,12 +56,10 @@
 
     QStack<TupItemGroup *> groups;
     QStack<QGraphicsItem *> objects;
-
-    bool addToGroup, isLoading;
+    bool addToGroup;
+    bool isLoading;
     QString textReaded;
-
     const TupLibrary *library;
-
     TupItemFactory::Type type;
 };
 
@@ -117,12 +112,15 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFOX("items") << qname;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupItemFactory::startTag()] - qname: " << qname;
+        #else
+            T_FUNCINFOX("items") << qname;
+        #endif
     #endif
     */
 
     if (qname == "path") {
-
         QPainterPath path;
         TupSvg2Qt::svgpath2qtpath(atts.value("coords"), path);
 
@@ -163,7 +161,6 @@
                        k->item = createItem(qname);
 
                    qgraphicsitem_cast<TupEllipseItem *>(k->item)->setRect(rect);
-                    
                    k->objects.push(k->item);
                }
     } else if (qname == "button") {
@@ -188,37 +185,35 @@
                setReadText(true);
                k->textReaded = "";
     } else if (qname == "line") {
-        QLineF line(atts.value("x1").toDouble(), atts.value("y1").toDouble(), atts.value("x2").toDouble(), atts.value("y2").toDouble());
+               QLineF line(atts.value("x1").toDouble(), atts.value("y1").toDouble(), atts.value("x2").toDouble(), atts.value("y2").toDouble());
         
-        if (k->addToGroup) {
-            TupLineItem *item = qgraphicsitem_cast<TupLineItem *>(createItem(qname));
-            item->setLine(line);
+               if (k->addToGroup) {
+                   TupLineItem *item = qgraphicsitem_cast<TupLineItem *>(createItem(qname));
+                   item->setLine(line);
             
-            k->objects.push(item);
-        } else {
-            if (!k->item)
-                k->item = createItem(qname);
+                   k->objects.push(item);
+               } else {
+               if (!k->item)
+                   k->item = createItem(qname);
             
-            qgraphicsitem_cast<TupLineItem *>(k->item)->setLine(line);
-            k->objects.push(k->item);
+               qgraphicsitem_cast<TupLineItem *>(k->item)->setLine(line);
+               k->objects.push(k->item);
         }
     } else if (qname == "group") {
-        if (k->addToGroup) {
-            TupItemGroup *group = qgraphicsitem_cast<TupItemGroup *>(createItem(qname));
-            
-            k->groups.push(group);
-            k->objects.push(group);
-        } else {
-            if (!k->item)
-                k->item = createItem(qname);
-            k->groups.push(qgraphicsitem_cast<TupItemGroup *>(k->item));
-            k->objects.push(k->item);
-        }
+               if (k->addToGroup) {
+                   TupItemGroup *group = qgraphicsitem_cast<TupItemGroup *>(createItem(qname));
+                   k->groups.push(group);
+                   k->objects.push(group);
+               } else {
+                   if (!k->item)
+                       k->item = createItem(qname);
+                   k->groups.push(qgraphicsitem_cast<TupItemGroup *>(k->item));
+                   k->objects.push(k->item);
+               }
         
-        k->addToGroup = true;
+               k->addToGroup = true;
     } else if (qname == "symbol") {
                if (k->addToGroup) {
-
                    TupGraphicLibraryItem *item = qgraphicsitem_cast<TupGraphicLibraryItem *>(createItem(qname));
 
                    QString id = atts.value("id");
@@ -247,11 +242,8 @@
     //////////
 
     if (qname == "properties" && !k->objects.isEmpty()) {
-
         TupSerializer::loadProperties(k->objects.last(), atts);
-
     } else if (qname == "brush") {
-
                QBrush brush;
                TupSerializer::loadBrush(brush, atts);
 
@@ -264,35 +256,26 @@
                    k->loading = qname;
                    setItemBrush(brush);
                }
-
     } else if (qname == "pen") {
-
                QPen pen;
                k->loading = qname;
                TupSerializer::loadPen(pen, atts);
                setItemPen(pen);
-
     } else if (qname == "font") {
-
                QFont font;
 
                TupSerializer::loadFont(font, atts);
 
                if (TupTextItem *text = qgraphicsitem_cast<TupTextItem *>(k->objects.last()))
                    text->setFont(font);
-
     } else if (qname == "stop") {
-
                if (k->gradient) {
                    QColor c(atts.value("colorName"));
                    c.setAlpha(atts.value("alpha").toInt());
                    k->gradient->setColorAt(atts.value("value").toDouble(), c);
                }
-
     } else if (qname == "gradient") {
-
                k->gradient = TupSerializer::createGradient( atts);
-
     }
 
     return true;
@@ -307,57 +290,46 @@
 {
     /*
     #ifdef K_DEBUG
-           T_FUNCINFOX("items") << qname;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupItemFactory::endTag()] - qname: " << qname;
+        #else
+            T_FUNCINFOX("items") << qname;
+        #endif
     #endif
     */
 
     if (qname == "path") {
-
         if (k->addToGroup)
             k->groups.last()->addToGroup(k->objects.last());
         k->objects.pop();
-
     } else if (qname == "rect") {
-
                if (k->addToGroup)
                    k->groups.last()->addToGroup(k->objects.last());
                k->objects.pop();
-
     } else if (qname == "ellipse") {
-
                if (k->addToGroup)
                    k->groups.last()->addToGroup(k->objects.last());
                k->objects.pop();
-
     } else if (qname == "symbol") {
-
                if (k->addToGroup)
                    k->groups.last()->addToGroup(k->objects.last());
                k->objects.pop();
-
     } else if (qname == "line") {
-
                if (k->addToGroup)
                    k->groups.last()->addToGroup(k->objects.last());
                k->objects.pop();
-
     } else if (qname == "button") {
-
                if (k->addToGroup)
                    k->groups.last()->addToGroup(k->objects.last());
                k->objects.pop();
-
     } else if (qname == "text") {
-
                if (k->addToGroup)
                    k->groups.last()->addToGroup(k->objects.last());
 
                if (TupTextItem *text = qgraphicsitem_cast<TupTextItem *>(k->objects.last()))
                    text->setHtml(k->textReaded);
                k->objects.pop();
-
     } else if (qname == "group") {
-
                k->groups.pop();
                k->addToGroup = !k->groups.isEmpty();
 
@@ -365,17 +337,19 @@
                    k->groups.last()->addToGroup(k->objects.last());
 
                k->objects.pop();
-
     } else if (qname == "gradient") {
-
                if (k->loading == "brush")
                    setItemGradient(*k->gradient, true);
                else
                    setItemGradient(*k->gradient, false);
-
     } else {
                #ifdef K_DEBUG
-                      tWarning("items") << "Unhandled: " << qname;
+                   QString msg = "TupItemFactory::endTag() - Unknown tag: " + qname;
+                   #ifdef Q_OS_WIN32
+                       qWarning() << msg;
+                   #else
+                       tWarning("items") << msg;
+                   #endif
                #endif
     }
 
diff -Nru tupi-0.2+git04/src/store/tupitemfactory.h tupi-0.2+git05/src/store/tupitemfactory.h
--- tupi-0.2+git04/src/store/tupitemfactory.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupitemfactory.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,21 +36,22 @@
 #ifndef TUPITEMFACTORY_H
 #define TUPITEMFACTORY_H
 
+#include "tglobal.h"
 #include "txmlparserbase.h"
-#include "tupglobal_store.h"
 
 #include <QStack>
 #include <QPen>
 #include <QBrush>
+#include <QGraphicsItem>
 
-class QGraphicsItem;
+// class QGraphicsItem;
 class TupLibrary;
 
 /**
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupItemFactory : public TXmlParserBase
+class TUPI_EXPORT TupItemFactory : public TXmlParserBase
 {
     public:
         enum Type
diff -Nru tupi-0.2+git04/src/store/tupitemgroup.cpp tupi-0.2+git05/src/store/tupitemgroup.cpp
--- tupi-0.2+git04/src/store/tupitemgroup.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupitemgroup.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,8 +34,6 @@
  ***************************************************************************/
 
 #include "tupitemgroup.h"
-#include "tdebug.h"
-
 #include "tupserializer.h"
 
 struct TupItemGroup::Private
@@ -43,7 +41,7 @@
     QList<QGraphicsItem *> childs;
 };
 
-TupItemGroup::TupItemGroup(QGraphicsItem *parent , QGraphicsScene *scene) : QGraphicsItemGroup(parent, scene), k(new Private)
+TupItemGroup::TupItemGroup(QGraphicsItem *parent) : QGraphicsItemGroup(parent), k(new Private)
 {
 }
 
@@ -52,7 +50,7 @@
     delete k;
 }
 
-QVariant TupItemGroup::itemChange ( GraphicsItemChange change, const QVariant & value )
+QVariant TupItemGroup::itemChange(GraphicsItemChange change, const QVariant &value)
 {
     if (change == QGraphicsItem::ItemChildRemovedChange) {
         // k->childs.removeAll( qvariant_cast<QGraphicsItem *>(value) );
@@ -91,11 +89,10 @@
 {
     QDomElement root = doc.createElement("group");
     
-    root.appendChild( TupSerializer::properties( this, doc));
-    
-    foreach (QGraphicsItem *item, children()) {
-             root.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml( doc ));
-    }
+    foreach (QGraphicsItem *item, childItems())
+             root.appendChild(dynamic_cast<TupAbstractSerializable *>(item)->toXml(doc));
+
+    root.appendChild(TupSerializer::properties(this, doc));
     
     return root;
 }
diff -Nru tupi-0.2+git04/src/store/tupitemgroup.h tupi-0.2+git05/src/store/tupitemgroup.h
--- tupi-0.2+git04/src/store/tupitemgroup.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupitemgroup.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,8 +36,8 @@
 #ifndef TUPITEMGROUP_H
 #define TUPITEMGROUP_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
 #include <QGraphicsItemGroup>
 
@@ -45,10 +45,10 @@
  * @author Jorge Cuadrado
  **/
 
-class STORE_EXPORT TupItemGroup: public TupAbstractSerializable, public QGraphicsItemGroup
+class TUPI_EXPORT TupItemGroup: public TupAbstractSerializable, public QGraphicsItemGroup
 {
     public:
-        TupItemGroup(QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
+        TupItemGroup(QGraphicsItem *parent = 0);
         ~TupItemGroup();
         virtual void fromXml(const QString &xml);
         virtual QDomElement toXml(QDomDocument &doc) const;
diff -Nru tupi-0.2+git04/src/store/tupitemtweener.cpp tupi-0.2+git05/src/store/tupitemtweener.cpp
--- tupi-0.2+git04/src/store/tupitemtweener.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupitemtweener.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,15 +35,15 @@
 
 #include "tupitemtweener.h"
 #include "tupsvg2qt.h"
-#include "tdebug.h"
 
-#include <QGraphicsItem>
-#include <QHash>
-
-#define VERIFY_STEP(index) if (index > k->frames || k->frames == 0) { \
-                               tWarning("items") << "Invalid step " << index << " for tweening, maximun step are " \
-                                                 << k->frames << "; In " << __FUNCTION__; \
-                               return; }
+#ifdef K_DEBUG
+    #ifdef Q_OS_UNIX
+        #define VERIFY_STEP(index) if (index > k->frames || k->frames == 0) { \
+                                   tWarning("items") << "Invalid step " << index << " for tweening, maximun step are " \
+                                                     << k->frames << "; In " << __FUNCTION__; \
+                                   return; }
+    #endif
+#endif
 
 #define STEP(index) index / (double)k->frames
 
@@ -154,8 +154,14 @@
 void TupItemTweener::addStep(const TupTweenerStep &step)
 {
     int counter = step.index();
-    
-    VERIFY_STEP(counter);
+  
+#ifdef K_DEBUG
+    #ifdef Q_OS_WIN32
+        qWarning() << "TupItemTweener::addStep() - counter: " << counter;
+    #else
+        VERIFY_STEP(counter);
+    #endif
+#endif
     
     if (step.has(TupTweenerStep::Position))
         setPosAt(counter, step.position());
@@ -183,39 +189,79 @@
 
 void TupItemTweener::setPosAt(int index, const QPointF &pos)
 {
-    VERIFY_STEP(index);
+#ifdef K_DEBUG
+    #ifdef Q_OS_WIN32
+        qWarning() << "TupItemTweener::setPosAt() - index: " << index;
+    #else
+        VERIFY_STEP(index);
+    #endif
+#endif
+
     k->step(index)->setPosition(pos);
 }
 
 void TupItemTweener::setRotationAt(int index, double angle)
 {
-    VERIFY_STEP(index);
+#ifdef K_DEBUG
+    #ifdef Q_OS_WIN32
+        qWarning() << "TupItemTweener::setRotationAt() - index: " << index;
+    #else
+        VERIFY_STEP(index);
+    #endif
+#endif
 
-    // tError() << "TupItemTweener::setRotationAt() - Index: " << index << " - Angle: " << angle;
     k->step(index)->setRotation(angle);
 }
 
 void TupItemTweener::setScaleAt(int index, double sx, double sy)
 {
-    VERIFY_STEP(index);
+#ifdef K_DEBUG
+    #ifdef Q_OS_WIN32
+        qWarning() << "TupItemTweener::setScaleAt() - index: " << index;
+    #else
+        VERIFY_STEP(index);
+    #endif
+#endif
+
     k->step(index)->setScale(sx, sy);
 }
 
 void TupItemTweener::setShearAt(int index, double sx, double sy)
 {
-    VERIFY_STEP(index);
+#ifdef K_DEBUG
+    #ifdef Q_OS_WIN32
+        qWarning() << "TupItemTweener::setShearAt() - index: " << index;
+    #else
+        VERIFY_STEP(index);
+    #endif
+#endif
+
     k->step(index)->setShear(sx, sy);
 }
 
 void TupItemTweener::setOpacityAt(int index, double opacity)
 {
-    VERIFY_STEP(index);
+#ifdef K_DEBUG
+    #ifdef Q_OS_WIN32
+        qWarning() << "TupItemTweener::setOpacityAt() - index: " << index;
+    #else
+        VERIFY_STEP(index);
+    #endif
+#endif
+
     k->step(index)->setOpacity(opacity);
 }
 
 void TupItemTweener::setColorAt(int index, const QColor &color)
 {
-    VERIFY_STEP(index);
+#ifdef K_DEBUG
+    #ifdef Q_OS_WIN32
+        qWarning() << "TupItemTweener::setColorAt() - index: " << index;
+    #else
+        VERIFY_STEP(index);
+    #endif
+#endif
+
     k->step(index)->setColor(color);
 }
 
@@ -252,8 +298,14 @@
 void TupItemTweener::fromXml(const QString &xml)
 {
     #ifdef K_DEBUG
-           tWarning() << "TupItemTweener::fromXml() - Tween content: ";
+        QString msg = "TupItemTweener::fromXml() - Tween content: ";
+        #ifdef Q_OS_WIN32
+           qWarning() << msg;
+           qWarning() << xml;
+        #else
+           tWarning() << msg;
            tWarning() << xml;
+        #endif
     #endif
     
     QDomDocument doc;
@@ -426,7 +478,6 @@
 
                        TupTweenerStep *step = new TupTweenerStep(0);
                        step->fromXml(stepDoc);
-
                        addStep(*step);
 
                        delete step;
@@ -441,17 +492,26 @@
 QDomElement TupItemTweener::toXml(QDomDocument &doc) const
 {
     #ifdef K_DEBUG
-           tWarning() << "TupItemTweener::toXml() - Saving tween: " << k->name;
-           tWarning() << "TupItemTweener::toXml() - Type: " << k->type;
+        QString msg1 = "TupItemTweener::toXml() - Saving tween: " + k->name;
+        QString msg2 = "TupItemTweener::toXml() - Type: " + QString::number(k->type);
+        #ifdef Q_OS_WIN32
+           qWarning() << msg1;
+           qWarning() << msg2;
+        #else
+           tWarning() << msg1;
+           tWarning() << msg2;
+        #endif
     #endif
 
     QDomElement root = doc.createElement("tweening");
     root.setAttribute("name", k->name);
     root.setAttribute("type", k->type);
-    root.setAttribute("initFrame", k->initFrame);
-    root.setAttribute("initLayer", k->initLayer);
-    root.setAttribute("initScene", k->initScene);
-    root.setAttribute("frames", k->frames);
+
+    root.setAttribute("initFrame", QString::number(k->initFrame));
+    root.setAttribute("initLayer", QString::number(k->initLayer));
+    root.setAttribute("initScene", QString::number(k->initScene));
+    root.setAttribute("frames", QString::number(k->frames));
+
     root.setAttribute("origin", QString::number(k->originPoint.x()) + "," + QString::number(k->originPoint.y()));
 
     if (k->type == TupItemTweener::Compound) {
@@ -460,8 +520,8 @@
         for (int i=0; i < k->tweenList.size(); i++) {
              if (k->tweenList.at(i) == TupItemTweener::Position) {
                  QDomElement position = doc.createElement("position");
-                 position.setAttribute("init", k->compPositionInitFrame);
-                 position.setAttribute("frames", k->compPositionFrames);
+                 position.setAttribute("init", QString::number(k->compPositionInitFrame));
+                 position.setAttribute("frames", QString::number(k->compPositionFrames));
                  position.setAttribute("coords", k->path);
                  settings.appendChild(position);
              }
@@ -470,46 +530,45 @@
         root.appendChild(settings); 
 
     } else { 
-
         if (k->type == TupItemTweener::Position)
             root.setAttribute("coords", k->path);
 
         if (k->type == TupItemTweener::Rotation) {
             root.setAttribute("rotationType", k->rotationType);
-            root.setAttribute("rotateSpeed", k->rotateSpeed);
+            root.setAttribute("rotateSpeed", QString::number(k->rotateSpeed));
 
             if (k->rotationType == TupItemTweener::Continuos) {
                 root.setAttribute("rotateDirection", k->rotateDirection); 
             } else if (k->rotationType == TupItemTweener::Partial) {
-                       root.setAttribute("rotateLoop", k->rotateLoop);
-                       root.setAttribute("rotateStartDegree", k->rotateStartDegree);
-                       root.setAttribute("rotateEndDegree", k->rotateEndDegree); 
-                       root.setAttribute("rotateReverseLoop", k->rotateReverseLoop);
+                       root.setAttribute("rotateLoop", QString::number(k->rotateLoop));
+                       root.setAttribute("rotateStartDegree", QString::number(k->rotateStartDegree));
+                       root.setAttribute("rotateEndDegree", QString::number(k->rotateEndDegree)); 
+                       root.setAttribute("rotateReverseLoop", QString::number(k->rotateReverseLoop));
             }
         }
 
         if (k->type == TupItemTweener::Scale) {
-            root.setAttribute("scaleAxes", k->scaleAxes);
-            root.setAttribute("scaleFactor", k->scaleFactor);
-            root.setAttribute("scaleIterations", k->scaleIterations);
-            root.setAttribute("scaleLoop", k->scaleLoop);
-            root.setAttribute("scaleReverseLoop", k->scaleReverseLoop);
+            root.setAttribute("scaleAxes", QString::number(k->scaleAxes));
+            root.setAttribute("scaleFactor", QString::number(k->scaleFactor));
+            root.setAttribute("scaleIterations", QString::number(k->scaleIterations));
+            root.setAttribute("scaleLoop", QString::number(k->scaleLoop));
+            root.setAttribute("scaleReverseLoop", QString::number(k->scaleReverseLoop));
         }
 
         if (k->type == TupItemTweener::Shear) {
-            root.setAttribute("shearAxes", k->shearAxes);
-            root.setAttribute("shearFactor", k->shearFactor);
-            root.setAttribute("shearIterations", k->shearIterations);
-            root.setAttribute("shearLoop", k->shearLoop);
-            root.setAttribute("shearReverseLoop", k->shearReverseLoop);
+            root.setAttribute("shearAxes", QString::number(k->shearAxes));
+            root.setAttribute("shearFactor", QString::number(k->shearFactor));
+            root.setAttribute("shearIterations", QString::number(k->shearIterations));
+            root.setAttribute("shearLoop", QString::number(k->shearLoop));
+            root.setAttribute("shearReverseLoop", QString::number(k->shearReverseLoop));
         }
 
         if (k->type == TupItemTweener::Opacity) {
-            root.setAttribute("initOpacityFactor", k->initOpacityFactor); 
-            root.setAttribute("endOpacityFactor", k->endOpacityFactor); 
-            root.setAttribute("opacityIterations", k->opacityIterations);
-            root.setAttribute("opacityLoop", k->opacityLoop);
-            root.setAttribute("opacityReverseLoop", k->opacityReverseLoop);
+            root.setAttribute("initOpacityFactor", QString::number(k->initOpacityFactor)); 
+            root.setAttribute("endOpacityFactor", QString::number(k->endOpacityFactor)); 
+            root.setAttribute("opacityIterations", QString::number(k->opacityIterations));
+            root.setAttribute("opacityLoop", QString::number(k->opacityLoop));
+            root.setAttribute("opacityReverseLoop", QString::number(k->opacityReverseLoop));
         } 
 
         if (k->type == TupItemTweener::Coloring) {
@@ -519,9 +578,9 @@
             colorText = QString::number(k->endingColor.red()) + "," + QString::number(k->endingColor.green()) 
                                 + "," + QString::number(k->endingColor.blue());
             root.setAttribute("endingColor", colorText);
-            root.setAttribute("colorIterations", k->colorIterations);
-            root.setAttribute("colorLoop", k->colorLoop);
-            root.setAttribute("colorReverseLoop", k->colorReverseLoop);
+            root.setAttribute("colorIterations", QString::number(k->colorIterations));
+            root.setAttribute("colorLoop", QString::number(k->colorLoop));
+            root.setAttribute("colorReverseLoop", QString::number(k->colorReverseLoop));
         }
  
     }
@@ -568,7 +627,9 @@
             case TupItemTweener::Compound :
                  type = QString(tr("Compound Tween"));
                  break;
-
+            case TupItemTweener::Papagayo :
+                 type = QString(tr("Papagayo Lip-sync"));
+                 break;
     }
 
     return type;
@@ -711,10 +772,7 @@
 
 bool TupItemTweener::contains(TupItemTweener::Type type)
 {
-    // tError() << "TupItemTweener::contains() - Type List Size: " << k->tweenList.size();
-
     for (int i=0; i < k->tweenList.size(); i++) {
-         tFatal() << "TupItemTweener::contains() - type: " << k->tweenList.at(i);
          if (k->tweenList.at(i) == type)
              return true;
     }
diff -Nru tupi-0.2+git04/src/store/tupitemtweener.h tupi-0.2+git05/src/store/tupitemtweener.h
--- tupi-0.2+git04/src/store/tupitemtweener.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupitemtweener.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,13 +36,15 @@
 #ifndef TUPITEMTWEENER_H
 #define TUPITEMTWEENER_H
 
+#include "tglobal.h"
 #include "tuptweenerstep.h"
-#include "tupglobal_store.h"
 
 #include <QObject>
 #include <QMatrix>
 #include <QPointF>
 #include <QColor>
+#include <QGraphicsItem>
+#include <QHash>
 
 class QGraphicsItem;
 class QGraphicsPathItem;
@@ -52,7 +54,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupItemTweener : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupItemTweener : public QObject, public TupAbstractSerializable
 {
     Q_OBJECT
  
@@ -64,8 +66,10 @@
              Shear = 3,
              Opacity = 4,
              Coloring = 5,
-             Compound = 6 
+             Compound = 6, 
+             Papagayo = 7
         };
+
         enum RotationType { Continuos = 0, Partial };
         enum RotateDirection { Clockwise = 0, Counterclockwise };
         enum TransformAxes { XY = 0, X, Y };
diff -Nru tupi-0.2+git04/src/store/tuplayer.cpp tupi-0.2+git05/src/store/tuplayer.cpp
--- tupi-0.2+git04/src/store/tuplayer.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplayer.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,18 +35,17 @@
 
 #include "tuplayer.h"
 #include "tupscene.h"
-#include "tdebug.h"
 #include "tupprojectloader.h"
 
 struct TupLayer::Private
 {
     Frames frames;
+    Mouths lipsyncList;
     bool isVisible;
     QString name;
     int framesCount;
     bool isLocked;
     int index;
-    //int zLevelBase;
 };
 
 TupLayer::TupLayer(TupScene *parent, int index) : QObject(parent), k(new Private)
@@ -60,18 +59,14 @@
 
 TupLayer::~TupLayer()
 {
-    k->frames.clear(true);
+    k->frames.clear();
+    k->lipsyncList.clear();
+
     delete k;
 }
 
 Frames TupLayer::frames()
 {
-   /*
-    tFatal() << "";
-    tFatal() << "TupLayer::frames - LAYER NAME: " << k->name;
-    tFatal() << "";
-    */
-
     return k->frames;
 }
 
@@ -135,26 +130,43 @@
     k->frames.insert(position, frame);
 
     if (loaded)
-        TupProjectLoader::createFrame(scene()->objectIndex(), objectIndex(), position, frame->frameName(), project());
+        TupProjectLoader::createFrame(scene()->objectIndex(), objectIndex(), position, name, project());
 
     return frame;
 }
 
+TupLipSync *TupLayer::createLipSync(const QString &name, const QString &soundFile, int initFrame)
+{
+    TupLipSync *lipsync = new TupLipSync(name, soundFile, initFrame);
+    k->lipsyncList << lipsync;
+
+    return lipsync;
+}
+
+void TupLayer::addLipSync(TupLipSync *lipsync)
+{
+    if (lipsync)
+        k->lipsyncList << lipsync;
+}
+
+int TupLayer::lipSyncCount()
+{
+     return k->lipsyncList.count();
+}
+
+Mouths TupLayer::lipSyncList()
+{
+     return k->lipsyncList;
+}
+
 bool TupLayer::removeFrame(int position)
 {
     TupFrame *toRemove = frame(position);
 
     if (toRemove) {
-        k->frames.removeObject(position);
+        k->frames.removeAt(position);
         toRemove->setRepeat(toRemove->repeat()-1);
 
-        /*
-        if (toRemove->repeat() < 1) {
-            tFatal() << "TupLayer::removeFrame -> Deleting pointer!";
-            delete toRemove;
-        }
-        */
-
         k->framesCount--;
 
         return true;
@@ -163,6 +175,20 @@
     return false;
 }
 
+bool TupLayer::removeLipSync(const QString &name)
+{
+    int size = k->lipsyncList.size();
+    for (int i = 0; i < size; i++) {
+         TupLipSync *lipsync = k->lipsyncList.at(i);
+         if (lipsync->name().compare(name) == 0) {
+             k->lipsyncList.removeAt(i);
+             return true;
+         }
+    }
+
+    return false;
+}
+
 bool TupLayer::resetFrame(int position)
 {
     TupFrame *toReset = frame(position);
@@ -207,7 +233,7 @@
     if (from < 0 || from >= k->frames.count() || to < 0 || to > k->frames.count())
         return false;
 
-    k->frames.exchangeObject(from, to);
+    k->frames.swap(from, to);
 
     return true;
 }
@@ -220,7 +246,9 @@
     TupFrame *toExpand = frame(position);
 
     if (toExpand) {
-        k->frames.expandValue(position, size);
+        int limit = position + size;
+        for (int i = position + 1; i <= limit; i++)
+             k->frames.insert(i, toExpand);
         return true;
     }
 
@@ -230,11 +258,19 @@
 
 TupFrame *TupLayer::frame(int position) const
 {
-    if (position < 0 || position >= k->frames.count()) {
+    if (position < 0 || position >= k->frames.count()) {        
         #ifdef K_DEBUG
-               tError() << "TupLayer::frame() - FATAL ERROR: frame index out of bound : " << position;
-               tError() << "TupLayer::frame() - FATAL ERROR: index limit : " << k->frames.count()-1;
-        #endif
+            QString msg1 = "TupLayer::frame() - FATAL ERROR: frame index out of bound : " + QString::number(position);
+            QString msg2 = "TupLayer::frame() - FATAL ERROR: index limit : " + QString::number(k->frames.count()-1);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg1;
+                qDebug() << msg2;
+            #else
+                tError() << msg1;
+                tError() << msg2;
+            #endif
+        #endif    
+
         return 0;
     }
 
@@ -272,9 +308,20 @@
 
                        frame->fromXml(newDoc);
                    }
+               } else if (e.tagName() == "lipsync") {
+                          TupLipSync *lipsync = createLipSync(e.attribute("name"), e.attribute("soundFile"), e.attribute("initFrame").toInt()); 
+                          if (lipsync) {
+                              QString newDoc;
+
+                              {
+                                QTextStream ts(&newDoc);
+                                ts << n;
+                              }
+
+                              lipsync->fromXml(newDoc);
+                          }
                }
            }
-
            n = n.nextSibling();
     }
 }
@@ -285,8 +332,17 @@
     root.setAttribute("name", k->name);
     doc.appendChild(root);
 
-    foreach (TupFrame *frame, k->frames.values())
-             root.appendChild(frame->toXml(doc));
+    int framesTotal = k->frames.size();
+    for (int i = 0; i < framesTotal; i++) {
+         TupFrame *frame = k->frames.at(i);
+         root.appendChild(frame->toXml(doc));
+    }
+
+    int lipsyncTotal = k->lipsyncList.size();
+    for (int i = 0; i < lipsyncTotal; i++) {
+         TupLipSync *lipSync = k->lipsyncList.at(i);
+         root.appendChild(lipSync->toXml(doc));
+    }
 
     return root;
 }
@@ -301,29 +357,20 @@
     return scene()->project();
 }
 
-int TupLayer::layerIndex()
+void TupLayer::updateLayerIndex(int index)
 {
-    return k->index;
+    k->index = index;
 }
 
-/*
-int TupLayer::logicalIndexOf(TupFrame *frame) const
+int TupLayer::layerIndex()
 {
-    return k->frames.logicalIndex(frame);
+    return k->index;
 }
-*/
 
 int TupLayer::visualIndexOf(TupFrame *frame) const
 {
-    return k->frames.objectIndex(frame);
-}
-
-/*
-int TupLayer::logicalIndex() const
-{
-    return scene()->logicalIndexOf(const_cast<TupLayer *>(this));
+    return k->frames.indexOf(frame);
 }
-*/
 
 int TupLayer::objectIndex() const
 {
diff -Nru tupi-0.2+git04/src/store/tuplayer.h tupi-0.2+git05/src/store/tuplayer.h
--- tupi-0.2+git04/src/store/tuplayer.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplayer.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,15 +36,18 @@
 #ifndef TUPLAYER_H
 #define TUPLAYER_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
 #include "tupframe.h"
-#include "tupinthash.h"
-#include "tupglobal_store.h"
+#include "tuplipsync.h"
 
 #include <QDomDocument>
 #include <QDomElement>
+#include <QList>
+#include <QTextStream>
 
-typedef TupIntHash<TupFrame *> Frames;
+typedef QList<TupFrame *> Frames;
+typedef QList<TupLipSync *> Mouths;
 
 class TupScene;
 class TupProject;
@@ -54,7 +57,7 @@
  * @author David Cuadrado 
 */
 
-class STORE_EXPORT TupLayer : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupLayer : public QObject, public TupAbstractSerializable
 {
     Q_OBJECT
 
@@ -127,23 +130,25 @@
         bool expandFrame(int position, int size);
         
         TupFrame *frame(int position) const;
+
+        TupLipSync *createLipSync(const QString &name, const QString &soundFile, int initFrame);
+        void addLipSync(TupLipSync *lipsync);
+        int lipSyncCount();
+        Mouths lipSyncList();
+        bool removeLipSync(const QString &name);
         
         TupScene *scene() const;
         TupProject *project() const;
 
+        void updateLayerIndex(int index);
         int layerIndex();
         
-        //int logicalIndexOf(TupFrame *frame) const;
         int visualIndexOf(TupFrame *frame) const;
         
-        //int logicalIndex() const;
         int objectIndex() const;
 
         int framesTotal() const;
 
-        //void setZLevel(int level);
-        //int getZLevel();
-        
     public:
         virtual void fromXml(const QString &xml);
         virtual QDomElement toXml(QDomDocument &doc) const;
diff -Nru tupi-0.2+git04/src/store/tuplibrary.cpp tupi-0.2+git05/src/store/tuplibrary.cpp
--- tupi-0.2+git04/src/store/tuplibrary.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplibrary.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -36,8 +36,6 @@
 #include "tuplibrary.h"
 #include "tupproject.h"
 
-#include "tdebug.h"
-
 TupLibrary::TupLibrary(const QString &id, TupProject *parent) : TupLibraryFolder(id, parent)
 {
 }
diff -Nru tupi-0.2+git04/src/store/tuplibraryfolder.cpp tupi-0.2+git05/src/store/tuplibraryfolder.cpp
--- tupi-0.2+git04/src/store/tuplibraryfolder.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplibraryfolder.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,14 +35,9 @@
 
 #include "tuplibraryfolder.h"
 #include "tuplibraryobject.h"
-#include "tdebug.h"
 #include "tupprojectloader.h"
 #include "tupproject.h"
 
-#include <QFileInfo>
-#include <QFile>
-#include <QDir>
-
 struct TupLibraryFolder::Private
 {
     QString id;
@@ -68,20 +63,35 @@
                                                  const QString &folder, bool loaded)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupLibraryFolder::createSymbol()]";
+        #else
+            T_FUNCINFO << " - Creating symbol -> " << name;
+        #endif
     #endif
 
     if (data.isEmpty()) {
         #ifdef K_DEBUG
-               tError() << "TupLibraryFolder::createSymbol() - [ Fatal Error ] - Data is empty!";
+            QString msg = "TupLibraryFolder::createSymbol() - [ Fatal Error ] - Data is empty!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return 0;
     }
 
     if (data.isNull()) {
         #ifdef K_DEBUG
-               tError() << "TupLibraryFolder::createSymbol() - [ Fatal Error ] - Data is null!";
+            QString msg = "TupLibraryFolder::createSymbol() - [ Fatal Error ] - Data is null!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         return 0;
     }
 
@@ -92,7 +102,12 @@
 
     if (!object->loadRawData(data)) {
         #ifdef K_DEBUG
-               tError() << "TupLibraryFolder::createSymbol() - [ Fatal Error ] - Object have no data raw!";
+            QString msg = "TupLibraryFolder::createSymbol() - [ Fatal Error ] - Object have no data raw!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
 
         delete object;
@@ -151,7 +166,12 @@
     }
 
     #ifdef K_DEBUG
-           tError() << "TupLibraryFolder::reloadObject() - [ Fatal Error ] - Object " << id << " wasn't found";
+        QString msg = "TupLibraryFolder::reloadObject() - [ Fatal Error ] - Object ID wasn't found -> " + id;
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
 
     return false;
@@ -190,7 +210,12 @@
     }
 
     #ifdef K_DEBUG
-           tError() << "TupLibraryFolder::removeObject() - [ Fatal Error ] - Object " << id << " wasn't found";
+        QString msg = "TupLibraryFolder::removeObject() - [ Fatal Error ] - Object ID wasn't found -> " + id;
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
 
     return false;
@@ -269,7 +294,12 @@
     }
 
     #ifdef K_DEBUG
-           tWarning() << "TupLibraryFolder::exists() - [ Fatal Error ] - Object doesn't exist -> " << id;
+        QString msg = "TupLibraryFolder::exists() - [ Fatal Error ] - Object doesn't exist -> " + id;
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
     #endif
 
     return false;
@@ -289,7 +319,12 @@
     }
     
     #ifdef K_DEBUG
-           tWarning() << "TupLibraryFolder::getObject() - [ Fatal Error ] - Can't get object with id -> " << id;
+        QString msg = "TupLibraryFolder::getObject() - [ Fatal Error ] - Can't get object with id -> " + id;
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
+        #endif
     #endif
     
     return 0;
@@ -301,9 +336,14 @@
              if (folder->id().compare(id) == 0) 
                  return folder;
     }
-   
+
     #ifdef K_DEBUG
-           tError() << "TupLibraryFolder::getFolder() - [ Fatal Error ] - Can't find folder with id -> " << id;
+        QString msg = "TupLibraryFolder::getFolder() - [ Fatal Error ] - Can't find folder with id -> " + id;
+        #ifdef Q_OS_WIN32
+           qDebug() << msg;
+        #else
+           tError() << msg;
+        #endif
     #endif
    
     return 0;
@@ -317,7 +357,12 @@
     }
   
     #ifdef K_DEBUG
-           tError() << "TupLibraryFolder::folderExists() - [ Fatal Error ] - Can't find folder with id -> " << id;
+        QString msg = "TupLibraryFolder::getFolder() - [ Fatal Error ] - Can't find folder with id -> " + id;
+        #ifdef Q_OS_WIN32
+            qWarning() << msg;
+        #else
+            tWarning() << msg;
+        #endif
     #endif
   
     return false;
@@ -336,11 +381,17 @@
         else
             return addObject(object);
        
-    } else {
-        #ifdef K_DEBUG
-               tError() << "TupLibraryFolder::renameObject() - [ Fatal Error ] - Object not found -> " << oldId;
+    } 
+
+    #ifdef K_DEBUG
+        QString msg = "TupLibraryFolder::renameObject() - [ Fatal Error ] - Object not found -> " + oldId;
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tError() << msg;
         #endif
-    }
+    #endif
+
 
     return false;
 }
diff -Nru tupi-0.2+git04/src/store/tuplibraryfolder.h tupi-0.2+git05/src/store/tuplibraryfolder.h
--- tupi-0.2+git04/src/store/tuplibraryfolder.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplibraryfolder.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,14 +36,18 @@
 #ifndef TUPLIBRARYFOLDER_H
 #define TUPLIBRARYFOLDER_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
 #include "tuplibraryobject.h"
-#include "tupglobal_store.h"
 
 #include <QObject>
 #include <QHash>
 #include <QMap>
 #include <QByteArray>
+#include <QTextStream>
+#include <QFileInfo>
+#include <QFile>
+#include <QDir>
 
 class TupProject;
 class TupLibraryFolder;
@@ -56,7 +60,7 @@
  * @author David Cuadrado
 **/
 
-class STORE_EXPORT TupLibraryFolder : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupLibraryFolder : public QObject, public TupAbstractSerializable
 {
     Q_OBJECT
     
@@ -67,7 +71,7 @@
         void setId(const QString &id);
         QString id() const;
         
-        TupLibraryObject *createSymbol(TupLibraryObject::Type type, const QString &name, const QByteArray &data, const QString &folder = QString(), bool loaded = false);
+        TupLibraryObject *createSymbol(TupLibraryObject::Type type, const QString &name, const QByteArray &data = QByteArray(), const QString &folder = QString(), bool loaded = false);
         
         bool addObject(TupLibraryObject *object); 
         bool addObject(const QString &folderName, TupLibraryObject *object);
diff -Nru tupi-0.2+git04/src/store/tuplibrary.h tupi-0.2+git05/src/store/tuplibrary.h
--- tupi-0.2+git04/src/store/tuplibrary.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplibrary.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,18 +36,19 @@
 #ifndef TUPLIBRARY_H
 #define TUPLIBRARY_H
 
-#include <QObject>
-
-#include "tupglobal_store.h"
+#include "tglobal.h"
 #include "tuplibraryfolder.h"
 
+#include <QObject>
+#include <QTextStream>
+
 class TupProject;
 
 /**
  * @author David Cuadrado
 */ 
 
-class STORE_EXPORT TupLibrary : public TupLibraryFolder
+class TUPI_EXPORT TupLibrary : public TupLibraryFolder
 {
     Q_OBJECT;
     
diff -Nru tupi-0.2+git04/src/store/tuplibraryobject.cpp tupi-0.2+git05/src/store/tuplibraryobject.cpp
--- tupi-0.2+git04/src/store/tuplibraryobject.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplibraryobject.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -37,10 +37,6 @@
 #include "tupitemfactory.h"
 #include "tuppixmapitem.h"
 // #include "taudioplayer.h"
-#include "tdebug.h"
-
-#include <QTemporaryFile>
-#include <QDir>
 
 struct TupLibraryObject::Private
 {
@@ -124,9 +120,15 @@
     QDomDocument document;
     
     if (! document.setContent(xml)) {
-        #ifdef K_DEBUG  
-               tError() << "TupLibraryObject::fromXml() - Fatal Error: Invalid XML structure!";
+        #ifdef K_DEBUG
+            QString msg = "TupLibraryObject::fromXml() - Fatal Error: Invalid XML structure!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+
         return;
     }
     
@@ -136,8 +138,14 @@
         setSymbolName(objectTag.attribute("id"));
         if (k->symbolName.isEmpty()) {
             #ifdef K_DEBUG
-                   tError() << "TupLibraryObject::fromXml - Fatal Error: Symbol name is empty!";
+                QString msg = "TupLibraryObject::fromXml - Fatal Error: Symbol name is empty!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
+
             return;
         }
        
@@ -147,7 +155,12 @@
             k->type = TupLibraryObject::Type(index);
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupLibraryObject::fromXml - Fatal Error: Invalid object type!";
+                QString msg = "TupLibraryObject::fromXml - Fatal Error: Invalid object type!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
             return;
         }
@@ -169,13 +182,23 @@
                                  loadRawData(array);
                              } else {
                                  #ifdef K_DEBUG
-                                        tError() << "TupLibraryObject::fromXml() - Object data is empty! [ " << k->symbolName << " ]";
+                                     QString msg = "TupLibraryObject::fromXml() - Object data is empty! -> " + k->symbolName;
+                                     #ifdef Q_OS_WIN32
+                                         qDebug() << msg;
+                                     #else
+                                         tError() << msg;
+                                     #endif
                                  #endif
                                  return;
                              }
                          } else {
                              #ifdef K_DEBUG
-                                        tError() << "TupLibraryObject::fromXml() - Object data from xml is NULL! [ " << k->symbolName << " ]";
+                                 QString msg = "TupLibraryObject::fromXml() - Fatal Error: Object data from xml is NULL -> " + k->symbolName;
+                                 #ifdef Q_OS_WIN32
+                                     qDebug() << msg;
+                                 #else
+                                     tError() << msg;
+                                 #endif
                              #endif
                              return;
                          }
@@ -191,8 +214,14 @@
                 default:
                      {
                          #ifdef K_DEBUG
-                                tError() << "TupLibraryObject::fromXml() - Unknown object type: " << k->type;
+                             QString msg = "TupLibraryObject::fromXml() - Unknown object type: " + QString::number(k->type);
+                             #ifdef Q_OS_WIN32
+                                 qWarning() << msg;
+                             #else
+                                 tWarning() << msg;
+                             #endif
                          #endif
+
                          return;
                      }
                 break;
@@ -233,19 +262,6 @@
             }
             break;
             case Image:
-            {
-                 /*
-                 QGraphicsItem *item = qvariant_cast<QGraphicsItem *>(k->data);
-            
-                 if (item) {
-                     if (TupAbstractSerializable *serializable = dynamic_cast<TupAbstractSerializable *>(item))
-                         object.appendChild(serializable->toXml(doc));
-                 }
-                 */
-            
-                 object.setAttribute("path", finfo.fileName());
-            }
-            break;
             case Sound:
             {
                  object.setAttribute("path", finfo.fileName());
@@ -284,7 +300,12 @@
 
                  if (!isOk) {
                      #ifdef K_DEBUG
-                            tError() << "TupLibraryObject::loadRawData() - [ Fatal Error ] - Can't load image -> " << k->symbolName;
+                         QString msg = "TupLibraryObject::loadRawData() - [ Fatal Error ] - Can't load image -> " + k->symbolName;
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError() << msg;
+                         #endif
                      #endif
                      return false;
                  }
@@ -302,14 +323,7 @@
             break;
             case TupLibraryObject::Sound:
             {
-                 QTemporaryFile soundFile(QDir::tempPath() + QDir::separator() + "tupi_sound_file_XXXXXX");
-                 soundFile.setAutoRemove(false);
-
-                 if (soundFile.open()) {
-                     soundFile.write(data);
-                     setData(soundFile.fileName());
-                     soundFile.close();
-                 }
+                 setData(QVariant::fromValue(data));
             }
             break;
             default:
@@ -328,7 +342,6 @@
             case TupLibraryObject::Image:
             {
                  k->dataPath = dataDir + QDir::separator() + "images" + QDir::separator() + k->dataPath;
-                 loadData(k->dataPath); 
             }
             break;
             case TupLibraryObject::Sound:
@@ -339,13 +352,14 @@
             case TupLibraryObject::Svg:
             {
                  k->dataPath = dataDir + QDir::separator() + "svg" + QDir::separator() + k->dataPath;
-                 loadData(k->dataPath);
             }
             break;
             default: 
                  return false; 
             break;
     }
+
+    loadData(k->dataPath);
     
     return true;
 }
@@ -355,41 +369,66 @@
     switch (k->type) {
             case TupLibraryObject::Image:
             case TupLibraryObject::Svg:
+            case TupLibraryObject::Sound:
             {
                  QFile file(path);
                  if (file.exists()) {
                      if (file.open(QIODevice::ReadOnly)) {
                          QByteArray array = file.readAll(); 
                          #ifdef K_DEBUG
-                                tWarning() << "TupLibraryObject::loadData() - Object path: " << path;
-                                tWarning() << "TupLibraryObject::loadData() - Object size: " << array.size();
+                             QString msg1 = "TupLibraryObject::loadData() - Object path: " + path;
+                             QString msg2 = "TupLibraryObject::loadData() - Object size: " + QString::number(array.size());
+                             #ifdef Q_OS_WIN32
+                                 qWarning() << msg1;
+                                 qWarning() << msg2;
+                             #else
+                                 tWarning() << msg1;
+                                 tWarning() << msg2;
+                             #endif
                          #endif
                          if (!array.isEmpty() && !array.isNull()) {
                              loadRawData(array);
                          } else {
                              #ifdef K_DEBUG
-                                    tWarning() << "TupLibraryObject::loadData() - Warning: Image file is empty -> " << path;
+                                 QString msg = "TupLibraryObject::loadData() - Warning: Image file is empty -> " + path;
+                                 #ifdef Q_OS_WIN32
+                                     qDebug() << msg;
+                                 #else
+                                     tError() << msg;
+                                 #endif
                              #endif
                              return false;
                          }
                      } else {
                          #ifdef K_DEBUG
-                                tError() << "TupLibraryObject::loadData() - Fatal Error: Can't access image file -> " << path;
+                             QString msg = "TupLibraryObject::loadData() - Fatal Error: Can't access image file -> " + path; 
+                             #ifdef Q_OS_WIN32
+                                 qDebug() << msg;
+                             #else
+                                 tError() << msg;
+                             #endif
                          #endif
                          return false;
                      }
                  } else {
                      #ifdef K_DEBUG
-                            tError() << "TupLibraryObject::loadData() - Fatal Error: Image file doesn't exist -> " << path;
+                         QString msg = "TupLibraryObject::loadData() - Fatal Error: Image file doesn't exist -> " + path;
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError() << msg;
+                         #endif
                      #endif
                      return false;
                  }
             }
             break;
+            /*
             case TupLibraryObject::Sound:
             {
             }
             break;
+            */
             default:
                  return false;
             break;
@@ -401,25 +440,51 @@
 void TupLibraryObject::saveData(const QString &dataDir)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupLibraryObject::saveData()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     switch (k->type) {
             case TupLibraryObject::Sound:
             {
-                 QString saved = dataDir + QDir::separator() + "audio" + QDir::separator();
+                 QString path = dataDir + QDir::separator() + "audio" + QDir::separator();
             
-                 if (! QFile::exists(saved)) {
+                 if (! QFile::exists(path)) {
                      QDir dir;
-                     dir.mkpath(saved);
+                     dir.mkpath(path);
                  }
            
-                 // SQA: Sound support 
-                 // QFile::copy(QString(k->data.toString()), saved + k->symbolName);
-                 // QFile::remove(QString(k->data.toString()));
-            
-                 k->dataPath = saved + k->symbolName;
-                 k->data = "";
+                 k->dataPath = path + k->symbolName;
+
+                 QFile file(k->dataPath);
+                 if (file.open(QIODevice::WriteOnly)) {
+                     qint64 isOk = file.write(k->rawData);
+                     file.close();
+
+                     if (isOk == -1) {
+                         #ifdef K_DEBUG
+                             QString msg = "TupLibraryObject::saveData() - [ Fatal Error ] - Can't save file -> " + k->dataPath;
+                             #ifdef Q_OS_WIN32
+                                 qDebug() << msg;
+                             #else
+                                 tError() << msg;
+                             #endif
+                         #endif
+                         return;
+                     } else {
+                         #ifdef K_DEBUG
+                             QString msg = "TupLibraryObject::saveData() - Image file saved successfully -> " + k->dataPath;
+                             #ifdef Q_OS_WIN32
+                                 qWarning() << msg;
+                             #else
+                                 tWarning() << msg;
+                             #endif
+                         #endif
+                     }
+                 }
             }
             break;
             case TupLibraryObject::Svg:
@@ -450,7 +515,12 @@
                      dir.mkpath(destination);
 
                      #ifdef K_DEBUG
-                            tWarning() << "TupLibraryObject::saveData() - Creating directory -> " << destination;
+                         QString msg = "TupLibraryObject::saveData() - Creating directory -> " + destination;
+                         #ifdef Q_OS_WIN32
+                             qWarning() << msg;
+                         #else
+                             tWarning() << msg;
+                         #endif
                      #endif
                  }
 
@@ -459,19 +529,36 @@
                  QFile file(k->dataPath);
                  if (!file.open(QIODevice::WriteOnly)) {
                      #ifdef K_DEBUG
-                            tError() << "TupLibraryObject::saveData() - [ Fatal Error ] - Insufficient permissions to save file -> " << destination + k->symbolName;
+                         QString msg = "TupLibraryObject::saveData() - [ Fatal Error ] - Insufficient permissions to save file -> " + destination + k->symbolName;
+                         #ifdef Q_OS_WIN32
+                             qDebug() << msg;
+                         #else
+                             tError() << msg;
+                         #endif
                      #endif
+                     return;
                  } else {
                      qint64 isOk = file.write(k->rawData);
                      file.close();
 
                      if (isOk == -1) {
                          #ifdef K_DEBUG
-                                tError() << "TupLibraryObject::saveData() - [ Fatal Error ] - Can't save file -> " << destination + k->symbolName;
+                             QString msg = "TupLibraryObject::saveData() - [ Fatal Error ] - Can't save file -> " + destination + k->symbolName;
+                             #ifdef Q_OS_WIN32
+                                 qDebug() << msg;
+                             #else
+                                 tError() << msg;
+                             #endif
                          #endif
+                         return;
                      } else {
                          #ifdef K_DEBUG
-                                tWarning() << "TupLibraryObject::saveData() - Image file saved successfully -> " << destination + k->symbolName;
+                             QString msg = "TupLibraryObject::saveData() - Image file saved successfully -> " + destination + k->symbolName;
+                             #ifdef Q_OS_WIN32
+                                 qWarning() << msg;
+                             #else
+                                 tWarning() << msg;
+                             #endif
                          #endif
                      }
                  }
diff -Nru tupi-0.2+git04/src/store/tuplibraryobject.h tupi-0.2+git05/src/store/tuplibraryobject.h
--- tupi-0.2+git04/src/store/tuplibraryobject.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplibraryobject.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,11 +36,13 @@
 #ifndef TUPLIBRARYOBJECT_H
 #define TUPLIBRARYOBJECT_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
 #include <QVariant>
 #include <QGraphicsItem>
+#include <QTemporaryFile>
+#include <QDir>
 
 class TupLibraryObject;
 
@@ -48,7 +50,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupLibraryObject : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupLibraryObject : public QObject, public TupAbstractSerializable
 {
     public:
         enum Type
diff -Nru tupi-0.2+git04/src/store/tuplineitem.cpp tupi-0.2+git05/src/store/tuplineitem.cpp
--- tupi-0.2+git04/src/store/tuplineitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplineitem.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,9 +35,8 @@
 
 #include "tuplineitem.h"
 #include "tupserializer.h"
-#include "tdebug.h"
 
-TupLineItem::TupLineItem(QGraphicsItem * parent, QGraphicsScene * scene) : QGraphicsLineItem(parent, scene)
+TupLineItem::TupLineItem(QGraphicsItem *parent) : QGraphicsLineItem(parent)
 {
 }
 
@@ -54,10 +53,10 @@
 {
     QDomElement root = doc.createElement("line");
     
-    root.setAttribute("x1", line().x1());
-    root.setAttribute("y1", line().y1());
-    root.setAttribute("x2", line().x2());
-    root.setAttribute("y2", line().y2());
+    root.setAttribute("x1", QString::number(line().x1()));
+    root.setAttribute("y1", QString::number(line().y1()));
+    root.setAttribute("x2", QString::number(line().x2()));
+    root.setAttribute("y2", QString::number(line().y2()));
     
     root.appendChild(TupSerializer::properties(this, doc));
     
diff -Nru tupi-0.2+git04/src/store/tuplineitem.h tupi-0.2+git05/src/store/tuplineitem.h
--- tupi-0.2+git04/src/store/tuplineitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplineitem.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,19 +36,19 @@
 #ifndef TUPLINEITEM_H 
 #define TUPLINEITEM_H 
 
-#include <QGraphicsLineItem>
-
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
+
+#include <QGraphicsLineItem>
 
 /**
     @author David Cuadrado
 */
 
-class STORE_EXPORT TupLineItem : public QGraphicsLineItem, public TupAbstractSerializable
+class TUPI_EXPORT TupLineItem : public QGraphicsLineItem, public TupAbstractSerializable
 {
     public:
-        TupLineItem(QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
+        TupLineItem(QGraphicsItem *parent = 0);
         ~TupLineItem();
         
         virtual void fromXml(const QString &xml);
diff -Nru tupi-0.2+git04/src/store/tuplipsync.cpp tupi-0.2+git05/src/store/tuplipsync.cpp
--- tupi-0.2+git04/src/store/tuplipsync.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplipsync.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,612 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     *
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#include "tuplipsync.h" 
+
+TupPhoneme::TupPhoneme() : QObject()
+{
+}
+
+TupPhoneme::TupPhoneme(const QString &value, int duration) : QObject()
+{
+    phoneme = value;
+    frames = duration;
+}
+
+TupPhoneme::~TupPhoneme()
+{
+}
+
+void TupPhoneme::setDuration(int duration)
+{
+    frames = duration;
+}
+
+int TupPhoneme::duration()
+{
+    return frames;
+}
+
+void TupPhoneme::setValue(const QString &value)
+{
+    phoneme = value;
+}
+
+QString TupPhoneme::value() const
+{
+    return phoneme;
+}
+
+void TupPhoneme::fromXml(const QString &xml)
+{
+    QDomDocument document;
+
+    if (document.setContent(xml)) {
+        QDomElement e = document.documentElement();
+        if (!e.isNull()) {
+            if (e.tagName() == "phoneme") {
+                phoneme = e.attribute("value");
+                frames = e.attribute("duration").toInt();
+            }
+        }
+    }
+}
+
+QDomElement TupPhoneme::toXml(QDomDocument &doc) const
+{
+    QDomElement root = doc.createElement("phoneme");
+    root.setAttribute("value", phoneme);
+    root.setAttribute("duration", frames);
+
+    return root;
+}
+
+TupWord::TupWord()
+{
+}
+
+TupWord::TupWord(int index)
+{
+    initIndex = index;
+}
+
+TupWord::~TupWord()
+{
+}
+
+void TupWord::setInitFrame(int index)
+{
+    initIndex = index;
+}
+
+int TupWord::initFrame()
+{
+    return initIndex;
+}
+
+int TupWord::endFrame()
+{
+    return endIndex;
+}
+
+void TupWord::addPhoneme(TupPhoneme *phoneme)
+{
+    if (phoneme)
+        phonemes << phoneme;
+}
+
+QList<TupPhoneme *> TupWord::phonemesList()
+{
+    return phonemes;
+}
+
+bool TupWord::contains(int frame)
+{
+    if (frame >= initIndex && frame <= endIndex)
+        return true;
+
+    return false;
+}
+
+void TupWord::fromXml(const QString &xml)
+{
+    QDomDocument document;
+
+    if (document.setContent(xml)) {
+        QDomElement root = document.documentElement();
+        initIndex = root.attribute("initFrame").toInt();
+        endIndex = initIndex - 1;
+        QDomNode n = root.firstChild();
+
+        while (!n.isNull()) {
+               QDomElement e = n.toElement();
+               if (!e.isNull()) {
+                   if (e.tagName() == "phoneme") {
+                       QString value = e.attribute("value");
+                       int duration = e.attribute("duration").toInt();
+                       endIndex += duration;
+
+                       TupPhoneme *phoneme = new TupPhoneme(value, duration);
+                       phonemes << phoneme;
+                   }
+               }
+
+               n = n.nextSibling();
+        }
+    }
+}
+
+QDomElement TupWord::toXml(QDomDocument &doc) const
+{
+    QDomElement root = doc.createElement("word");
+    root.setAttribute("initFrame", initIndex);
+
+    int total = phonemes.size();
+    for(int i=0; i<total; i++) {
+        TupPhoneme *phoneme = phonemes.at(i);
+        root.appendChild(phoneme->toXml(doc));
+    }
+
+    return root;
+}
+
+TupPhrase::TupPhrase()
+{
+}
+
+TupPhrase::TupPhrase(int index) : QObject()
+{
+    initIndex = index;
+}
+
+TupPhrase::~TupPhrase()
+{
+}
+
+void TupPhrase::setInitFrame(int index)
+{
+    initIndex = index;
+}
+
+int TupPhrase::initFrame()
+{
+    return initIndex;
+}
+
+int TupPhrase::endFrame()
+{
+    return endIndex;
+}
+
+void TupPhrase::addWord(TupWord *word)
+{
+    if (word)
+        words << word;
+}
+
+QList<TupWord *> TupPhrase::wordsList()
+{
+    return words;
+}
+
+bool TupPhrase::contains(int frame)
+{
+    if (frame >= initIndex && frame <= endIndex) 
+        return true;
+
+    return false;
+}
+
+void TupPhrase::fromXml(const QString &xml)
+{
+    QDomDocument document;
+
+    if (document.setContent(xml)) {
+        QDomElement root = document.documentElement();
+        initIndex = root.attribute("initFrame").toInt();
+        QDomNode n = root.firstChild();
+
+        while (!n.isNull()) {
+               QDomElement e = n.toElement();
+               if (!e.isNull()) {
+                   if (e.tagName() == "word") {
+                       TupWord *word = new TupWord();
+                       QString newDoc;
+                       {
+                           QTextStream ts(&newDoc);
+                           ts << n;
+                       }
+
+                       word->fromXml(newDoc);
+                       words << word;
+                   }
+               }
+
+               n = n.nextSibling();
+        }
+
+        TupWord *last = words.last();
+        endIndex = last->endFrame();
+    }
+}
+
+QDomElement TupPhrase::toXml(QDomDocument &doc) const
+{
+    QDomElement root = doc.createElement("phrase");
+    root.setAttribute("initFrame", initIndex);
+
+    int total = words.size();
+    for(int i=0; i<total; i++) {
+        TupWord *word = words.at(i);
+        root.appendChild(word->toXml(doc));
+    }
+
+    return root;
+}
+
+TupVoice::TupVoice()
+{
+}
+
+TupVoice::TupVoice(const QString &label, QPointF pos) 
+{
+    title = label;
+    point = pos;
+}
+
+TupVoice::~TupVoice()
+{
+}
+
+void TupVoice::setVoiceTitle(const QString &label)
+{
+    title = label;
+}
+
+QString TupVoice::voiceTitle() const
+{
+    return title;
+}
+
+void TupVoice::setMouthPos(QPointF pos)
+{
+    point = pos;
+}
+
+QPointF TupVoice::mouthPos()
+{
+    return point;
+}
+
+void TupVoice::setText(const QString &content)
+{
+    script = content;
+}
+
+QString TupVoice::text() const
+{
+    return script;
+}
+
+int TupVoice::initFrame()
+{
+    return initIndex;
+}
+
+int TupVoice::endFrame()
+{
+    return endIndex;
+}
+
+void TupVoice::addPhrase(TupPhrase *phrase)
+{
+    if (phrase)
+        phrases << phrase;
+}
+
+QString TupVoice::getPhoneme(int frame)
+{
+    QString mouth = "rest";
+
+    foreach (TupPhrase *phrase, phrases) {
+             if (phrase->contains(frame)) {
+                 foreach (TupWord *word, phrase->wordsList()) {
+                          if (word->contains(frame)) {
+                              int initFrame = word->initFrame();
+                              foreach (TupPhoneme *phoneme, word->phonemesList()) {
+                                       int duration = phoneme->duration();
+                                       int first = initFrame; 
+                                       int last = first + duration - 1;
+                                       if (frame >= first && frame <= last) {
+                                           mouth = phoneme->value();
+                                           return mouth;
+                                       }
+                                       initFrame = last + 1;
+                              }
+                          }
+                 }
+             }
+    }
+
+    return mouth;
+}
+
+bool TupVoice::contains(int frame)
+{
+    if (frame >= initIndex && frame <= endIndex)
+        return true;
+
+    return false;
+}
+
+void TupVoice::fromXml(const QString &xml)
+{
+    QDomDocument document;
+
+    if (document.setContent(xml)) {
+        QDomElement root = document.documentElement();
+        script = root.attribute("text");
+
+        QDomNode n = root.firstChild();
+
+        while (!n.isNull()) {
+               QDomElement e = n.toElement();
+               if (!e.isNull()) {
+                   if (e.tagName() == "phrase") {
+                       TupPhrase *phrase = new TupPhrase();
+                       QString newDoc;
+                       {
+                           QTextStream ts(&newDoc);
+                           ts << n;
+                       }
+
+                       phrase->fromXml(newDoc);
+                       phrases << phrase;
+                   }
+               }
+               n = n.nextSibling();
+        }
+
+        TupPhrase *first = phrases.first();
+        initIndex = first->initFrame();
+
+        TupPhrase *last = phrases.last();
+        endIndex = last->endFrame();
+    }
+}
+
+QDomElement TupVoice::toXml(QDomDocument &doc) const
+{
+    QDomElement root = doc.createElement("voice");
+    root.setAttribute("name", title);
+    root.setAttribute("origin", QString::number(point.x()) + "," + QString::number(point.y()));
+    root.setAttribute("text", script);
+
+    int total = phrases.size();
+    for(int i=0; i<total; i++) {
+        TupPhrase *phrase = phrases.at(i);
+        root.appendChild(phrase->toXml(doc));
+    }
+
+    return root;
+}
+
+struct TupLipSync::Private
+{
+    QString name;
+    QString soundFile;
+    QString extension;
+    int fps;
+    int initFrame;
+    int framesTotal;
+    QList<TupVoice *> voices;
+};
+
+TupLipSync::TupLipSync() : QObject(), k(new Private)
+{
+}
+
+TupLipSync::TupLipSync(const QString &name, const QString &soundFile, int initFrame) : QObject(), k(new Private)
+{
+    k->name = name;
+    k->soundFile = soundFile;
+    k->initFrame = initFrame;
+}
+
+TupLipSync::~TupLipSync()
+{
+}
+
+QString TupLipSync::name() const
+{
+    return k->name;
+}
+
+void TupLipSync::setName(const QString &title)
+{
+    k->name = title;
+}
+
+void TupLipSync::setPicsExtension(const QString &extension)
+{
+    k->extension = extension;
+}
+
+QString TupLipSync::picExtension() const
+{
+    return k->extension;
+}
+
+QString TupLipSync::soundFile() const
+{
+    return k->soundFile;
+}
+
+void TupLipSync::setSoundFile(const QString &file)
+{
+    k->soundFile = file;
+}
+
+int TupLipSync::fps()
+{
+    return k->fps;
+}
+
+void TupLipSync::setFPS(int fps)
+{
+    k->fps = fps;
+}
+
+int TupLipSync::initFrame()
+{
+    return k->initFrame;
+}
+
+void TupLipSync::setInitFrame(int frame)
+{
+    k->initFrame = frame;
+}
+
+int TupLipSync::framesTotal()
+{
+    return k->framesTotal;
+}
+
+void TupLipSync::setFramesTotal(int framesTotal)
+{
+    k->framesTotal = framesTotal;
+}
+
+void TupLipSync::addVoice(TupVoice *voice)
+{
+    if (voice)
+        k->voices << voice;
+}
+
+void TupLipSync::fromXml(const QString &xml)
+{
+    QDomDocument document;
+   
+    if (! document.setContent(xml)) {
+        #ifdef K_DEBUG
+            QString msg = "TupLipSync::fromXml() - File corrupted!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+                qWarning() << "Content:";
+                qWarning() << xml;
+            #else
+                tError() << msg;
+                tWarning() << "Content:";
+                tWarning() << xml;
+            #endif
+        #endif
+
+        return;
+    }
+
+    QDomElement root = document.documentElement();
+    k->name = root.attribute("name");
+    k->soundFile = root.attribute("soundFile");
+    k->initFrame = root.attribute("initFrame").toInt();
+    k->framesTotal = root.attribute("framesTotal").toInt();
+    k->extension = root.attribute("extension");
+    k->fps = root.attribute("fps").toInt();
+
+    QDomNode n = root.firstChild();
+
+    while (!n.isNull()) {
+           QDomElement e = n.toElement();
+           if (!e.isNull()) {
+               if (e.tagName() == "voice") {
+                   QString name = e.attribute("name");
+                   QStringList xy = e.attribute("origin").split(",");
+                   double x = xy.first().toDouble();
+                   double y = xy.last().toDouble();
+                   QPointF point = QPointF(x, y);
+                   TupVoice *voice = new TupVoice(name, point);
+
+                   QString newDoc;
+                   {
+                       QTextStream ts(&newDoc);
+                       ts << n;
+                   }
+
+                   voice->fromXml(newDoc);
+                   k->voices << voice;
+               }
+           }
+           n = n.nextSibling();
+    }
+}
+
+QDomElement TupLipSync::toXml(QDomDocument &doc) const
+{
+    QDomElement root = doc.createElement("lipsync");
+    root.setAttribute("name", k->name);
+    root.setAttribute("soundFile", k->soundFile);
+    root.setAttribute("initFrame", k->initFrame);
+    root.setAttribute("framesTotal", k->framesTotal);
+    root.setAttribute("extension", k->extension);
+    root.setAttribute("fps", k->fps);
+
+    int total = k->voices.size();
+    for(int i=0; i<total; i++) {
+        TupVoice *voice = k->voices.at(i);
+        root.appendChild(voice->toXml(doc));
+    }
+
+    return root;
+}
+
+QList<TupVoice *> TupLipSync::voices()
+{
+    return k->voices;
+}
+
+TupVoice * TupLipSync::voiceAt(int index)
+{
+    if (index >= 0 && index < k->voices.count())
+        return k->voices.at(index);
+
+    return 0;
+}
+
+void TupLipSync::updateMouthPosition(int mouthIndex, QPointF point)
+{
+    TupVoice *voice = k->voices.at(mouthIndex);
+    if (voice)
+        voice->setMouthPos(point);
+}
+
diff -Nru tupi-0.2+git04/src/store/tuplipsync.h tupi-0.2+git05/src/store/tuplipsync.h
--- tupi-0.2+git04/src/store/tuplipsync.h	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/src/store/tuplipsync.h	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,174 @@
+/***************************************************************************
+ *   Project TUPI: Magia 2D                                                *
+ *   Project Contact: info@maefloresta.com                                 *
+ *   Project Website: http://www.maefloresta.com                           *
+ *   Project Leader: Gustav Gonzalez <info@maefloresta.com>                *
+ *                                                                         *
+ *   Developers:                                                           *
+ *   2010:                                                                 *
+ *    Gustavo Gonzalez                                                     *
+ *                                                                         *
+ *   KTooN's versions:                                                     *
+ *                                                                         *
+ *   2006:                                                                 *
+ *    David Cuadrado                                                       *
+ *    Jorge Cuadrado                                                       *
+ *   2003:                                                                 *
+ *    Fernado Roldan                                                       *
+ *    Simena Dinas                                                         *
+ *                                                                         *
+ *   Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com       *
+ *   License:                                                              *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
+#ifndef TUPLIPSYNC_H
+#define TUPLIPSYNC_H
+
+#include "tupabstractserializable.h"
+
+#include <QDomDocument>
+#include <QDomElement>
+#include <QStringList>
+#include <QPoint>
+#include <QTextStream>
+
+class TUPI_EXPORT TupPhoneme : public QObject, public TupAbstractSerializable
+{
+    public:
+        TupPhoneme();
+        TupPhoneme(const QString &value, int duration);
+        ~TupPhoneme();
+
+        void setDuration(int duration);
+        int duration();
+        void setValue(const QString &value);
+        QString value() const;
+
+        virtual void fromXml(const QString &xml);
+        virtual QDomElement toXml(QDomDocument &doc) const;
+
+    private:
+        int frames;
+        QString phoneme;
+};
+
+class TUPI_EXPORT TupWord : public QObject, public TupAbstractSerializable
+{
+    public:
+        TupWord();
+        TupWord(int index);
+        ~TupWord();
+        void setInitFrame(int index);
+        int initFrame();
+        int endFrame();
+        void addPhoneme(TupPhoneme *phoneme);
+        QList<TupPhoneme *> phonemesList();
+        bool contains(int frame);
+
+        virtual void fromXml(const QString &xml);
+        virtual QDomElement toXml(QDomDocument &doc) const;
+
+    private:
+        int initIndex;
+        int endIndex;
+        
+        QList<TupPhoneme *> phonemes;
+};
+
+class TUPI_EXPORT TupPhrase : public QObject, public TupAbstractSerializable
+{
+    public:
+        TupPhrase();
+        TupPhrase(int index);
+        ~TupPhrase();
+        void setInitFrame(int index);
+        int initFrame();
+        int endFrame();
+        void addWord(TupWord *word);
+        QList<TupWord *> wordsList();
+        bool contains(int frame);
+
+        virtual void fromXml(const QString &xml);
+        virtual QDomElement toXml(QDomDocument &doc) const;
+
+    private:
+        int initIndex; 
+        int endIndex;
+        QList<TupWord *> words;
+};
+
+class TUPI_EXPORT TupVoice : public QObject, public TupAbstractSerializable
+{
+    public:
+        TupVoice();
+        TupVoice(const QString &label, QPointF pos);
+        ~TupVoice();
+        void setVoiceTitle(const QString &label);
+        QString voiceTitle() const;
+        void setMouthPos(QPointF pos);
+        QPointF mouthPos();
+        void setText(const QString &content);
+        QString text() const;
+        int initFrame();
+        int endFrame();
+        void addPhrase(TupPhrase *phrase);
+        QString getPhoneme(int frame);
+        bool contains(int frame);
+
+        virtual void fromXml(const QString &xml);
+        virtual QDomElement toXml(QDomDocument &doc) const;
+
+    private:
+        QString title;
+        QPointF point;
+        QString script;
+        int initIndex;
+        int endIndex;
+        QList<TupPhrase *> phrases;
+};
+
+class TUPI_EXPORT TupLipSync : public QObject, public TupAbstractSerializable
+{
+    public:
+        TupLipSync();
+        TupLipSync(const QString &name, const QString &soundFile, int initFrame);
+        ~TupLipSync();
+        void addPhrase(TupPhrase *phrase);
+        QString name() const;
+        void setName(const QString &title);
+        void setPicsExtension(const QString &extension);
+        QString picExtension() const;
+        QString soundFile() const;
+        void setSoundFile(const QString &file);
+        int fps();
+        void setFPS(int fps);
+        int initFrame();
+	void setInitFrame(int frame);
+        int framesTotal();
+        void setFramesTotal(int framesTotal);
+        void addVoice(TupVoice *voice);
+        TupVoice *voiceAt(int index);
+        QList<TupVoice *> voices();
+        void updateMouthPosition(int mouthIndex, QPointF point);
+
+        virtual void fromXml(const QString &xml);
+        virtual QDomElement toXml(QDomDocument &doc) const;
+
+    private:
+        struct Private;
+        Private *const k;
+};
+
+#endif
diff -Nru tupi-0.2+git04/src/store/tuppaintareaevent.h tupi-0.2+git05/src/store/tuppaintareaevent.h
--- tupi-0.2+git04/src/store/tuppaintareaevent.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuppaintareaevent.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,14 +36,14 @@
 #ifndef TUPPAINTAREAEVENT_H
 #define TUPPAINTAREAEVENT_H
 
+#include "tglobal.h"
 #include "tupprojectrequest.h"
-#include "tupglobal_store.h"
 
 /**
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupPaintAreaEvent
+class TUPI_EXPORT TupPaintAreaEvent
 {
     public:
         enum Action
diff -Nru tupi-0.2+git04/src/store/tuppalettedocument.h tupi-0.2+git05/src/store/tuppalettedocument.h
--- tupi-0.2+git04/src/store/tuppalettedocument.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuppalettedocument.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef TUPPALETTEDOCUMENT_H
 #define TUPPALETTEDOCUMENT_H
 
-#include "tupglobal_store.h"
+#include "tglobal.h"
 
 #include <QDomDocument>
 #include <QBrush>
@@ -48,7 +48,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupPaletteDocument : public QDomDocument
+class TUPI_EXPORT TupPaletteDocument : public QDomDocument
 {
     public:
         /**
diff -Nru tupi-0.2+git04/src/store/tuppathitem.cpp tupi-0.2+git05/src/store/tuppathitem.cpp
--- tupi-0.2+git04/src/store/tuppathitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuppathitem.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,19 +34,11 @@
  ***************************************************************************/
 
 #include "tuppathitem.h"
-#include "tdebug.h"
 #include "tupsvg2qt.h"
 #include "tupgraphicalgorithm.h"
 #include "tupserializer.h"
 
-#include <QMimeData>
-#include <QBrush>
-#include <QGraphicsSceneDragDropEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QCursor>
-
-TupPathItem::TupPathItem(QGraphicsItem * parent, QGraphicsScene * scene) : QGraphicsPathItem(parent, scene), m_dragOver(false)
+TupPathItem::TupPathItem(QGraphicsItem * parent) : QGraphicsPathItem(parent), m_dragOver(false)
 {
     setAcceptDrops(true);
 }
@@ -182,10 +174,15 @@
 {
     m_dragOver = false;
 
-    if (event->mimeData()->hasColor())
-        setBrush(QBrush(qVariantValue<QColor>(event->mimeData()->colorData())));
-    else if (event->mimeData()->hasImage())
-             setBrush(QBrush(qVariantValue<QPixmap>(event->mimeData()->imageData())));
+    if (event->mimeData()->hasColor()) {
+        // setBrush(QBrush(qVariantValue<QColor>(event->mimeData()->colorData())));
+        QVariant color = event->mimeData()->colorData();
+        setBrush(QBrush(color.value<QColor>()));
+    } else if (event->mimeData()->hasImage()) {
+               // setBrush(QBrush(qVariantValue<QPixmap>(event->mimeData()->imageData())));
+               QVariant pixmap = event->mimeData()->imageData();
+               setBrush(QBrush(pixmap.value<QPixmap>()));
+    }
 
     update();
 }
diff -Nru tupi-0.2+git04/src/store/tuppathitem.h tupi-0.2+git05/src/store/tuppathitem.h
--- tupi-0.2+git04/src/store/tuppathitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuppathitem.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,18 +36,24 @@
 #ifndef TUPPATHITEM_H
 #define TUPPATHITEM_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
 #include <QGraphicsPathItem>
+#include <QMimeData>
+#include <QBrush>
+#include <QGraphicsSceneDragDropEvent>
+#include <QPainter>
+#include <QPainterPath>
+#include <QCursor>
 
 /**
  * @author David Cuadrado
 */
-class STORE_EXPORT TupPathItem : public TupAbstractSerializable, public QGraphicsPathItem
+class TUPI_EXPORT TupPathItem : public TupAbstractSerializable, public QGraphicsPathItem
 {
     public:
-        TupPathItem(QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
+        TupPathItem(QGraphicsItem *parent = 0);
         ~TupPathItem();
         
         virtual void fromXml(const QString &xml);
diff -Nru tupi-0.2+git04/src/store/tuppixmapitem.cpp tupi-0.2+git05/src/store/tuppixmapitem.cpp
--- tupi-0.2+git04/src/store/tuppixmapitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuppixmapitem.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,10 +34,8 @@
  ***************************************************************************/
 
 #include "tuppixmapitem.h"
-#include <QPixmap>
 
-TupPixmapItem::TupPixmapItem(QGraphicsItem * parent, QGraphicsScene * scene)
-                           : QGraphicsPixmapItem(parent, scene)
+TupPixmapItem::TupPixmapItem(QGraphicsItem *parent) : QGraphicsPixmapItem(parent)
 {
     setTransformationMode(Qt::SmoothTransformation);
 }
diff -Nru tupi-0.2+git04/src/store/tuppixmapitem.h tupi-0.2+git05/src/store/tuppixmapitem.h
--- tupi-0.2+git04/src/store/tuppixmapitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuppixmapitem.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,19 +36,20 @@
 #ifndef TUPPIXMAPITEM_H
 #define TUPPIXMAPITEM_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
 #include <QGraphicsPixmapItem>
+#include <QPixmap>
 
 /**
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupPixmapItem : public QGraphicsPixmapItem, public TupAbstractSerializable
+class TUPI_EXPORT TupPixmapItem : public QGraphicsPixmapItem, public TupAbstractSerializable
 {
     public:
-        TupPixmapItem(QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
+        TupPixmapItem(QGraphicsItem *parent = 0);
         ~TupPixmapItem();
 
         virtual void fromXml(const QString &xml);
diff -Nru tupi-0.2+git04/src/store/tupprojectcommand.cpp tupi-0.2+git05/src/store/tupprojectcommand.cpp
--- tupi-0.2+git04/src/store/tupprojectcommand.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectcommand.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupprojectcommand.h"
-#include "tdebug.h"
 #include "tupcommandexecutor.h"
 #include "tupprojectrequest.h"
 #include "tuppaintareaevent.h"
@@ -52,7 +51,11 @@
 TupProjectCommand::TupProjectCommand(TupCommandExecutor *executor, const TupProjectRequest *request) : QUndoCommand(), k(new Private())
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectCommand()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     k->executor = executor;
@@ -61,7 +64,12 @@
     TupRequestParser parser;
     if (!parser.parse(request->xml())) {
         #ifdef K_DEBUG
-               tFatal() << "TupProjectCommand::TupProjectCommand(): - Parser error!";
+            QString msg = "TupProjectCommand::TupProjectCommand(): - Parser error!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
     }
 
@@ -70,7 +78,12 @@
 
     if (!k->response) {
         #ifdef K_DEBUG
-               tFatal() << "TupProjectCommand::TupProjectCommand() - Unparsed response!";
+            QString msg = "TupProjectCommand::TupProjectCommand() - Unparsed response!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal() << msg;
+            #endif
         #endif
     }
 
@@ -80,9 +93,13 @@
 TupProjectCommand::TupProjectCommand(TupCommandExecutor *executor, TupProjectResponse *response) : QUndoCommand(), k(new Private)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectCommand()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
-
+	
     k->executor = executor;
     k->response = response;
     k->executed = false;
@@ -119,10 +136,15 @@
              }
             break;
             default:
-             {
+             {				  
                  #ifdef K_DEBUG
-                        tfDebug << "TProjectCommand::initText() - CAN'T HANDLE ID: " << k->response->part();
-                  #endif
+                     QString msg = "TProjectCommand::initText() - Error: can't handle ID: " + QString::number(k->response->part());
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
+                #endif
              }
             break;
     }
@@ -196,9 +218,13 @@
 void TupProjectCommand::redo()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO << k->response->part();
-    #endif    
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectCommand()] - k->response->part(): " << k->response->part();
+        #else
+            T_FUNCINFO << k->response->part();
+        #endif
+    #endif
+	
     if (k->executed) {
         k->response->setMode(TupProjectResponse::Redo);
     } else {
@@ -209,9 +235,14 @@
     switch (k->response->part()) {
             case TupProjectRequest::Project:
             {
-                 #ifdef K_DEBUG
-                        tDebug() << "Project response isn't handle";
-                 #endif
+                #ifdef K_DEBUG
+                     QString msg = "TupProjectCommand::redo() - Error: Project response isn't implemented";
+                     #ifdef Q_OS_WIN32
+                         qWarning() << msg;
+                     #else
+                         tWarning() << msg;
+                     #endif
+                #endif
             }
             break;
             case TupProjectRequest::Frame:
@@ -241,9 +272,14 @@
             break;
             default:
             {
-                 #ifdef K_DEBUG
-                        tError() << "TupProjectCommand::redo() - Error: Unknown project response";
-                 #endif
+                #ifdef K_DEBUG
+                     QString msg = "TupProjectCommand::redo() - Error: Unknown project response";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
+                #endif
             }
             break;
     }
@@ -257,7 +293,12 @@
             case TupProjectRequest::Project:
             {
                  #ifdef K_DEBUG
-                        tDebug() << "Project response isn't handle";
+                     QString msg = "TupProjectCommand::undo() - Error: Project response isn't implemented";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
             }
             break;
@@ -289,7 +330,12 @@
             default:
             {
                  #ifdef K_DEBUG
-                        tError() << "TupProjectCommand::undo() - Error: Unknown project response";
+                     QString msg = "TupProjectCommand::undo() - Error: Unknown project response";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
             }
             break;
@@ -299,7 +345,11 @@
 void TupProjectCommand::frameCommand()
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectCommand::frameCommand()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
     TupFrameResponse *response = static_cast<TupFrameResponse *>(k->response);
@@ -363,7 +413,12 @@
             default: 
             {
                  #ifdef K_DEBUG
-                        tError() << "TupProjectCommand::frameCommand() - Error: Unknown project response";
+                     QString msg = "TupProjectCommand::frameCommand() - Error: Unknown project response";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
             }
             break;
@@ -380,11 +435,26 @@
                  k->executor->createLayer(response);
             }
             break;
+            case TupProjectRequest::AddLipSync:
+            {
+                 k->executor->addLipSync(response);
+            }
+            break;
+            case TupProjectRequest::UpdateLipSync:
+            {
+                 k->executor->updateLipSync(response);
+            }
+            break;
             case TupProjectRequest::Remove:
             {
                  k->executor->removeLayer(response);
             }
             break;
+            case TupProjectRequest::RemoveLipSync:
+            {
+                 k->executor->removeLipSync(response);
+            }
+            break;
             case TupProjectRequest::Move:
             {
                  k->executor->moveLayer(response);
@@ -413,7 +483,12 @@
             default: 
             {
                  #ifdef K_DEBUG
-                        tError() << "TupProjectCommand::layerCommand() - Error: Unknown project response";
+                     QString msg = "TupProjectCommand::layerCommand() - Error: Unknown project response";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
             }
             break;
@@ -478,7 +553,12 @@
             default: 
             {
                  #ifdef K_DEBUG
-                        tError() << "TupProjectCommand::sceneCommand() - Error: Unknown project response";
+                     QString msg = "TupProjectCommand::sceneCommand() - Error: Unknown project response";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
             }
             break;
@@ -489,7 +569,11 @@
 {
     /*
     #ifdef K_DEBUG
-        T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectCommand::itemCommand()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     */
 
@@ -560,7 +644,12 @@
             default: 
             {
                  #ifdef K_DEBUG
-                        tError() << "TupProjectCommand::itemCommand() - Error: Unknown project response";
+                     QString msg = "TupProjectCommand::itemCommand() - Error: Unknown project response";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
             }
             break;
@@ -570,7 +659,11 @@
 void TupProjectCommand::libraryCommand()
 {
     #ifdef K_DEBUG
-        T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectCommand::libraryCommand()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
     
     TupLibraryResponse *response = static_cast<TupLibraryResponse *>(k->response);
@@ -603,7 +696,12 @@
             default:
             {
                  #ifdef K_DEBUG
-                        tError() << "TupProjectCommand::libraryCommand() - Error: Unknown project response";
+                     QString msg = "TupProjectCommand::libraryCommand() - Error: Unknown project response";
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tError() << msg;
+                     #endif
                  #endif
             }
             break;
@@ -612,11 +710,8 @@
 
 void TupProjectCommand::paintAreaCommand()
 {
-
-    #ifdef K_DEBUG
-           tError() << "TupProjectCommand::paintAreaCommand() - Error: FIX ME in ktprojectcommand.cpp";
-    #endif
-
+    // SQA: FIX ME in tupprojectcommand.cpp
+	
     /*
      if (redo)
          k->executor->reemitEvent(response);
diff -Nru tupi-0.2+git04/src/store/tupprojectcommand.h tupi-0.2+git05/src/store/tupprojectcommand.h
--- tupi-0.2+git04/src/store/tupprojectcommand.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectcommand.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef TUPPROJECTCOMMAND_H
 #define TUPPROJECTCOMMAND_H
 
-#include "tupglobal_store.h"
+#include "tglobal.h"
 
 #include <QUndoCommand>
 #include <QVariant>
@@ -51,7 +51,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupProjectCommand : public QUndoCommand
+class TUPI_EXPORT TupProjectCommand : public QUndoCommand
 {
     public:
         TupProjectCommand(TupCommandExecutor *executor, const TupProjectRequest *event);
diff -Nru tupi-0.2+git04/src/store/tupproject.cpp tupi-0.2+git05/src/store/tupproject.cpp
--- tupi-0.2+git04/src/store/tupproject.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupproject.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -46,11 +46,6 @@
 #include "tupprojectresponse.h"
 #include "tupprojectloader.h"
 
-#include "tdebug.h"
-
-#include <QDir>
-#include <QGraphicsView>
-
 struct TupProject::Private
 {
     QString name;
@@ -74,9 +69,13 @@
 TupProject::TupProject(QObject *parent) : QObject(parent), k(new Private)
 {
     #ifdef K_DEBUG
-           TINIT;
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProject()]";
+        #else
+            TINIT;
+        #endif
+    #endif    
+    
     k->spaceMode = TupProject::NONE;
     k->bgColor = QColor("#fff");
     k->sceneCounter = 0;
@@ -91,11 +90,15 @@
 TupProject::~TupProject()
 {
     #ifdef K_DEBUG
-           TEND;
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupProject()]";
+        #else
+            TEND;
+        #endif
+    #endif    
+        
     deleteDataDir();
-    k->scenes.clear(true);
+    k->scenes.clear();
     delete k;
 }
 
@@ -104,14 +107,19 @@
  */
 void TupProject::loadLibrary(const QString &filename)
 {
-    QFile lfile(filename);
+    QFile file(filename);
 
-    if (lfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        k->library->fromXml(QString::fromLocal8Bit(lfile.readAll()));
-        lfile.close();
-    } else {
+    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        k->library->fromXml(QString::fromLocal8Bit(file.readAll()));
+        file.close();
+    } else {               
         #ifdef K_DEBUG
-               tFatal("library") << "Cannot open library from: " << filename;
+            QString msg = "TupProject::loadLibrary() - Cannot open library from: " + filename;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tFatal("library") << msg;
+            #endif
         #endif
     }
 }
@@ -121,7 +129,7 @@
  */
 void TupProject::clear()
 {
-    k->scenes.clear(true);
+    k->scenes.clear();
     k->sceneCounter = 0;
 
     deleteDataDir();
@@ -146,8 +154,12 @@
 void TupProject::setBgColor(const QColor color)
 {
     k->bgColor = color;
-    foreach (TupScene *scene, k->scenes.values())
-             scene->setBgColor(color);
+
+    int totalScenes = k->scenes.size();
+    for (int i = 0; i < totalScenes; i++) {
+         TupScene *scene = k->scenes.at(i);
+         scene->setBgColor(color);
+    }
 }
 
 /**
@@ -239,7 +251,6 @@
     k->scenes.insert(position, scene);
     k->sceneCounter++;
 
-    // scene->setSceneName(tr("Scene %1").arg(k->sceneCounter));
     scene->setSceneName(name);
     
     if (loaded)
@@ -256,20 +267,29 @@
 bool TupProject::removeScene(int position)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProject::removeScene()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif        
+    
     TupScene *toRemove = scene(position);
 
     if (toRemove) {
 
         QString path = dataDir() + QDir::separator() + "scene" + QString::number(position) + ".tps";
 
-        if (!QFile::remove(path)) {
+        if (!QFile::remove(path)) {        
             #ifdef K_DEBUG
-                   tError() << "TupProject::removeScene() - Error removing file " << path;
+                QString msg = "TupProject::removeScene() - Error removing file " + path;
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
-
+            
             return false;
         } else {
             int total = k->sceneCounter - 1;
@@ -282,7 +302,7 @@
             }
         }
 
-        k->scenes.removeObject(position);
+        k->scenes.removeAt(position);
         delete toRemove;
         toRemove = 0;
 
@@ -298,26 +318,40 @@
 {
     if (position < 0 || newPosition < 0) {
         #ifdef K_DEBUG
-               tError() << "TupProject::moveScene() - Failed moving scene from " << position << " to " << newPosition; 
+            QString msg = "TupProject::moveScene() - Failed moving scene from " + QString::number(position) + " to " + QString::number(newPosition);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return false;
     }
 
-    TupScene *scene = k->scenes.takeObject(position);
+    TupScene *scene = k->scenes.takeAt(position);
     k->scenes.insert(newPosition, scene);
 
     return true;
 }
 
 TupScene *TupProject::scene(int position) const
-{
+{    
     #ifdef K_DEBUG
-           T_FUNCINFOX("project")<< position;
-    #endif
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProject::scene()] - position: " << position;
+        #else
+            T_FUNCINFOX("project") << position;
+        #endif
+    #endif    
 
     if (position < 0) {
         #ifdef K_DEBUG
-               tError() << "TupProject::scene() - FATAL ERROR: index out of bound (" << position << ")";
+            QString msg = "TupProject::scene() - FATAL ERROR: index out of bound (" + QString::number(position) + ")";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return 0;
     }
@@ -327,16 +361,9 @@
 
 int TupProject::visualIndexOf(TupScene *scene) const
 {
-    return k->scenes.objectIndex(scene);
+    return k->scenes.indexOf(scene);
 }
 
-/*
-int TupProject::logicalIndexOf(TupScene *scene) const
-{
-    return k->scenes.logicalIndex(scene);
-}
-*/
-
 void TupProject::fromXml(const QString &xml)
 {
     QDomDocument document;
@@ -358,15 +385,12 @@
                    e = n1.toElement();
 
                    if (e.tagName() == "meta") {
-
                        QDomNode n1 = e.firstChild();
 
                        while (!n1.isNull()) {
-
                               QDomElement e1 = n1.toElement();
 
                               if (e1.tagName() == "author") {
-
                                   if (e1.firstChild().isText()) 
                                       setAuthor(e1.text());
 
@@ -377,12 +401,10 @@
                                              setBgColor(QColor(e1.text()));
 
                               } else if (e1.tagName() == "description") {
-
                                          if (e1.firstChild().isText())
                                              setDescription(e1.text());
 
                                 } else if (e1.tagName() == "dimension") {
-
                                            if (e1.firstChild().isText()) {
                                                QStringList list = e1.text().split(",");
                                                int x = list.at(0).toInt();
@@ -392,10 +414,8 @@
                                            }
 
                                 } else if (e1.tagName() == "fps") {
-
                                            if (e1.firstChild().isText())
                                                setFPS(e1.text().toInt());
-
                                 }
 
                                 n1 = n1.nextSibling();
@@ -415,7 +435,6 @@
 
     QDomElement project = doc.createElement("project");
     project.setAttribute("name", k->name);
-    //project.setAttribute("name", projectName);
 
     QDomElement meta = doc.createElement("meta");
 
@@ -456,24 +475,45 @@
 bool TupProject::createSymbol(int type, const QString &name, const QByteArray &data, const QString &folder)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProject::createSymbol()]";
+        #else
+            T_FUNCINFOX("symbol");
+        #endif
     #endif
-
-    if (!k->isOpen) {
+   
+    if (!k->isOpen) {        
         #ifdef K_DEBUG
-               tError() << "TupProject::createSymbol() - Fatal error: project is NOT open!";
+            QString msg = "TupProject::createSymbol() - Fatal error: project is NOT open!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
+        
         return false;
     }
 
     if (k->library->createSymbol(TupLibraryObject::Type(type), name, data, folder) == 0) {
         #ifdef K_DEBUG
-               tError() << "TupProject::createSymbol() - Fatal error: object can't be created. Data is NULL!";
-        #endif
-    } else {
+            QString msg = "TupProject::createSymbol() - Fatal error: object can't be created. Data is NULL!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif    
+
+    } else {        
         #ifdef K_DEBUG
-               tWarning() << "TupProject::createSymbol() - Object added successfully -> " << name;
-        #endif
+            QString msg = "TupProject::createSymbol() - Object added successfully -> " + name;
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
+        #endif    
     }
 
     return true;
@@ -481,12 +521,16 @@
 
 // SQA: Parameter name is really used here?
 bool TupProject::removeSymbol(const QString &name, TupLibraryObject::Type symbolType, TupProject::Mode spaceMode, 
-                             int sceneIndex, int layerIndex, int frameIndex)
+                              int sceneIndex, int layerIndex, int frameIndex)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProject::removeSymbol()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif    
+    
     Q_UNUSED(name);
 
     TupFrame *frame = 0;
@@ -504,8 +548,15 @@
                             return true;
                         } else {
                             #ifdef K_DEBUG
-                                   tError() << "TupProject::removeSymbol() - Fatal Error: can't remove SVG object at index [ " << lastIndex << " ]";
-                                   tError() << "TupProject::removeSymbol() - Context Mode: Frames Edition";
+                                QString msg1 = "TupProject::removeSymbol() - Fatal Error: can't remove SVG object at index [ " + QString::number(lastIndex) + " ]";
+                                QString msg2 = "TupProject::removeSymbol() - Context Mode: Frames Edition";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg1;
+                                    qDebug() << msg2;
+                                #else
+                                    tError() << msg1;
+                                    tError() << msg2;
+                                #endif
                             #endif
                             return false;
                         }
@@ -515,8 +566,15 @@
                             return true;
                         } else {
                             #ifdef K_DEBUG
-                                   tError() << "TupProject::removeSymbol() - Fatal Error: can't remove ITEM at index [ " << lastIndex << " ]";
-                                   tError() << "TupProject::removeSymbol() - Context Mode: Frames Edition";
+                                QString msg1 = "TupProject::removeSymbol() - Fatal Error: can't remove SVG object at index [ " + QString::number(lastIndex) + " ]";
+                                QString msg2 = "TupProject::removeSymbol() - Context Mode: Frames Edition";
+                                #ifdef Q_OS_WIN32
+                                    qDebug() << msg1;
+                                    qDebug() << msg2;
+                                #else
+                                    tError() << msg1;
+                                    tError() << msg2;
+                                #endif
                             #endif
                             return false;
                         }
@@ -533,10 +591,17 @@
                                int lastIndex = frame->svgItemsCount()-1;
                                if (frame->removeSvgAt(lastIndex)) {
                                    return true;
-                               } else {
+                               } else {                                   
                                    #ifdef K_DEBUG
-                                          tError() << "TupProject::removeSymbol() - Fatal Error: can't remove SVG object at index [ " << lastIndex << " ]";
-                                          tError() << "TupProject::removeSymbol() - Context Mode: Static Bg Edition";
+                                       QString msg1 = "TupProject::removeSymbol() - Fatal Error: can't remove SVG object at index [ " + QString::number(lastIndex) + " ]";
+                                       QString msg2 = "TupProject::removeSymbol() - Context Mode: Static Bg Edition";
+                                       #ifdef Q_OS_WIN32
+                                           qDebug() << msg1;
+                                           qDebug() << msg2;
+                                       #else
+                                           tError() << msg1;
+                                           tError() << msg2;
+                                       #endif
                                    #endif
                                    return false;
                                }
@@ -544,11 +609,19 @@
                                int lastIndex = frame->graphicItemsCount()-1;
                                if (frame->removeGraphicAt(lastIndex)) {
                                    return true;
-                               } else {
+                               } else {                                   
                                    #ifdef K_DEBUG
-                                          tError() << "TupProject::removeSymbol() - Fatal Error: can't remove ITEM at index [ " << lastIndex << " ]";
-                                          tError() << "TupProject::removeSymbol() - Context Mode: Static Bg Edition";
+                                       QString msg1 = "TupProject::removeSymbol() - Fatal Error: can't remove ITEM at index [ " + QString::number(lastIndex) + " ]";
+                                       QString msg2 = "TupProject::removeSymbol() - Context Mode: Static Bg Edition";
+                                       #ifdef Q_OS_WIN32
+                                           qDebug() << msg1;
+                                           qDebug() << msg2;
+                                       #else
+                                           tError() << msg1;
+                                           tError() << msg2;
+                                       #endif
                                    #endif
+                                   
                                    return false;
                                }
                            }
@@ -564,11 +637,19 @@
                                int lastIndex = frame->svgItemsCount()-1;
                                if (frame->removeSvgAt(lastIndex)) {
                                    return true;
-                               } else {
+                               } else {                                   
                                    #ifdef K_DEBUG
-                                          tError() << "TupProject::removeSymbol() - Fatal Error: can't remove SVG at index [ " << lastIndex << " ]";
-                                          tError() << "TupProject::removeSymbol() - Context Mode: Dynamic Bg Edition";
+                                       QString msg1 = "TupProject::removeSymbol() - Fatal Error: can't remove SVG at index [ " + QString::number(lastIndex) + " ]";
+                                       QString msg2 = "TupProject::removeSymbol() - Context Mode: Dynamic Bg Edition";
+                                       #ifdef Q_OS_WIN32
+                                           qDebug() << msg1;
+                                           qDebug() << msg2;
+                                       #else
+                                           tError() << msg1;
+                                           tError() << msg2;
+                                       #endif
                                    #endif
+                                   
                                    return false;
                                }
                            } else {
@@ -577,9 +658,17 @@
                                    return true;
                                } else {
                                    #ifdef K_DEBUG
-                                          tError() << "TupProject::removeSymbol() - Fatal Error: can't remove ITEM at index [ " << lastIndex << " ]";
-                                          tError() << "TupProject::removeSymbol() - Context Mode: Dynamic Bg Edition";
+                                       QString msg1 = "TupProject::removeSymbol() - Fatal Error: can't remove ITEM at index [ " + QString::number(lastIndex) + " ]";
+                                       QString msg2 = "TupProject::removeSymbol() - Context Mode: Dynamic Bg Edition";
+                                       #ifdef Q_OS_WIN32
+                                           qDebug() << msg1;
+                                           qDebug() << msg2;
+                                       #else
+                                           tError() << msg1;
+                                           tError() << msg2;
+                                       #endif
                                    #endif
+                                   
                                    return false;
                                }
                            }
@@ -587,7 +676,12 @@
                    }
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupProject::removeSymbol() - Fatal Error: invalid spaceMode!";
+                QString msg = "TupProject::removeSymbol() - Fatal Error: invalid spaceMode!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
         }
     }
@@ -598,24 +692,64 @@
 bool TupProject::removeSymbol(const QString &name)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProject::removeSymbol()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif    
+    
+    return k->library->removeObject(name, true);
+}
+
+bool TupProject::addFolder(const QString &name)
+{
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProject::addFolder()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
-    return k->library->removeObject(name, true);
+    TupLibraryFolder *folder = new TupLibraryFolder(name, this);
+
+    return k->library->addFolder(folder);
 }
 
-bool TupProject::insertSymbolIntoFrame(TupProject::Mode spaceMode, const QString &name, int sceneIndex, 
-                                   int layerIndex, int frameIndex)
+bool TupProject::removeFolder(const QString &name)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProject::removeFolder()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
 
+    return k->library->removeFolder(name);
+}
+
+bool TupProject::removeSound(const QString &name)
+{
+    return k->library->removeObject(name, true);
+}
+
+bool TupProject::insertSymbolIntoFrame(TupProject::Mode spaceMode, const QString &name, int sceneIndex, 
+                                   int layerIndex, int frameIndex)
+{    
+    #ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProject::insertSymbolIntoFrame()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif        
+    
     TupFrame *frame = 0;
     TupScene *scene = this->scene(sceneIndex);
 
     if (scene) {
-
         if (spaceMode == TupProject::FRAMES_EDITION) {
             TupLayer *layer = scene->layer(layerIndex);
 
@@ -639,18 +773,20 @@
                 return false;
         } else {
             #ifdef K_DEBUG
-                   tError() << "TupProject::insertSymbolIntoFrame() - Fatal Error: invalid spaceMode!";
-            #endif
-            
+                QString msg = "TupProject::insertSymbolIntoFrame() - Fatal Error: invalid spaceMode!";
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
+            #endif        
             return false;
         }
 
         if (frame) {
-
             TupLibraryObject *object = k->library->getObject(name);
 
             if (object) {
-
                 switch (object->type()) {
                         case TupLibraryObject::Image:
                         {
@@ -723,29 +859,48 @@
                         break;
                         default:
                              #ifdef K_DEBUG
-                                    tFatal() << "TupProject::insertSymbolIntoFrame() -> Unknown Object Type"; 
-                             #endif
+                                 QString msg = "TupProject::insertSymbolIntoFrame() -> Unknown Object Type";
+                                 #ifdef Q_OS_WIN32
+                                     qDebug() << msg;
+                                 #else
+                                     tFatal() << msg;
+                                 #endif
+                             #endif                         
                         break;
                 }
 
                 return true;
-
-            } else {
-                #ifdef K_DEBUG 
-                       tError() << "TupProject::insertSymbolIntoFrame() - Object NOT found at library! " << name;
+            } else {                
+                #ifdef K_DEBUG
+                    QString msg = "TupProject::insertSymbolIntoFrame() - Object NOT found at library! " + name;
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
+                
                 return false;
             }
         } else {
                 #ifdef K_DEBUG
-                       tError() << "TupProject::insertSymbolIntoFrame() - Invalid frame!";
+                    QString msg = "TupProject::insertSymbolIntoFrame() - Invalid frame!";
+                    #ifdef Q_OS_WIN32
+                        qDebug() << msg;
+                    #else
+                        tError() << msg;
+                    #endif
                 #endif
         }
-
-    } else {
+    } else {        
         #ifdef K_DEBUG
-               tError() << "TupProject::insertSymbolIntoFrame() - Invalid scene!";
-        #endif
+            QString msg = "TupProject::insertSymbolIntoFrame() - Invalid scene!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif        
     }
 
     return false;
@@ -754,41 +909,51 @@
 bool TupProject::removeSymbolFromFrame(const QString &name, TupLibraryObject::Type type)
 {
     #ifdef K_DEBUG
-           tFatal() << "TupProject::removeSymbolFromFrame() - Removing symbol " << name << " from project...";
-    #endif
-
+        QString msg = "TupProject::removeSymbolFromFrame() - Removing symbol " + name + " from project...";
+        #ifdef Q_OS_WIN32
+            qDebug() << msg;
+        #else
+            tFatal() << msg;
+        #endif
+    #endif    
+    
     if (type == TupLibraryObject::Folder)
         return true;
 
-    foreach (TupScene *scene, k->scenes.values()) {
-             foreach (TupLayer *layer, scene->layers().values()) {
-                      foreach (TupFrame *frame, layer->frames().values()) {
-                               if (type != TupLibraryObject::Svg)
-                                   frame->removeImageItemFromFrame(name);
-                               else
-                                   frame->removeSvgItemFromFrame(name);
-                      }
+    int totalScenes = k->scenes.size(); 
+    for (int i = 0; i < totalScenes; i++) {
+         TupScene *scene =  k->scenes.at(i);
+         int totalLayers = scene->layers().size();
+         for (int j = 0; j < totalLayers; j++) {
+              TupLayer *layer = scene->layers().at(j);
+              int totalFrames = layer->frames().size(); 
+              for (int t = 0; t < totalFrames; t++) {
+                   TupFrame *frame = layer->frames().at(t);
+                   if (type != TupLibraryObject::Svg)
+                       frame->removeImageItemFromFrame(name);
+                   else
+                       frame->removeSvgItemFromFrame(name);
+              }
+         }
+
+         TupBackground *bg = scene->background();
+         if (bg) {
+             TupFrame *frame = bg->staticFrame();
+             if (frame) {
+                 if (type == TupLibraryObject::Svg)
+                     frame->removeSvgItemFromFrame(name);
+                 else
+                     frame->removeImageItemFromFrame(name);
              }
 
-             TupBackground *bg = scene->background();
-             if (bg) {
-                 TupFrame *frame = bg->staticFrame();
-                 if (frame) {
-                     if (type == TupLibraryObject::Svg)
-                         frame->removeSvgItemFromFrame(name);
-                     else
-                         frame->removeImageItemFromFrame(name);
-                 }
-
-                 frame = bg->dynamicFrame();
-                 if (frame) {
-                     if (type == TupLibraryObject::Svg)
-                         frame->removeSvgItemFromFrame(name);
-                     else
-                         frame->removeImageItemFromFrame(name);
-                 }
-
+             frame = bg->dynamicFrame();
+             if (frame) {
+                 if (type == TupLibraryObject::Svg)
+                     frame->removeSvgItemFromFrame(name);
+                 else
+                     frame->removeImageItemFromFrame(name);
              }
+         }
     }
 
     k->library->removeObject(name, true);
@@ -798,35 +963,40 @@
 
 bool TupProject::updateSymbolId(TupLibraryObject::Type type, const QString &oldId, const QString &newId)
 {
-    foreach (TupScene *scene, k->scenes.values()) {
-
-             foreach (TupLayer *layer, scene->layers().values()) {
-                      foreach (TupFrame *frame, layer->frames().values()) {
-                               if (type != TupLibraryObject::Svg)
-                                   frame->updateIdFromFrame(oldId, newId);
-                               else 
-                                   frame->updateSvgIdFromFrame(oldId, newId);
-                      }
+    int scenesTotal = k->scenes.size();
+    for (int i = 0; i < scenesTotal; i++) {
+         TupScene *scene = k->scenes.at(i);
+         int layersTotal = scene->layers().size();
+         for (int j = 0; j < layersTotal; j++) {
+              TupLayer *layer = scene->layers().at(j);
+              int framesTotal = layer->frames().size();  
+              for (int t = 0; t < framesTotal; t++) {
+                   TupFrame *frame = layer->frames().at(t); 
+                   if (type != TupLibraryObject::Svg)
+                       frame->updateIdFromFrame(oldId, newId);
+                   else 
+                       frame->updateSvgIdFromFrame(oldId, newId);
+              }
+         }
+
+         TupBackground *bg = scene->background();
+         if (bg) {
+             TupFrame *frame = bg->staticFrame();
+             if (frame) {
+                 if (type != TupLibraryObject::Svg)
+                     frame->updateIdFromFrame(oldId, newId);
+                 else
+                     frame->updateSvgIdFromFrame(oldId, newId);
              }
 
-             TupBackground *bg = scene->background();
-             if (bg) {
-                 TupFrame *frame = bg->staticFrame();
-                 if (frame) {
-                     if (type != TupLibraryObject::Svg)
-                         frame->updateIdFromFrame(oldId, newId);
-                     else
-                         frame->updateSvgIdFromFrame(oldId, newId);
-                 }
-
-                 frame = bg->dynamicFrame();
-                 if (frame) {
-                     if (type != TupLibraryObject::Svg)
-                         frame->updateIdFromFrame(oldId, newId);
-                     else
-                         frame->updateSvgIdFromFrame(oldId, newId);
-                 }
+             frame = bg->dynamicFrame();
+             if (frame) {
+                 if (type != TupLibraryObject::Svg)
+                     frame->updateIdFromFrame(oldId, newId);
+                 else
+                     frame->updateSvgIdFromFrame(oldId, newId);
              }
+         }
     }
 
     return true;
@@ -834,35 +1004,40 @@
 
 void TupProject::reloadLibraryItem(TupLibraryObject::Type type, const QString &id, TupLibraryObject *object)
 {
-    foreach (TupScene *scene, k->scenes.values()) {
-             foreach (TupLayer *layer, scene->layers().values()) {
-                      foreach (TupFrame *frame, layer->frames().values()) {
-                               if (type == TupLibraryObject::Svg)
-                                   frame->reloadSVGItem(id, object);
-                               else
-                                   frame->reloadGraphicItem(id, object->dataPath());
-                      }
+    int scenesTotal = k->scenes.size();
+    for (int i = 0; i < scenesTotal; i++) {
+         TupScene *scene = k->scenes.at(i);
+         int layersTotal = scene->layers().size();
+         for (int j = 0; j < layersTotal; j++) {
+              TupLayer *layer = scene->layers().at(j);
+              int framesTotal = layer->frames().size();
+              for (int t = 0; t < framesTotal; t++) {
+                   TupFrame *frame = layer->frames().at(t);
+                   if (type == TupLibraryObject::Svg)
+                       frame->reloadSVGItem(id, object);
+                   else
+                       frame->reloadGraphicItem(id, object->dataPath());
+              }
+         }
+
+         TupBackground *bg = scene->background();
+         if (bg) {
+             TupFrame *frame = bg->staticFrame();
+             if (frame) {
+                 if (type == TupLibraryObject::Svg)
+                     frame->reloadSVGItem(id, object);
+                 else
+                     frame->reloadGraphicItem(id, object->dataPath());
              }
 
-             TupBackground *bg = scene->background();
-             if (bg) {
-                 TupFrame *frame = bg->staticFrame();
-                 if (frame) {
-                     if (type == TupLibraryObject::Svg)
-                         frame->reloadSVGItem(id, object);
-                     else
-                         frame->reloadGraphicItem(id, object->dataPath());
-                 }
-
-                 frame = bg->dynamicFrame();
-                 if (frame) {
-                     if (type == TupLibraryObject::Svg)
-                         frame->reloadSVGItem(id, object);
-                     else
-                         frame->reloadGraphicItem(id, object->dataPath());
-                 }
+             frame = bg->dynamicFrame();
+             if (frame) {
+                 if (type == TupLibraryObject::Svg)
+                     frame->reloadSVGItem(id, object);
+                 else
+                     frame->reloadGraphicItem(id, object->dataPath());
              }
-
+         }
     }
 }
 
@@ -898,9 +1073,14 @@
                      dir.remove(scene);
         }
 
-        if (dir.exists("audio") || dir.exists("video") || dir.exists("images") || dir.exists("svg")) {
+        if (dir.exists("audio") || dir.exists("video") || dir.exists("images") || dir.exists("svg")) {            
             #ifdef K_DEBUG
-                   tWarning() << "TupProject::deleteDataDir() - Removing directory -> " << dir.absolutePath(); 
+                QString msg = "TupProject::deleteDataDir() - Removing directory -> " + dir.absolutePath();
+                #ifdef Q_OS_WIN32
+                    qWarning() << msg;
+                #else
+                    tWarning() << msg;
+                #endif
             #endif
 
             foreach (QString subdir, QStringList() << "audio" << "video" << "images" << "svg") {
@@ -923,7 +1103,12 @@
 
         if (! dir.rmdir(dir.absolutePath())) {
             #ifdef K_DEBUG
-                   tError() << "TupProject::deleteDataDir() - Fatal Error: Can't remove project data directory! -> " << dataDir();
+                QString msg = "TupProject::deleteDataDir() - Fatal Error: Can't remove project data directory! -> " + dataDir();
+                #ifdef Q_OS_WIN32
+                    qDebug() << msg;
+                #else
+                    tError() << msg;
+                #endif
             #endif
         }
 
diff -Nru tupi-0.2+git04/src/store/tupproject.h tupi-0.2+git05/src/store/tupproject.h
--- tupi-0.2+git04/src/store/tupproject.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupproject.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,17 +36,17 @@
 #ifndef TUPPROJECT_H
 #define TUPPROJECT_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal.h"
 #include "tapplicationproperties.h"
-#include "tupinthash.h"
-#include "tupglobal_store.h"
 #include "tuplibraryobject.h"
 
 #include <QObject>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QSize>
+#include <QDir>
+#include <QGraphicsView>
 
 class TupScene;
 class TupLayer;
@@ -56,7 +56,7 @@
 class QGraphicsItem;
 class TupLibrary;
 
-typedef TupIntHash<TupScene *> Scenes;
+typedef QList<TupScene *> Scenes;
 
 /**
  * This class contains the project data structure including scenes.
@@ -64,7 +64,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupProject : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupProject : public QObject, public TupAbstractSerializable
 {
     Q_OBJECT
 
@@ -102,7 +102,6 @@
         TupScene *scene(int position) const;
 
         int visualIndexOf(TupScene *scene) const;
-        //int logicalIndexOf(TupScene *scene) const;
 
         Scenes scenes() const;
 
@@ -115,6 +114,10 @@
         bool removeSymbol(const QString &name, TupLibraryObject::Type symbolType, TupProject::Mode spaceMode, 
                           int sceneIndex, int layerIndex, int frameIndex);
         bool removeSymbol(const QString &name);
+        bool addFolder(const QString &name);
+        bool removeFolder(const QString &name);
+
+        bool removeSound(const QString &name);
 
         bool insertSymbolIntoFrame(TupProject::Mode spaceMode, const QString &name, int scene, int layer, int frame);
         bool removeSymbolFromFrame(const QString &name, TupLibraryObject::Type type);
@@ -125,7 +128,6 @@
         void clear();
         void loadLibrary(const QString &filename);
 
-        //TupLibrary *library() const;
         TupLibrary *library();
         void emitResponse(TupProjectResponse *response);
 
diff -Nru tupi-0.2+git04/src/store/tupprojectloader.cpp tupi-0.2+git05/src/store/tupprojectloader.cpp
--- tupi-0.2+git04/src/store/tupprojectloader.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectloader.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,8 +35,6 @@
 
 #include "tupprojectloader.h"
 #include "tupproject.h"
-#include "tdebug.h"
-
 #include "tupprojectresponse.h"
 #include "tuplibraryobject.h"
 
@@ -76,7 +74,6 @@
     project->emitResponse(&response);
 }
 
-
 void TupProjectLoader::createLayer(int scenePosition, int layerPosition, const QString &name, TupProject *project)
 {
     TupLayerResponse response(TupProjectRequest::Layer, TupProjectRequest::Add);
diff -Nru tupi-0.2+git04/src/store/tupprojectloader.h tupi-0.2+git05/src/store/tupprojectloader.h
--- tupi-0.2+git04/src/store/tupprojectloader.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectloader.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,17 +36,18 @@
 #ifndef TUPPROJECTLOADER_H
 #define TUPPROJECTLOADER_H
 
-#include <QString>
-
+#include "tglobal.h"
 #include "tuplibraryobject.h"
 
+#include <QString>
+
 class TupProject;
 
 /**
  * @author David Cuadrado
 */
 
-class TupProjectLoader
+class TUPI_EXPORT TupProjectLoader
 {
     public:
     	TupProjectLoader();
diff -Nru tupi-0.2+git04/src/store/tupprojectmanager.cpp tupi-0.2+git05/src/store/tupprojectmanager.cpp
--- tupi-0.2+git04/src/store/tupprojectmanager.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectmanager.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -48,11 +48,6 @@
 #include "tuprequestbuilder.h"
 #include "tuprequestparser.h"
 #include "talgorithm.h"
-#include "tdebug.h"
-
-#include <QUndoStack>
-#include <QDir>
-#include <QFileInfo>
 
 // This class handles the current animation project 
 
@@ -85,9 +80,13 @@
 };
 
 TupProjectManager::TupProjectManager(QObject *parent) : QObject(parent), k(new Private())
-{
+{	
     #ifdef K_DEBUG
-           TINIT;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectManager()]";
+        #else
+            TINIT;
+        #endif
     #endif
     
     k->isModified = false;
@@ -104,7 +103,11 @@
 TupProjectManager::~TupProjectManager()
 {
     #ifdef K_DEBUG
-           TEND;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[~TupProjectManager()]";
+        #else
+            TEND;
+        #endif
     #endif
 
     delete k;
@@ -152,14 +155,23 @@
 }
 
 void TupProjectManager::setupNewProject()
-{
+{	
     #ifdef K_DEBUG
-           T_FUNCINFO;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectManager::setupNewProject()]";
+        #else
+            T_FUNCINFO;
+        #endif
     #endif
-
+	
     if (!k->handler || !k->params) {
         #ifdef K_DEBUG
-               tError() << "TupProjectManager::setupNewProject() - Error: No handler available or no params!";
+            QString msg = "TupProjectManager::setupNewProject() - Error: No handler available or no params!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
         return;
     }
@@ -175,8 +187,13 @@
 
     if (! k->handler->setupNewProject(k->params)) {
         #ifdef K_DEBUG
-               tError() << "TupProjectManager::setupNewProject() - Error: Project params misconfiguration";
-        #endif
+            QString msg = "TupProjectManager::setupNewProject() - Error: Project params misconfiguration";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif		
         return;
     }
 
@@ -226,9 +243,15 @@
 bool TupProjectManager::loadProject(const QString &fileName)
 {
     if (! k->handler) {
-        #ifdef K_DEBUG
-               tError() << "TupProjectManager::loadProject() - Fatal Error: No project handler available!";
-        #endif
+	    #ifdef K_DEBUG
+            QString msg = "TupProjectManager::loadProject() - Fatal Error: No project handler available!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif		
+
         return false;
     }
 
@@ -238,8 +261,13 @@
         k->project->setOpen(true);
         k->isModified = false;
     } else {
-        #ifdef K_DEBUG
-               tError() << "TupProjectManager::loadProject() - Fatal Error: Can't load project -> " << fileName;
+	    #ifdef K_DEBUG
+            QString msg = "TupProjectManager::loadProject() - Fatal Error: Can't load project -> " + fileName;
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 
@@ -297,12 +325,16 @@
  * @param event 
  */
 void TupProjectManager::handleProjectRequest(const TupProjectRequest *request)
-{
+{	
     #ifdef K_DEBUG
-           T_FUNCINFO;
-           // SQA: Enable these lines only for hard/tough debugging
-           // tWarning() << "Package: ";
-           // tWarning() << request->xml();
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectManager::handleProjectRequest()]";
+        #else
+            T_FUNCINFO;
+            // SQA: Enable these lines only for hard/tough debugging
+            // tWarning() << "Package: ";
+            // tWarning() << request->xml();			
+        #endif
     #endif
 
     // SQA: the handler must advise when to build the command
@@ -310,8 +342,13 @@
     if (k->handler) {
         k->handler->handleProjectRequest(request);
     } else {
-        #ifdef K_DEBUG
-               tError() << "TupProjectManager::handleProjectRequest() - Error: No handler available";
+	    #ifdef K_DEBUG
+            QString msg = "TupProjectManager::handleProjectRequest() - Error: No handler available";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -319,9 +356,13 @@
 void TupProjectManager::handleLocalRequest(const TupProjectRequest *request)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
-
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectManager::handleLocalRequest()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif	
+	
     TupRequestParser parser;
 
     if (parser.parse(request->xml())) {
@@ -370,8 +411,12 @@
 void TupProjectManager::createCommand(const TupProjectRequest *request, bool addToStack)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO;
-    #endif
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectManager::createCommand(()]";
+        #else
+            T_FUNCINFO;
+        #endif
+    #endif		
 
     if (request->isValid()) {
         TupProjectCommand *command = new TupProjectCommand(k->commandExecutor, request);
@@ -382,12 +427,18 @@
             command->redo();
     } else {
         #ifdef K_DEBUG
-               tWarning() << "TupProjectManager::createCommand() - Invalid request";
+            QString msg = "TupProjectManager::createCommand() - Invalid request";
+            #ifdef Q_OS_WIN32
+                qWarning() << msg;
+            #else
+                tWarning() << msg;
+            #endif
         #endif
     }
 }
 
-TupProject *TupProjectManager::project() const
+// TupProject *TupProjectManager::project() const
+TupProject *TupProjectManager::project()
 {
     return k->project;
 }
@@ -398,10 +449,14 @@
 }
 
 void TupProjectManager::emitResponse(TupProjectResponse *response)
-{
-    #ifdef K_DEBUG
-           T_FUNCINFO << response->action();
-    #endif
+{	
+	#ifdef K_DEBUG
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupProjectManager::emitResponse()] - response->action(): " << response->action();
+        #else
+            T_FUNCINFO << response->action();
+        #endif
+    #endif	
 
     if (response->action() != TupProjectRequest::Select) {
         k->isModified = true;
diff -Nru tupi-0.2+git04/src/store/tupprojectmanager.h tupi-0.2+git05/src/store/tupprojectmanager.h
--- tupi-0.2+git04/src/store/tupprojectmanager.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectmanager.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,13 @@
 #ifndef TUPPROJECTMANAGER_H
 #define TUPPROJECTMANAGER_H
 
-#include "tupglobal_store.h"
+#include "tglobal.h"
+
+#include <QUndoStack>
+#include <QDir>
+#include <QFileInfo>
+#include <QObject>
+#include <QSize>
 
 class TupProject;
 class TupProjectRequest;
@@ -47,15 +53,12 @@
 class TupCommandExecutor;
 class TupProjectResponse;
 
-#include <QObject>
-#include <QSize>
-
 /**
  * Events handler class for the project
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupProjectManager : public QObject
+class TUPI_EXPORT TupProjectManager : public QObject
 {
     Q_OBJECT
 
@@ -71,7 +74,8 @@
 
         bool isOpen() const;
         bool isModified() const;
-        TupProject *project() const;
+        // TupProject *project() const;
+        TupProject *project();
         void setHandler(TupAbstractProjectHandler *handler, bool isNetworked);
         TupAbstractProjectHandler *handler() const;
 
diff -Nru tupi-0.2+git04/src/store/tupprojectmanagerparams.h tupi-0.2+git05/src/store/tupprojectmanagerparams.h
--- tupi-0.2+git04/src/store/tupprojectmanagerparams.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectmanagerparams.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,6 +36,8 @@
 #ifndef TUPPROJECTMANAGERPARAMS_H
 #define TUPPROJECTMANAGERPARAMS_H
 
+#include "tglobal.h"
+
 #include <QString>
 #include <QSize>
 #include <QColor>
@@ -44,7 +46,7 @@
  * @author David Cuadrado
 */
 
-class TupProjectManagerParams
+class TUPI_EXPORT TupProjectManagerParams
 {
     public:
         TupProjectManagerParams();
diff -Nru tupi-0.2+git04/src/store/tupprojectrequest.cpp tupi-0.2+git05/src/store/tupprojectrequest.cpp
--- tupi-0.2+git04/src/store/tupprojectrequest.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectrequest.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -37,8 +37,6 @@
 #include "tupprojectresponse.h"
 #include "tuprequestbuilder.h"
 
-#include "tdebug.h"
-
 TupProjectRequestArgument::TupProjectRequestArgument()
 {
 }
@@ -116,7 +114,7 @@
 
 bool TupProjectRequest::isValid() const
 {
-     return !k->xml.isEmpty(); // TODO: Verficar que sea XML
+     return !k->xml.isEmpty(); // TODO: Variable must contain a XML string
 }
 
 QString TupProjectRequest::xml() const
diff -Nru tupi-0.2+git04/src/store/tupprojectrequest.h tupi-0.2+git05/src/store/tupprojectrequest.h
--- tupi-0.2+git04/src/store/tupprojectrequest.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectrequest.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef TUPPROJECTREQUEST_H
 #define TUPPROJECTREQUEST_H
 
-#include "tupglobal_store.h"
+#include "tglobal.h"
 
 #include <QObject>
 #include <QString>
@@ -45,7 +45,7 @@
 class TupProjectRequest;
 class TupProjectResponse;
 
-class STORE_EXPORT TupProjectRequestArgument
+class TUPI_EXPORT TupProjectRequestArgument
 {
     public:
         TupProjectRequestArgument();
@@ -68,7 +68,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupProjectRequest
+class TUPI_EXPORT TupProjectRequest
 {
     public:
         enum Action
@@ -133,7 +133,12 @@
 
             // scenes
             GetInfo = 22, 
-            BgColor = 23
+            BgColor = 23,
+
+            // layer
+            AddLipSync = 24,
+            UpdateLipSync = 25,
+            RemoveLipSync = 26
         };
         
         enum Part
diff -Nru tupi-0.2+git04/src/store/tupprojectresponse.cpp tupi-0.2+git05/src/store/tupprojectresponse.cpp
--- tupi-0.2+git04/src/store/tupprojectresponse.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectresponse.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,10 +34,9 @@
  ***************************************************************************/
 
 #include "tupprojectresponse.h"
-#include "tdebug.h"
 
 // This class returns information about data structure of a Tupi project 
-// It is used from signals in the TupProject class to send data to anothers classes
+// It is used from signals in the TupProject class to send data to other classes
 
 class TupProjectResponse::Private
 {
@@ -140,7 +139,12 @@
                 default:
                      {
                         #ifdef K_DEBUG
-                               tError() << "TupProjectResponse::action() : Fatal Error: Unhandled action -> " << k->action;
+                            QString msg = "TupProjectResponse::action() : Fatal Error: Unhandled action -> " + QString::number(k->action);
+                            #ifdef Q_OS_WIN32
+                                qDebug() << msg;
+                            #else
+                                tError() << msg;
+                            #endif
                         #endif
                      }
                 break;
@@ -431,7 +435,14 @@
             break;
             default:
              {
-                tFatal() << "TupProjectResponseFactory::create() - Unknown/Unhandled element: " << part;
+                 #ifdef K_DEBUG
+                     QString msg = "TupProjectResponseFactory::create() - Error: Unknown/Unhandled element: " + QString::number(part);
+                     #ifdef Q_OS_WIN32
+                         qDebug() << msg;
+                     #else
+                         tFatal() << msg;
+                     #endif
+                 #endif
              }
             break;
     }
diff -Nru tupi-0.2+git04/src/store/tupprojectresponse.h tupi-0.2+git05/src/store/tupprojectresponse.h
--- tupi-0.2+git04/src/store/tupprojectresponse.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupprojectresponse.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef TUPPROJECTRESPONSE_H
 #define TUPPROJECTRESPONSE_H
 
-#include "tupglobal_store.h"
+#include "tglobal.h"
 #include "tupprojectrequest.h"
 #include "tupscene.h"
 #include "tuplibraryobject.h"
@@ -46,7 +46,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupProjectResponse
+class TUPI_EXPORT TupProjectResponse
 {
     public:
         enum Mode
@@ -82,7 +82,7 @@
         Private *const k;
 };
 
-class TupSceneResponse : public TupProjectResponse
+class TUPI_EXPORT TupSceneResponse : public TupProjectResponse
 {
     public:
         TupSceneResponse(int part, int action);
@@ -100,7 +100,7 @@
         Scenes m_scenes;
 };
 
-class TupLayerResponse : public TupSceneResponse
+class TUPI_EXPORT TupLayerResponse : public TupSceneResponse
 {
     public:
         TupLayerResponse(int part, int action);
@@ -112,7 +112,7 @@
         int m_layerIndex;
 };
 
-class TupFrameResponse : public TupLayerResponse
+class TUPI_EXPORT TupFrameResponse : public TupLayerResponse
 {
     public:
         TupFrameResponse(int part, int action);
@@ -127,7 +127,7 @@
         bool empty;
 };
 
-class TupItemResponse : public TupFrameResponse
+class TUPI_EXPORT TupItemResponse : public TupFrameResponse
 {
     public:
         TupItemResponse(int part, int action);
@@ -153,7 +153,7 @@
         bool empty;
 };
 
-class TupLibraryResponse : public TupFrameResponse
+class TUPI_EXPORT TupLibraryResponse : public TupFrameResponse
 {
     public:
         TupLibraryResponse(int part, int action);
@@ -174,7 +174,7 @@
         bool empty;
 };
 
-class TupProjectResponseFactory
+class TUPI_EXPORT TupProjectResponseFactory
 {
     private:
         TupProjectResponseFactory();
diff -Nru tupi-0.2+git04/src/store/tuprectitem.cpp tupi-0.2+git05/src/store/tuprectitem.cpp
--- tupi-0.2+git04/src/store/tuprectitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuprectitem.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -37,17 +37,12 @@
 #include "tupgraphicalgorithm.h"
 #include "tupserializer.h"
 
-#include <QGraphicsSceneDragDropEvent>
-#include <QMimeData>
-#include <QBrush>
-#include <QGraphicsScene>
-
-TupRectItem::TupRectItem(QGraphicsItem * parent, QGraphicsScene * scene) : QGraphicsRectItem(parent, scene)
+TupRectItem::TupRectItem(QGraphicsItem *parent) : QGraphicsRectItem(parent)
 {
     setAcceptDrops(true);
 }
 
-TupRectItem::TupRectItem(const QRectF& rect, QGraphicsItem * parent , QGraphicsScene * scene) : QGraphicsRectItem(rect, parent, scene)
+TupRectItem::TupRectItem(const QRectF& rect, QGraphicsItem * parent) : QGraphicsRectItem(rect, parent)
 {
 }
 
@@ -64,10 +59,10 @@
 {
     QDomElement root = doc.createElement("rect");
     
-    root.setAttribute("x", rect().x());
-    root.setAttribute("y", rect().y());
-    root.setAttribute("width", rect().width());
-    root.setAttribute("height", rect().height());
+    root.setAttribute("x", QString::number(rect().x()));
+    root.setAttribute("y", QString::number(rect().y()));
+    root.setAttribute("width", QString::number(rect().width()));
+    root.setAttribute("height", QString::number(rect().height()));
     
     root.appendChild(TupSerializer::properties(this, doc));
     
@@ -102,9 +97,13 @@
 {
     m_dragOver = false;
     if (event->mimeData()->hasColor()) {
-        setBrush(QBrush(qVariantValue<QColor>(event->mimeData()->colorData())));
+        // setBrush(QBrush(qVariantValue<QColor>(event->mimeData()->colorData())));
+        QVariant color = event->mimeData()->colorData();
+        setBrush(QBrush(color.value<QColor>()));
     } else if (event->mimeData()->hasImage()) {
-               setBrush(QBrush(qVariantValue<QPixmap>(event->mimeData()->imageData())));
+               // setBrush(QBrush(qVariantValue<QPixmap>(event->mimeData()->imageData())));
+               QVariant pixmap = event->mimeData()->imageData();
+               setBrush(QBrush(pixmap.value<QPixmap>()));
     }
     update();
 }
diff -Nru tupi-0.2+git04/src/store/tuprectitem.h tupi-0.2+git05/src/store/tuprectitem.h
--- tupi-0.2+git04/src/store/tuprectitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuprectitem.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,20 +36,24 @@
 #ifndef TUPRECTITEM_H
 #define TUPRECTITEM_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
 #include <QGraphicsRectItem>
+#include <QGraphicsSceneDragDropEvent>
+#include <QMimeData>
+#include <QBrush>
+#include <QGraphicsScene>
 
 /**
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupRectItem : public QGraphicsRectItem, public TupAbstractSerializable
+class TUPI_EXPORT TupRectItem : public QGraphicsRectItem, public TupAbstractSerializable
 {
     public:
-        TupRectItem(QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
-        TupRectItem(const QRectF& rect, QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
+        TupRectItem(QGraphicsItem * parent = 0);
+        TupRectItem(const QRectF& rect, QGraphicsItem * parent = 0);
         ~TupRectItem();
         bool contains(const QPointF & point) const;
         
diff -Nru tupi-0.2+git04/src/store/tuprequestbuilder.cpp tupi-0.2+git05/src/store/tuprequestbuilder.cpp
--- tupi-0.2+git04/src/store/tuprequestbuilder.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuprequestbuilder.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,12 +34,9 @@
  ***************************************************************************/
 
 #include "tuprequestbuilder.h"
-#include "tdebug.h"
 #include "tupprojectrequest.h"
 #include "tupprojectresponse.h"
 
-#include <QDomDocument>
-
 TupRequestBuilder::TupRequestBuilder()
 {
 }
@@ -71,8 +68,10 @@
     objectType.setAttribute("id", type);
 
     QDomElement position = doc.createElement("position");
-    position.setAttribute("x", point.x());
-    position.setAttribute("y", point.y());
+    double px = point.x(); 
+    double py = point.y();
+    position.setAttribute("x", QString::number(px));
+    position.setAttribute("y", QString::number(py));
 
     QDomElement space = doc.createElement("spaceMode");
     space.setAttribute("current", spaceMode);
@@ -277,7 +276,12 @@
             default:
                  {
                     #ifdef K_DEBUG
-                           tWarning() << "wOw! Unknown response! O_o";
+                        QString msg = "TupRequestBuilder::fromResponse() - Error: wOw! Unknown response! O_o";
+                        #ifdef Q_OS_WIN32
+                            qWarning() << msg;
+                        #else
+                            tWarning() << msg;
+                        #endif
                     #endif
                  }
     }
diff -Nru tupi-0.2+git04/src/store/tuprequestbuilder.h tupi-0.2+git05/src/store/tuprequestbuilder.h
--- tupi-0.2+git04/src/store/tuprequestbuilder.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuprequestbuilder.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,8 +36,8 @@
 #ifndef TUPREQUESTBUILDER_H
 #define TUPREQUESTBUILDER_H
 
+#include "tglobal.h"
 #include "tuplibraryobject.h"
-#include "tupglobal_store.h"
 #include "tupproject.h"
 
 #include <QString>
@@ -51,7 +51,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupRequestBuilder
+class TUPI_EXPORT TupRequestBuilder
 {
     protected:
         TupRequestBuilder();
@@ -74,8 +74,8 @@
         
         static TupProjectRequest createSceneRequest(int sceneIndex, int action, const QVariant &arg= QString(), const QByteArray &data = QByteArray());
         
-        static TupProjectRequest createLibraryRequest(int actionId, const QVariant &arg, TupLibraryObject::Type type, TupProject::Mode spaceMode,
-                                                     const QByteArray &data, const QString &folder = QString(), int scene = -1, int layer = -1, int frame = -1);
+        static TupProjectRequest createLibraryRequest(int actionId, const QVariant &arg, TupLibraryObject::Type type, TupProject::Mode spaceMode = TupProject::FRAMES_EDITION,
+                                                      const QByteArray &data = QByteArray(), const QString &folder = QString(), int scene = -1, int layer = -1, int frame = -1);
         
         static TupProjectRequest fromResponse(TupProjectResponse *response);
         
diff -Nru tupi-0.2+git04/src/store/tuprequestparser.cpp tupi-0.2+git05/src/store/tuprequestparser.cpp
--- tupi-0.2+git04/src/store/tuprequestparser.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuprequestparser.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,13 +34,9 @@
  ***************************************************************************/
 
 #include "tuprequestparser.h"
-#include "tdebug.h"
 #include "tupprojectresponse.h"
 #include "tuplibraryobject.h"
 
-#include <QXmlSimpleReader>
-#include <QXmlInputSource>
-
 struct TupRequestParser::Private
 {
     QString sign;
diff -Nru tupi-0.2+git04/src/store/tuprequestparser.h tupi-0.2+git05/src/store/tuprequestparser.h
--- tupi-0.2+git04/src/store/tuprequestparser.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuprequestparser.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,9 +36,12 @@
 #ifndef TUPREQUESTPARSER_H
 #define TUPREQUESTPARSER_H
 
+#include "tglobal.h"
 #include "tupxmlparserbase.h"
 #include "tupprojectrequest.h"
-#include "tupglobal_store.h"
+
+#include <QXmlSimpleReader>
+#include <QXmlInputSource>
 
 class TupProjectResponse;
 
@@ -46,7 +49,7 @@
  * @author David Cuadrado
 **/
 
-class STORE_EXPORT TupRequestParser : public TupXmlParserBase
+class TUPI_EXPORT TupRequestParser : public TupXmlParserBase
 {
     public:
         TupRequestParser();
diff -Nru tupi-0.2+git04/src/store/tupscene.cpp tupi-0.2+git05/src/store/tupscene.cpp
--- tupi-0.2+git04/src/store/tupscene.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupscene.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -37,18 +37,10 @@
 #include "tupgraphicobject.h"
 #include "tupsvgitem.h"
 #include "tupsoundlayer.h"
-
 #include "tupitemgroup.h"
 #include "tupprojectloader.h"
 #include "tupitemfactory.h"
 
-#include "tdebug.h"
-
-#include <QDir>
-#include <QGraphicsItem>
-#include <QGraphicsView>
-#include <QStyleOptionGraphicsItem>
-
 struct TupScene::Private
 {
     QSize dimension;
@@ -79,10 +71,6 @@
 
 TupScene::~TupScene()
 {
-    #ifdef K_DEBUG
-           TEND;
-    #endif
-
     delete k;
 }
 
@@ -149,10 +137,16 @@
 {
     // Q_CHECK_PTR(k->layers);
 
-    if (position < 0 || position > k->layers.count()) {
+    if (position < 0 || position > k->layers.count()) {        
         #ifdef K_DEBUG
-               tError() << "TupScene::createLayer() - Invalid index -> " << position;
-        #endif
+            QString msg = "TupScene::createLayer() - Invalid index -> " + QString::number(position);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif    
+        
         return 0;
     }
 
@@ -171,11 +165,22 @@
 TupSoundLayer *TupScene::createSoundLayer(int position, bool loaded)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO << position;
-    #endif
-
-    if (position < 0 || position > k->soundLayers.count()) {
-        tDebug() << "TupScene::createSoundLayer() - [ Fatal Error ] - Index incorrect!";
+        #ifdef Q_OS_WIN32
+            qDebug() << "[createSoundLayer()] - position: " << position;
+        #else
+            T_FUNCINFO << position;
+        #endif
+    #endif    
+    
+    if (position < 0 || position > k->soundLayers.count()) {    
+        #ifdef K_DEBUG
+            QString msg = "TupScene::createSoundLayer() - [ Fatal Error ] - Index incorrect!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
+        #endif        
         return 0;
     }
 
@@ -195,37 +200,18 @@
 bool TupScene::removeLayer(int position)
 {
     #ifdef K_DEBUG
-           T_FUNCINFO << position;
+        #ifdef Q_OS_WIN32
+            qDebug() << "[TupScene::removeLayer()] - position: " << position;
+        #else
+            T_FUNCINFO << position;
+        #endif
     #endif
 
-    // Q_CHECK_PTR(layers);
-
     TupLayer *layer = this->layer(position);
-
     if (layer) {
-
         removeTweensFromLayer(position + 1);
-
-        k->layers.remove(position);
+        k->layers.removeAt(position);
         k->layerCount--;
-
-        /*
-        if (k->nameIndex == position + 1) {
-            k->nameIndex--;
-        } else {
-            if (k->layerCount == 0) {
-                k->nameIndex = 0;
-            }
-        }
-        */
-
-        /*
-         QList<int> indexList = this->layers().indexes();
-         int size = this->layersTotal();
-         for (int i = 0; i < size; i++) 
-              TupLayer *layer = this->layer(indexList.at(i));
-        */
-
         delete layer;
 
         return true;
@@ -243,11 +229,20 @@
 {
     //if (position < 0 || position >= k->layers.count()) {
 
-    if (position < 0) {
+    if (position < 0) {    
         #ifdef K_DEBUG
-               T_FUNCINFO << " FATAL ERROR: LAYERS TOTAL: " << k->layers.count();
-               T_FUNCINFO << " FATAL ERROR: index out of bound -> Position: " << position;
-               T_FUNCINFO << " FATAL ERROR: The layer requested doesn't exist anymore";
+            QString msg1 = " FATAL ERROR: LAYERS TOTAL: " + QString::number(k->layers.count());
+            QString msg2 = " FATAL ERROR: index out of bound -> Position: " + QString::number(position);
+            QString msg3 = " FATAL ERROR: The layer requested doesn't exist anymore";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg1;
+                qDebug() << msg2;
+                qDebug() << msg3;
+            #else
+                tError() << msg1;
+                tError() << msg2;
+                tError() << msg3;
+            #endif
         #endif
         return 0;
     }
@@ -259,7 +254,12 @@
 {
     if (position < 0 || position >= k->soundLayers.count()) {
         #ifdef K_DEBUG
-               T_FUNCINFO << " FATAL ERROR: index out of bound " << position;
+            QString msg = " FATAL ERROR: index out of bound " + QString::number(position);
+            #ifdef Q_OS_WIN32
+               qDebug() << msg;
+            #else
+               T_FUNCINFO << msg;
+            #endif
         #endif
         return 0;
     }
@@ -343,38 +343,61 @@
     root.appendChild(k->storyboard->toXml(doc));
     root.appendChild(k->background->toXml(doc));
 
-    foreach (TupLayer *layer, k->layers.values())
-             root.appendChild(layer->toXml(doc));
+    int total = k->layers.size();
+    for (int i = 0; i < total; ++i) {
+         TupLayer *layer = k->layers.at(i);
+         root.appendChild(layer->toXml(doc));
+    }
 
-    foreach (TupSoundLayer *sound, k->soundLayers.values())
-             root.appendChild(sound->toXml(doc));
+    total = k->soundLayers.size();
+    for (int i = 0; i < total; ++i) {
+         TupSoundLayer *sound  = k->soundLayers.at(i);
+         root.appendChild(sound->toXml(doc));
+    }
 
     return root;
 }
 
 bool TupScene::moveLayer(int from, int to)
 {
-    if (from < 0 || from >= k->layers.count() || to < 0 || to >= k->layers.count())
+    if (from < 0 || from >= k->layers.count() || to < 0 || to >= k->layers.count()) {
+        #ifdef K_DEBUG
+            QString msg = "TupScene::moveLayer() - FATAL ERROR: Layer index out of bound " + QString::number(to);
+            #ifdef Q_OS_WIN32
+                 qDebug() << msg;
+            #else
+                 tError() << msg;
+            #endif
+        #endif
         return false;
+    }
 
-    TupLayer *layer = k->layers[from];
+    TupLayer *sourceLayer = k->layers[from];
+    sourceLayer->updateLayerIndex(to + 1);
+    TupLayer *destinyLayer = k->layers[to];
+    destinyLayer->updateLayerIndex(from + 1); 
+
+    Frames frames = sourceLayer->frames(); 
+    int totalFrames = frames.size();
+    int zLevelIndex = (to + 2)*10000;
+    for (int i = 0; i < totalFrames; i++) {
+         TupFrame *frame = frames.at(i);
+         frame->updateZLevel(zLevelIndex);
+    }
+
+    frames = destinyLayer->frames(); 
+    totalFrames = frames.size();
+    zLevelIndex = (from + 2)*10000;
+    for (int i = 0; i < totalFrames; i++) {
+         TupFrame *frame = frames.at(i);
+         frame->updateZLevel(zLevelIndex);
+    }
 
-    k->layers.insert(to, layer);
-    k->layers.remove(from);
+    k->layers.swap(from, to);
 
     return true;
 }
 
-/*
-int TupScene::logicalIndex() const
-{
-    if (TupProject *project = dynamic_cast<TupProject *>(parent()))
-        return project->logicalIndexOf(const_cast<TupScene *>(this));
-	
-    return -1;
-}
-*/
-
 int TupScene::objectIndex() const
 {
     if (TupProject *project = dynamic_cast<TupProject *>(parent()))
@@ -385,16 +408,9 @@
 
 int TupScene::visualIndexOf(TupLayer *layer) const
 {
-    return k->layers.objectIndex(layer);
+    return k->layers.indexOf(layer);
 }
 
-/*
-int TupScene::logicalIndexOf(TupLayer *layer) const
-{
-    return k->layers.logicalIndex(layer);
-}
-*/
-
 TupProject *TupScene::project() const
 {
     return static_cast<TupProject *>(parent());
@@ -601,8 +617,9 @@
 int TupScene::framesTotal()
 {
     int total = 0;
-    foreach (TupLayer *layer, k->layers.values()) {
-             int frames =layer->framesTotal();
+
+    foreach (TupLayer *layer, k->layers) {
+             int frames = layer->framesTotal();
              if (frames > total)
                  total = frames;
     }
@@ -610,11 +627,6 @@
     return total;
 }
 
-QList<int> TupScene::layerIndexes()
-{
-    return this->layers().indexes();
-}
-
 TupBackground* TupScene::background()
 {
     return k->background;
@@ -639,10 +651,6 @@
 
 void TupScene::setStoryboard(TupStoryboard *storyboard)
 {
-    #ifdef K_DEBUG
-           tFatal() << "TupScene::setStoryboard() - Updating storyboard...";
-    #endif
-
     k->storyboard = storyboard;
 }
 
@@ -676,3 +684,121 @@
     k->storyboard->removeScene(index);
 }
 
+QList<QString> TupScene::getLipSyncNames()
+{
+    QList<QString> names;
+
+    foreach (TupLayer *layer, k->layers) {
+             if (layer->lipSyncCount() > 0) {
+                 Mouths mouths = layer->lipSyncList();
+                 foreach (TupLipSync *lipsync, mouths)
+                          names << lipsync->name();
+             }
+    }
+
+    return names;
+}
+
+
+bool TupScene::lipSyncExists(const QString &name)
+{
+    foreach (TupLayer *layer, k->layers) {
+             if (layer->lipSyncCount() > 0) {
+                 Mouths mouths = layer->lipSyncList();
+                 foreach (TupLipSync *lipsync, mouths) {
+                          if (lipsync->name().compare(name) == 0)
+                              return true;
+                 }
+             }
+    }
+
+    return false;
+}
+
+int TupScene::getLipSyncLayerIndex(const QString &name)
+{
+    int index = 0;
+    foreach (TupLayer *layer, k->layers) {
+             if (layer->lipSyncCount() > 0) {
+                 Mouths mouths = layer->lipSyncList();
+                 foreach (TupLipSync *lipsync, mouths) {
+                          if (lipsync->name().compare(name) == 0)
+                              break;
+                          index++;
+                 }
+             }
+    }
+
+    return index;
+}
+
+TupLipSync * TupScene::getLipSync(const QString &name)
+{
+    TupLipSync *project = 0;
+
+    foreach (TupLayer *layer, k->layers) {
+             if (layer->lipSyncCount() > 0) {
+                 Mouths mouths = layer->lipSyncList();
+                 foreach (TupLipSync *lipsync, mouths) {
+                          if (lipsync->name().compare(name) == 0) {
+                              return lipsync;
+                          }
+                 }
+             }
+    }
+
+    return project;
+}
+
+bool TupScene::updateLipSync(TupLipSync *lipsync)
+{
+    QString name = lipsync->name();
+
+    foreach (TupLayer *layer, k->layers) {
+             if (layer->lipSyncCount() > 0) {
+                 Mouths mouths = layer->lipSyncList();
+                 foreach (TupLipSync *record, mouths) {
+                          if (record->name().compare(name) == 0) {
+                              record = lipsync;
+                              return true;
+                          }
+                 }
+             }
+    }
+
+    return false;
+}
+
+bool TupScene::removeLipSync(const QString &name)
+{
+    foreach (TupLayer *layer, k->layers) {
+             if (layer->removeLipSync(name))
+                 return true;
+    }
+
+    return false;
+}
+
+int TupScene::lipSyncTotal()
+{
+    int total = 0;
+    foreach (TupLayer *layer, k->layers)
+             total += layer->lipSyncCount();
+       
+    return total;
+}
+
+Mouths TupScene::getLipSyncList()
+{
+    Mouths list;
+
+    foreach (TupLayer *layer, k->layers) {
+             if (layer->lipSyncCount() > 0) {
+                 Mouths mouths = layer->lipSyncList();
+                 list.append(mouths);
+             }
+    }
+
+    return list;
+}
+
diff -Nru tupi-0.2+git04/src/store/tupscene.h tupi-0.2+git05/src/store/tupscene.h
--- tupi-0.2+git04/src/store/tupscene.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupscene.h	2014-12-15 14:21:34.000000000 +0000
@@ -33,25 +33,28 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef TUPSCENEMANAGER_H
-#define TUPSCENEMANAGER_H
+#ifndef TUPSCENE_H
+#define TUPSCENE_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
 #include "tupproject.h"
 #include "tupstoryboard.h"
 #include "tupbackground.h"
 #include "tupitemtweener.h"
-#include "tupinthash.h"
-#include "tupglobal_store.h"
+#include "tuplipsync.h"
 
 #include <QDomDocument>
 #include <QDomElement>
 #include <QGraphicsScene>
 #include <QMap>
+#include <QList>
+#include <QPainter>
+#include <QGraphicsItem>
+#include <QStyleOptionGraphicsItem>
+#include <QDir>
+#include <QGraphicsView>
 
-class QGraphicsItem;
-class QPainter;
-class QStyleOptionGraphicsItem;
 class TupLayer;
 class TupSoundLayer;
 class TupGraphicObject;
@@ -59,15 +62,17 @@
 class TupBackground;
 class TupItemTweener;
 
-typedef TupIntHash<TupLayer *> Layers;
-typedef TupIntHash<TupSoundLayer *> SoundLayers;
+typedef QList<TupFrame *> Frames;
+typedef QList<TupLayer *> Layers;
+typedef QList<TupSoundLayer *> SoundLayers;
+typedef QList<TupLipSync *> Mouths;
 
 /**
  * @brief This class represents the scene data structure
  * @author David Cuadrado 
 */
 
-class STORE_EXPORT TupScene : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupScene : public QObject, public TupAbstractSerializable
 {
     Q_OBJECT
 
@@ -148,8 +153,6 @@
         void updateTweenObject(int index, TupGraphicObject *object);
         void updateTweenObject(int index, TupSvgItem *object);
 
-        // int indexOfTweenObject(const QString &name, TupLibraryObject::Type itemType, TupItemTweener::Type tweenType);
-
         void removeTweenObject(TupGraphicObject *object);
         void removeTweenObject(TupSvgItem *object);
 
@@ -168,8 +171,6 @@
 
         int framesTotal();
 
-        QList<int> layerIndexes();
-
         TupBackground *background();
 
         virtual void fromXml(const QString &xml);
@@ -187,6 +188,15 @@
         void resetStoryBoardScene(int index);
         void removeStoryBoardScene(int index);
 
+        QList<QString> getLipSyncNames();
+        bool lipSyncExists(const QString &name);
+        int getLipSyncLayerIndex(const QString &name);
+        TupLipSync * getLipSync(const QString &name);
+        bool updateLipSync(TupLipSync *lipsync);
+        bool removeLipSync(const QString &name);
+        int lipSyncTotal();
+        Mouths getLipSyncList();
+
     private:
         void removeTweensFromLayer(int layer);
 
diff -Nru tupi-0.2+git04/src/store/tupserializer.cpp tupi-0.2+git05/src/store/tupserializer.cpp
--- tupi-0.2+git04/src/store/tupserializer.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupserializer.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,10 +35,6 @@
 
 #include "tupserializer.h"
 #include "tupsvg2qt.h"
-#include "tdebug.h"
-
-#include <QGraphicsItem>
-#include <QFont>
 
 TupSerializer::TupSerializer()
 {
@@ -77,11 +73,11 @@
     TupSvg2Qt::svgmatrix2qtmatrix(atts.value("transform"), matrix);
     QTransform transform(matrix);
     item->setTransform(transform);
-        
+
     QPointF pos;
     TupSvg2Qt::parsePointF(atts.value("pos"), pos);
+
     item->setPos(pos);
-        
     item->setEnabled(atts.value("pos") != "0"); // default true
     item->setFlags(QGraphicsItem::GraphicsItemFlags(atts.value("flags").toInt()));
 }
@@ -89,7 +85,6 @@
 void TupSerializer::loadProperties(QGraphicsItem *item, const QDomElement &e)
 {
     if (e.tagName() == "properties") {
-
         QMatrix matrix;
         TupSvg2Qt::svgmatrix2qtmatrix(e.attribute("transform"), matrix);
         QTransform transform(matrix);
diff -Nru tupi-0.2+git04/src/store/tupserializer.h tupi-0.2+git05/src/store/tupserializer.h
--- tupi-0.2+git04/src/store/tupserializer.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupserializer.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,6 +36,7 @@
 #ifndef TUPSERIALIZER_H
 #define TUPSERIALIZER_H
 
+#include "tglobal.h"
 #include "tuppathitem.h"
 #include "tupsvgitem.h"
 
@@ -44,8 +45,10 @@
 #include <QXmlAttributes>
 #include <QBrush>
 #include <QPen>
+#include <QGraphicsItem>
+#include <QFont>
 
-class QGraphicsItem;
+// class QGraphicsItem;
 
 /**
  * @author David Cuadrado
@@ -54,7 +57,7 @@
  * 
 */
 
-class TupSerializer
+class TUPI_EXPORT TupSerializer
 {
     public:
         TupSerializer();
diff -Nru tupi-0.2+git04/src/store/tupsoundlayer.cpp tupi-0.2+git05/src/store/tupsoundlayer.cpp
--- tupi-0.2+git04/src/store/tupsoundlayer.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupsoundlayer.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -39,16 +39,13 @@
 #include "tupproject.h"
 #include "tuplibraryobject.h"
 
-#include <QFileInfo>
-
 struct TupSoundLayer::Private
 {
     QString filePath, symbolName;
     int playerId;
 };
 
-TupSoundLayer::TupSoundLayer(TupScene *parent)
- : TupLayer(parent), k(new Private)
+TupSoundLayer::TupSoundLayer(TupScene *parent) : TupLayer(parent), k(new Private)
 {
 }
 
diff -Nru tupi-0.2+git04/src/store/tupsoundlayer.h tupi-0.2+git05/src/store/tupsoundlayer.h
--- tupi-0.2+git04/src/store/tupsoundlayer.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupsoundlayer.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,13 +36,16 @@
 #ifndef TUPSOUNDLAYER_H
 #define TUPSOUNDLAYER_H
 
+#include "tglobal.h"
 #include "tuplayer.h"
 
+#include <QFileInfo>
+
 /**
     @author David Cuadrado
 **/
 
-class TupSoundLayer : public TupLayer
+class TUPI_EXPORT TupSoundLayer : public TupLayer
 {
     public:
         TupSoundLayer(TupScene *parent);
diff -Nru tupi-0.2+git04/src/store/tupstoryboard.cpp tupi-0.2+git05/src/store/tupstoryboard.cpp
--- tupi-0.2+git04/src/store/tupstoryboard.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupstoryboard.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tupstoryboard.h"
-#include "tdebug.h"
 
 struct TupStoryboard::Private
 {
@@ -170,7 +169,12 @@
         k->scene.replace(index, title);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupStoryboard::setSceneTitle() - Invalid index: " << index;
+            QString msg = "TupStoryboard::setSceneTitle() - Invalid index -> " + QString::number(index);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -181,7 +185,12 @@
         k->duration.replace(index, duration);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupStoryboard::setSceneDuration() - Invalid index: " << index;
+            QString msg = "TupStoryboard::setSceneDuration() - Invalid index: " + QString::number(index);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 }
@@ -192,7 +201,12 @@
         k->description.replace(index, description);
     } else {
         #ifdef K_DEBUG
-               tError() << "TupStoryboard::setSceneDuration() - Invalid index: " << index;
+            QString msg = "TupStoryboard::setSceneDuration() - Invalid index: " + QString::number(index);
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif 
         #endif
     }
 }
diff -Nru tupi-0.2+git04/src/store/tupstoryboard.h tupi-0.2+git05/src/store/tupstoryboard.h
--- tupi-0.2+git04/src/store/tupstoryboard.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupstoryboard.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,14 +36,14 @@
 #ifndef TUPSTORYBOARD_H
 #define TUPSTORYBOARD_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
 #include <QObject>
 #include <QDomDocument>
 #include <QDomElement>
 
-class STORE_EXPORT TupStoryboard : public QObject, public TupAbstractSerializable
+class TUPI_EXPORT TupStoryboard : public QObject, public TupAbstractSerializable
 {
     Q_OBJECT
 
diff -Nru tupi-0.2+git04/src/store/tupsvgitem.cpp tupi-0.2+git05/src/store/tupsvgitem.cpp
--- tupi-0.2+git04/src/store/tupsvgitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupsvgitem.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -35,10 +35,6 @@
 
 #include "tupsvgitem.h"
 #include "tupserializer.h"
-#include "tdebug.h"
-
-#include <QSvgRenderer>
-#include <QFileInfo>
 
 struct TupSvgItem::Private
 {
@@ -109,7 +105,12 @@
 {
     if (k->name.length() == 0) {
         #ifdef K_DEBUG
-               tError() << "TupFrame::fromXml() - ERROR: Object id is null!";
+            QString msg = "TupFrame::fromXml() - Error: Object ID is null!";
+            #ifdef Q_OS_WIN32
+                qDebug() << msg;
+            #else
+                tError() << msg;
+            #endif
         #endif
     }
 
diff -Nru tupi-0.2+git04/src/store/tupsvgitem.h tupi-0.2+git05/src/store/tupsvgitem.h
--- tupi-0.2+git04/src/store/tupsvgitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tupsvgitem.h	2014-12-15 14:21:34.000000000 +0000
@@ -37,12 +37,14 @@
 #define TUPSVGITEM_H
 
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
+#include "tglobal.h"
 #include "tupitemtweener.h"
 #include "tupframe.h"
 
 #include <QGraphicsSvgItem>
 #include <QGraphicsSceneHoverEvent>
+#include <QSvgRenderer>
+#include <QFileInfo>
 
 class TupFrame;
 
@@ -50,7 +52,7 @@
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupSvgItem : public QGraphicsSvgItem, public TupAbstractSerializable
+class TUPI_EXPORT TupSvgItem : public QGraphicsSvgItem, public TupAbstractSerializable
 {
     public:
         TupSvgItem(QGraphicsItem * parent = 0);
diff -Nru tupi-0.2+git04/src/store/tuptextitem.cpp tupi-0.2+git05/src/store/tuptextitem.cpp
--- tupi-0.2+git04/src/store/tuptextitem.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuptextitem.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -40,8 +40,7 @@
 #include <QFocusEvent>
 #include <QTimer>
 
-TupTextItem::TupTextItem(QGraphicsItem * parent, QGraphicsScene * scene)
-    : QGraphicsTextItem(parent, scene), m_flags(flags()), m_isEditable(false)
+TupTextItem::TupTextItem(QGraphicsItem *parent) : QGraphicsTextItem(parent), m_flags(flags()), m_isEditable(false)
 {
     setOpenExternalLinks(true);
     setEditable(false);
diff -Nru tupi-0.2+git04/src/store/tuptextitem.h tupi-0.2+git05/src/store/tuptextitem.h
--- tupi-0.2+git04/src/store/tuptextitem.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuptextitem.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,22 +36,24 @@
 #ifndef TUPTEXTITEM_H
 #define TUPTEXTITEM_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
 #include <QGraphicsTextItem>
-
+#include <QFont>
+#include <QFocusEvent>
+#include <QTimer>
 
 /**
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupTextItem : public QGraphicsTextItem, public TupAbstractSerializable
+class TUPI_EXPORT TupTextItem : public QGraphicsTextItem, public TupAbstractSerializable
 {
     Q_OBJECT
 
     public:
-        TupTextItem(QGraphicsItem * parent = 0, QGraphicsScene * scene = 0);
+        TupTextItem(QGraphicsItem *parent = 0);
         ~TupTextItem();
         
         virtual void fromXml(const QString &xml);
diff -Nru tupi-0.2+git04/src/store/tuptweenerstep.cpp tupi-0.2+git05/src/store/tuptweenerstep.cpp
--- tupi-0.2+git04/src/store/tuptweenerstep.cpp	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuptweenerstep.cpp	2014-12-15 14:21:34.000000000 +0000
@@ -34,7 +34,6 @@
  ***************************************************************************/
 
 #include "tuptweenerstep.h"
-#include "tdebug.h"
 
 #include <QVector>
 
@@ -87,8 +86,6 @@
 
 void TupTweenerStep::setShear(double sh, double sv)
 {
-    tFatal() << "TupTweenerStep::setShear() - X: " << sh;
-    tFatal() << "TupTweenerStep::setShear() - Y: " << sv;
     k->shear.x = sh;
     k->shear.y = sv;
     k->flags |= Shear;
@@ -163,38 +160,38 @@
     
     if (this->has(TupTweenerStep::Position)) {
         QDomElement e = doc.createElement("position");
-        e.setAttribute("x", k->position.x());
-        e.setAttribute("y", k->position.y());
-        
+        e.setAttribute("x", QString::number(k->position.x()));
+        e.setAttribute("y", QString::number(k->position.y()));
+
         step.appendChild(e);
     }
 
     if (this->has(TupTweenerStep::Rotation)) {
         QDomElement e = doc.createElement("rotation");
-        e.setAttribute("angle", k->rotation);
+        e.setAttribute("angle", QString::number(k->rotation));
     
         step.appendChild(e);
     }
     
     if (this->has(TupTweenerStep::Scale)) {
         QDomElement e = doc.createElement("scale");
-        e.setAttribute("sx", k->scale.x);
-        e.setAttribute("sy", k->scale.y);
+        e.setAttribute("sx", QString::number(k->scale.x));
+        e.setAttribute("sy", QString::number(k->scale.y));
         
         step.appendChild(e);
     }
     
     if (this->has(TupTweenerStep::Shear)) {
         QDomElement e = doc.createElement("shear");
-        e.setAttribute("sh", k->shear.x);
-        e.setAttribute("sv", k->shear.y);
+        e.setAttribute("sh", QString::number(k->shear.x));
+        e.setAttribute("sv", QString::number(k->shear.y));
         
         step.appendChild(e);
     }
     
     if (this->has(TupTweenerStep::Opacity)) {
         QDomElement e = doc.createElement("opacity");
-        e.setAttribute("opacity", k->opacity);
+        e.setAttribute("opacity", QString::number(k->opacity));
 
         step.appendChild(e);
     }
diff -Nru tupi-0.2+git04/src/store/tuptweenerstep.h tupi-0.2+git05/src/store/tuptweenerstep.h
--- tupi-0.2+git04/src/store/tuptweenerstep.h	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/store/tuptweenerstep.h	2014-12-15 14:21:34.000000000 +0000
@@ -36,17 +36,18 @@
 #ifndef TUPTWEENERSTEP_H
 #define TUPTWEENERSTEP_H
 
+#include "tglobal.h"
 #include "tupabstractserializable.h"
-#include "tupglobal_store.h"
 
 #include <QPointF>
 #include <QColor>
+#include <QVector>
 
 /**
  * @author David Cuadrado
 */
 
-class STORE_EXPORT TupTweenerStep : public TupAbstractSerializable
+class TUPI_EXPORT TupTweenerStep : public TupAbstractSerializable
 {
     public:
         enum Type {
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/cursors/shift.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/cursors/shift.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/about.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/about.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/edit_sign.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/edit_sign.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/hide_layer.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/hide_layer.png differ
diff -Nru tupi-0.2+git04/src/themes/default/icons/icons.svg tupi-0.2+git05/src/themes/default/icons/icons.svg
--- tupi-0.2+git04/src/themes/default/icons/icons.svg	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/themes/default/icons/icons.svg	2014-12-15 14:21:34.000000000 +0000
@@ -10,11 +10,11 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
+   width="744.09448"
+   height="1250"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="icons.svg">
   <defs
      id="defs4">
@@ -372,33 +372,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3948"
-       id="linearGradient3956"
-       x1="6.578125"
-       y1="5.3660874"
-       x2="6.703125"
-       y2="2.3660872"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3958"
-       id="linearGradient3966"
-       x1="0.34375"
-       y1="4.9403062"
-       x2="3.3339467"
-       y2="2.8307009"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3978"
-       id="linearGradient3984"
-       x1="7.3787913"
-       y1="3.5235627"
-       x2="12.723461"
-       y2="2.712173"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3978-5"
        id="linearGradient3984-0"
        x1="7.3125"
@@ -419,35 +392,6 @@
          id="stop3982-9" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(4.1170488,-0.09420267)"
-       y2="2.7563672"
-       x2="12.568782"
-       y1="3.4793684"
-       x1="7.3125"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4001"
-       xlink:href="#linearGradient3978-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4083"
-       id="linearGradient4099"
-       x1="28.909113"
-       y1="4.1362715"
-       x2="29.229607"
-       y2="2.0658634"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(31.625,-0.49999901)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3948-4"
-       id="linearGradient3956-8"
-       x1="6.6989856"
-       y1="5.1447682"
-       x2="6.7937341"
-       y2="3.0595994"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        id="linearGradient3948-4">
       <stop
@@ -461,16 +405,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3911-4"
-       id="linearGradient3923-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.70710678,0.66291261)"
-       x1="0.53699273"
-       y1="7.3049078"
-       x2="2.4555922"
-       y2="5.9325323" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient3911-4">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -483,26 +417,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3911"
-       id="linearGradient4005"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.70710678,0.66291261)"
-       x1="0.53699273"
-       y1="7.3049078"
-       x2="2.4555922"
-       y2="5.9325323" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4015"
-       id="linearGradient4021"
-       x1="8.390625"
-       y1="5.8231173"
-       x2="9.1015625"
-       y2="6.3387423"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9830445,0.18336712,-0.18336712,0.9830445,1.2727239,-1.5225429)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3931"
        id="linearGradient3972"
        gradientUnits="userSpaceOnUse"
@@ -552,16 +466,6 @@
          id="stop4166-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3931"
-       id="linearGradient4231"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.86178636,-0.15467965)"
-       x1="43.765621"
-       y1="9.7606211"
-       x2="51.421875"
-       y2="7.3231211" />
-    <linearGradient
        id="linearGradient3931-7">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -574,64 +478,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3931-7"
-       id="linearGradient4301"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(7.83342,-0.4386819)"
-       x1="43.765621"
-       y1="9.7606211"
-       x2="51.421875"
-       y2="7.3231211" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4331"
-       id="linearGradient4339"
-       x1="52.886604"
-       y1="8.0125113"
-       x2="54.552906"
-       y2="7.2422595"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3931-6"
-       id="linearGradient4383"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56571433,0,0,0.56571433,28.100609,-1.4013594)"
-       x1="43.765621"
-       y1="9.7606211"
-       x2="51.421875"
-       y2="7.3231211" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4162"
-       id="linearGradient4385"
-       gradientUnits="userSpaceOnUse"
-       x1="55.056931"
-       y1="3.7537532"
-       x2="55.039021"
-       y2="2.2161841" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4578"
-       id="linearGradient4584"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4578-0"
-       id="linearGradient4584-5"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578-0">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -644,16 +490,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4578-0-2"
-       id="linearGradient4584-5-8"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578-0-2">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -666,16 +502,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4578-0-6"
-       id="linearGradient4584-5-9"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578-0-6">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -688,16 +514,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4578-0-2-6"
-       id="linearGradient4584-5-8-7"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578-0-2-6">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -710,15 +526,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4673"
-       id="linearGradient4679"
-       x1="42.511883"
-       y1="13.484196"
-       x2="43.292526"
-       y2="9.7276917"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4673-5"
        id="linearGradient4679-2"
        x1="42.511883"
@@ -740,89 +547,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4056"
-       id="linearGradient4062"
-       x1="54.391983"
-       y1="12.937309"
-       x2="52.668407"
-       y2="11.324223"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4098"
-       id="linearGradient4114"
-       gradientUnits="userSpaceOnUse"
-       x1="60.0625"
-       y1="4.2918692"
-       x2="60.09375"
-       y2="3.1981189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4116"
-       id="linearGradient4122"
-       x1="59.837715"
-       y1="2.4707377"
-       x2="59.850388"
-       y2="1.7519876"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4075"
-       id="linearGradient4217"
-       gradientUnits="userSpaceOnUse"
-       x1="56.046875"
-       y1="12.502804"
-       x2="59"
-       y2="11.971554" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4233"
-       id="linearGradient4239"
-       x1="1.359458"
-       y1="8.3263044"
-       x2="0.9100455"
-       y2="15.422908"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4314"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       x1="14.695312"
-       y1="16.018433"
-       x2="14.523438"
-       y2="13.877807" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4384"
-       id="linearGradient4390"
-       x1="23.179846"
-       y1="17.202051"
-       x2="24.096874"
-       y2="17.345682"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4365"
-       id="linearGradient4395"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.81823653,0,0,0.81823653,4.9786883,1.9258249)"
-       x1="23.296875"
-       y1="17.440308"
-       x2="23.328125"
-       y2="15.049684" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4503"
-       id="linearGradient4509"
-       x1="35.293278"
-       y1="13.28831"
-       x2="34.87722"
-       y2="15.307266"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.9168155,-0.53033008)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4503-0"
        id="linearGradient4509-9"
        x1="34.71875"
@@ -843,34 +567,6 @@
          id="stop4507-9" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(1,0,0,-1,-2.9793156,31.662788)"
-       y2="15.362185"
-       x2="34.53125"
-       y1="13.580935"
-       x1="35.40625"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4526"
-       xlink:href="#linearGradient4503-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4548"
-       id="linearGradient4554"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4585"
-       id="linearGradient4591"
-       x1="50.8097"
-       y1="17.649515"
-       x2="52.988815"
-       y2="16.86507"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4548-2"
        id="linearGradient4554-3"
@@ -891,16 +587,6 @@
          id="stop4552-9" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0.25349891,-0.51554303,0.51554303,0.25349891,41.255059,28.788822)"
-       y2="16.28406"
-       x2="40.211685"
-       y1="20.75281"
-       x1="40.328125"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4609"
-       xlink:href="#linearGradient4548-2"
-       inkscape:collect="always" />
-    <linearGradient
        gradientTransform="matrix(0.25349891,-0.51554303,0.51554303,0.25349891,42.757661,33.385016)"
        y2="16.28406"
        x2="40.211685"
@@ -1006,35 +692,15 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4548-7-8"
-       id="linearGradient7059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75453713,0,0,0.75453713,6.8191319,24.23532)"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4655"
        id="linearGradient4661"
        x1="12.100001"
        y1="44.651245"
-       x2="18.384376"
+       x2="18.384377"
        y2="44.651245"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4413"
-       id="linearGradient4419"
-       x1="34.46875"
-       y1="38.534058"
-       x2="34.40625"
-       y2="35.752808"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(8.125,-0.09375)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4673-4"
        id="linearGradient4679-1"
        x1="42.511883"
@@ -1055,16 +721,6 @@
          id="stop4677-6" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0.34955876,0,0,0.34955876,32.987703,39.017143)"
-       y2="9.7276917"
-       x2="43.292526"
-       y1="13.484196"
-       x1="42.511883"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5053"
-       xlink:href="#linearGradient4673-4"
-       inkscape:collect="always" />
-    <linearGradient
        gradientTransform="matrix(0.25349891,-0.51554303,0.51554303,0.25349891,41.255059,28.788822)"
        y2="16.28406"
        x2="40.211685"
@@ -1199,26 +855,6 @@
          id="stop4552-9-43-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4548-2-9-1"
-       id="linearGradient5528"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.10458174,-0.21268884,0.21268884,0.10458174,13.22749,55.272013)"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4548-2-9-1-6"
-       id="linearGradient5528-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.10458174,-0.21268884,0.21268884,0.10458174,13.22749,55.272013)"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406" />
-    <linearGradient
        id="linearGradient4548-2-9-1-6">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -1230,16 +866,6 @@
          id="stop4552-9-43-2-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4548-2-9-1-6-1"
-       id="linearGradient5528-7-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.10458174,-0.21268884,0.21268884,0.10458174,13.22749,55.272013)"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406" />
-    <linearGradient
        id="linearGradient4548-2-9-1-6-1">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -1263,16 +889,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4548-2-9-1-6-1-5"
-       id="linearGradient4576"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21965865,-0.11922978,0.11922978,0.21965865,15.939885,49.104442)"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4548-2-9-1-6-1-5-4"
        id="linearGradient4576-9"
        gradientUnits="userSpaceOnUse"
@@ -1293,16 +909,6 @@
          id="stop4552-9-43-2-8-9-7-9" />
     </linearGradient>
     <linearGradient
-       y2="16.28406"
-       x2="40.211685"
-       y1="20.75281"
-       x1="40.328125"
-       gradientTransform="matrix(0.21965865,-0.11922978,0.11922978,0.21965865,15.474466,50.196852)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4593"
-       xlink:href="#linearGradient4548-2-9-1-6-1-5-4"
-       inkscape:collect="always" />
-    <linearGradient
        id="linearGradient4548-2-9-1-6-1-9">
       <stop
          style="stop-color:#e78700;stop-opacity:1;"
@@ -1337,16 +943,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4548-2-9-1-6-1-9-2"
-       id="linearGradient4729"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.10458174,-0.21268884,0.21268884,0.10458174,13.22749,55.272013)"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4548-2-9-1-6-1-9"
        id="linearGradient4741"
        gradientUnits="userSpaceOnUse"
@@ -1357,26 +953,6 @@
        y2="16.28406" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4548-2-9-1-6-1-9-2-3"
-       id="linearGradient4747"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21965865,-0.11922978,0.11922978,0.21965865,20.279154,49.985914)"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4548-2-9-1-6-1-9"
-       id="linearGradient4851"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21965865,-0.11922978,0.11922978,0.21965865,19.646342,48.954664)"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4503-4"
        id="linearGradient4509-8"
        x1="35.293278"
@@ -1407,27 +983,6 @@
        id="linearGradient16152"
        xlink:href="#linearGradient4503-4"
        inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16173"
-       id="radialGradient16179"
-       cx="42.570312"
-       cy="47.877808"
-       fx="42.570312"
-       fy="47.877808"
-       r="0.8890625"
-       gradientTransform="matrix(1,0,0,0.99121265,0,0.42071887)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(6.411945,35.921166)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient4038-4"
-       id="linearGradient4044-6"
-       x1="46.216057"
-       y1="13.136182"
-       x2="48.679882"
-       y2="11.622531"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient4038-4">
@@ -1559,16 +1114,6 @@
          id="stop4552-6-2-3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4548-7-8-4"
-       id="linearGradient4963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.43547914,0,0,0.43547914,23.23795,24.787389)"
-       x1="40.328125"
-       y1="20.75281"
-       x2="40.211685"
-       y2="16.28406" />
-    <linearGradient
        id="linearGradient4548-7-8-2">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -1710,16 +1255,6 @@
        x1="40.328125"
        gradientTransform="matrix(0.5820889,0,0,0.5820889,36.866642,51.830167)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4828"
-       xlink:href="#linearGradient4548-7-8-4-4-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="16.28406"
-       x2="40.211685"
-       y1="20.75281"
-       x1="40.328125"
-       gradientTransform="matrix(0.5820889,0,0,0.5820889,36.866642,51.830167)"
-       gradientUnits="userSpaceOnUse"
        id="linearGradient4828-7"
        xlink:href="#linearGradient4548-7-8-4-4-2-6"
        inkscape:collect="always" />
@@ -1817,16 +1352,6 @@
          id="stop4552-6-2-3-8" />
     </linearGradient>
     <linearGradient
-       y2="16.28406"
-       x2="40.211685"
-       y1="20.75281"
-       x1="40.328125"
-       gradientTransform="matrix(0.43547914,0,0,0.43547914,32.065781,24.915391)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3994"
-       xlink:href="#linearGradient4548-7-8-4-3"
-       inkscape:collect="always" />
-    <linearGradient
        id="linearGradient4233-6">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -1838,15 +1363,6 @@
          id="stop4237-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4233-6-0"
-       id="linearGradient4239-8-6"
-       x1="1.359458"
-       y1="8.3263044"
-       x2="0.9100455"
-       y2="15.422908"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        id="linearGradient4233-6-0">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -1859,15 +1375,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4233-6"
-       id="linearGradient4059"
-       gradientUnits="userSpaceOnUse"
-       x1="1.359458"
-       y1="8.3263044"
-       x2="0.9100455"
-       y2="15.422908" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4233-6-4"
        id="linearGradient4059-2"
        gradientUnits="userSpaceOnUse"
@@ -1897,16 +1404,6 @@
        y2="15.422908" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4578-0-6-1"
-       id="linearGradient4584-5-9-9"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578-0-6-1">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -1919,16 +1416,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4578-0-2-6-3"
-       id="linearGradient4584-5-8-7-9"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578-0-2-6-3">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -1941,16 +1428,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4578-0-5"
-       id="linearGradient4584-5-0"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578-0-5">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -1963,16 +1440,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4578-0-2-0"
-       id="linearGradient4584-5-8-0"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578-0-2-0">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -1985,16 +1452,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4578-6"
-       id="linearGradient4584-2"
-       x1="9.3125"
-       y1="11.76062"
-       x2="10.96875"
-       y2="10.401245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4578-6">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -2049,16 +1506,6 @@
        y2="10.401245" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4038"
-       id="linearGradient6208"
-       gradientUnits="userSpaceOnUse"
-       x1="46.216057"
-       y1="13.136182"
-       x2="48.679882"
-       y2="11.622531"
-       gradientTransform="translate(2.015625,0.21875)" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4056-6"
        id="linearGradient4062-8"
        x1="54.391983"
@@ -2080,16 +1527,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4056-6"
-       id="linearGradient6271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(12.526812,-5.1476724)"
-       x1="54.391983"
-       y1="12.937309"
-       x2="52.949657"
-       y2="11.746098" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6283"
        id="linearGradient6291"
        x1="27.9375"
@@ -2098,15 +1535,6 @@
        y2="21.626371"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6283"
-       id="linearGradient6319"
-       gradientUnits="userSpaceOnUse"
-       x1="28.360025"
-       y1="21.470121"
-       x2="26.629051"
-       y2="21.412983" />
-    <linearGradient
        y2="16.28406"
        x2="40.211685"
        y1="20.75281"
@@ -2128,16 +1556,6 @@
          id="stop4552-6-2-3-8-4" />
     </linearGradient>
     <linearGradient
-       y2="16.28406"
-       x2="40.211685"
-       y1="20.75281"
-       x1="40.328125"
-       gradientTransform="matrix(0.85878973,0,0,0.85878973,31.422497,13.696539)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4132"
-       xlink:href="#linearGradient4548-7-8-4-3-5"
-       inkscape:collect="always" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3911-3"
        id="linearGradient4005-5"
@@ -2269,16 +1687,6 @@
        x2="3.3339467"
        y2="2.8307009" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3931-6-7"
-       id="linearGradient4383-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56571433,0,0,0.56571433,28.100609,-1.4013594)"
-       x1="43.765621"
-       y1="9.7606211"
-       x2="51.421875"
-       y2="7.3231211" />
-    <linearGradient
        id="linearGradient3931-6-7">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -2290,15 +1698,6 @@
          id="stop3935-5-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4162-2"
-       id="linearGradient4385-5"
-       gradientUnits="userSpaceOnUse"
-       x1="55.056931"
-       y1="3.7537532"
-       x2="55.039021"
-       y2="2.2161841" />
-    <linearGradient
        id="linearGradient4162-2">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -2311,15 +1710,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4331-0"
-       id="linearGradient4339-2"
-       x1="52.886604"
-       y1="8.0125113"
-       x2="54.552906"
-       y2="7.2422595"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient4331-0">
       <stop
          style="stop-color:#008700;stop-opacity:1;"
@@ -2351,7934 +1741,9948 @@
          offset="1"
          id="stop3935-7-9" />
     </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="64"
-     inkscape:cx="73.180098"
-     inkscape:cy="1014.2489"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="737"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:none;fill-opacity:1;stroke:none"
-       id="rect4289"
-       width="3.7565045"
-       height="3.7565045"
-       x="-15.070213"
-       y="42.43692"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/metadata.png"
-       inkscape:export-xdpi="1437.51"
-       inkscape:export-ydpi="1437.51" />
-    <path
-       style="fill:#2fa725;fill-opacity:0.76987448;fill-rule:evenodd;stroke:none"
-       d="m 74.723816,20.480034 -0.01417,2.892585 -2.81616,-0.03421 0.06728,-2.737829 z"
-       id="rect4290-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_scene_big.png"
-       inkscape:export-xdpi="1174.63"
-       inkscape:export-ydpi="1174.63" />
-    <path
-       style="fill:#2fa725;fill-opacity:0.76987448;fill-rule:evenodd;stroke:none"
-       d="m 79.203458,20.572543 0.981188,-0.04162 0.04636,1.078548 -1.047402,-0.01204 z"
-       id="rect4290-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_frame_big.png"
-       inkscape:export-xdpi="1174.63"
-       inkscape:export-ydpi="1174.63" />
-    <path
-       style="fill:#2fa725;fill-opacity:0.76987448;fill-rule:evenodd;stroke:none"
-       d="m 78.288305,20.61818 0.09631,0.981187 -2.805111,0.05418 0.01204,-1.047402 z"
-       id="rect4290"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_layer_big.png"
-       inkscape:export-xdpi="1174.63"
-       inkscape:export-ydpi="1174.63" />
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect4017"
-       width="2.53125"
-       height="2.84375"
-       x="44.625"
-       y="30.737215"
-       ry="0.018034328"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
-       inkscape:export-xdpi="947"
-       inkscape:export-ydpi="947" />
-    <g
-       id="g4814"
-       transform="matrix(0.34363739,0,0,0.34363739,2.2730521,39.865593)">
-      <g
-         id="g4664">
-        <rect
-           style="fill:#edeceb;fill-opacity:1;stroke:none"
-           id="rect4641"
-           width="140.18391"
-           height="12.551146"
-           x="4.0658641"
-           y="52.336418"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style01.png"
-           inkscape:export-xdpi="93.218567"
-           inkscape:export-ydpi="93.218567" />
-        <path
-           style="fill:none;stroke:#008700;stroke-width:4.95940208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 4.2456671,58.700379 139.9705929,0"
-           id="path4639"
-           inkscape:connector-curvature="0"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style01.png"
-           inkscape:export-xdpi="93.218567"
-           inkscape:export-ydpi="93.218567" />
-      </g>
-    </g>
-    <g
-       id="g4565"
-       transform="matrix(0.39530177,0,0,0.39530177,37.168568,17.078187)">
-      <rect
-         inkscape:export-ydpi="224.71411"
-         inkscape:export-xdpi="224.71411"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/border03.png"
-         y="49.37907"
-         x="22.655628"
-         height="6.408155"
-         width="12.002192"
-         id="rect4563"
-         style="fill:#edeceb;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="224.71411"
-         inkscape:export-xdpi="224.71411"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/border03.png"
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path4480"
-         d="m 26.190366,52.562035 5.593507,0 -0.17385,0"
-         style="fill:none;stroke:#008700;stroke-width:4.0518117px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <path
-       style="fill:url(#linearGradient4591);fill-opacity:1;stroke:none"
-       d="m 53.110349,17.743429 0.348029,0.100818 0.06629,0.371507 -1.486029,0.196111 -0.01657,-0.557951 0.309358,-0.03867 0.08286,-2.093699 c 0,0 -1.248485,0.386699 -1.182194,0.209922 0.06629,-0.176776 0.287262,-1.027514 0.287262,-1.027514 l 2.740039,-0.01105 0.309359,0.83969 -0.06629,0.209922 -1.458408,-0.320408 z"
-       id="path4582"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccscccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/text.png"
-       inkscape:export-xdpi="583.30957"
-       inkscape:export-ydpi="583.30957" />
-    <path
-       style="fill:url(#linearGradient4526);fill-opacity:1;stroke:none"
-       d="m 29.833185,17.144354 2.96875,-0.125 -0.125,-3.03125 -3.125,-0.03125 z"
-       id="path4501-7"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
-       inkscape:export-xdpi="913.15002"
-       inkscape:export-ydpi="913.15002" />
-    <g
-       id="g4401-5"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
-       inkscape:export-xdpi="1008"
-       inkscape:export-ydpi="1008"
-       transform="matrix(-0.86458333,0,0,1,8.1259766,0.1718743)">
-      <path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4387-9"
-         d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4389-7"
-         d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
-         style="fill:#008700;fill-opacity:0.3942308;stroke:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4399-2"
-         d="M 1.2805659,9.2180855 3.825795,10.520916"
-         style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
-    </g>
-    <path
-       style="fill:url(#linearGradient4001);fill-opacity:1;stroke:none"
-       d="m 16.195174,0.67422824 -1.8125,0.078125 0.01563,3.49999996 2.90625,-0.015625 -0.1875,-3.1406249 -0.75,0.03125 z"
-       id="path3968-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
-       inkscape:export-xdpi="585"
-       inkscape:export-ydpi="585" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="M 3.25,1.1746843 C 3.4192709,1.2163513 3.265273,1.4060148 3.129854,1.3890878 L 1.140395,1.4505731 1.107477,4.1859634 3.2286861,4.1819392 3.369475,1.4191576 C 3.3955178,1.2576996 3.557445,1.397692 3.5991117,1.533109 L 3.501896,4.4189949 c 0,0 -2.64405202,0.036975 -2.62745122,0.040843 L 0.82165291,1.1746818 z"
-       id="path3121"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-       inkscape:export-xdpi="597.56848"
-       inkscape:export-ydpi="597.56848" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="M 3.503478,1.2795124 C 3.6203594,1.1203798 3.6958591,0.96814409 3.8541221,0.80211457 3.8536867,0.81162719 4.111911,1.0360966 4.111911,1.0360966 3.8677184,1.1655137 3.706289,1.1983738 3.503478,1.2795124 z"
-       id="path3759-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-       inkscape:export-xdpi="597.56848"
-       inkscape:export-ydpi="597.56848" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="M 3.4366635,1.2568923 C 3.3801383,1.0694731 3.323613,0.88205414 3.2670878,0.69463503 3.1530408,0.6999845 2.9899647,0.78226972 2.9486925,0.827919 c 0.220664,0.16354825 0.325314,0.2859821 0.487971,0.4289733 z"
-       id="path3759-9-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:transform-center-x="0.91815024"
-       inkscape:transform-center-y="1.9509752"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-       inkscape:export-xdpi="597.56848"
-       inkscape:export-ydpi="597.56848" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="M 3.6014999,1.3580433 C 3.7667911,1.4450387 4.0169027,1.5385587 4.0973735,1.6190294 4.0977742,1.6270982 3.9146832,1.8930649 3.9146832,1.8930649 3.823338,1.7734462 3.7058943,1.5363839 3.6014999,1.3580433 z"
-       id="path3759-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-       inkscape:export-xdpi="597.56848"
-       inkscape:export-ydpi="597.56848" />
-    <path
-       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.59615386"
-       d="m 16.793786,2.2423194 c -0.06629,-0.011049 -2.010835,0.044194 -2.010835,0.044194 l 0.03315,1.6351845 2.021883,-0.1546796 z"
-       id="path4020"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
-       inkscape:export-xdpi="585"
-       inkscape:export-ydpi="585" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 15.159468,2.6957443 c -0.04634,0.259188 0.01835,0.727373 0.108528,0.871863 0.224813,0.02145 0.511605,-0.0027 0.753313,0.01829 -0.02658,-0.08267 -0.08446,-0.152809 -0.167402,-0.235477 -0.121049,0.0089 -0.154416,0.0052 -0.275466,0.01405 -0.02067,-0.01476 -0.04133,-0.02952 -0.062,-0.04429 0.227468,-0.270504 0.454175,-0.445413 0.8596,-0.518594 -0.04272,-0.111921 -0.113093,-0.278689 -0.24161,-0.332147 -0.41388,0.208145 -0.617099,0.455519 -0.755277,0.713453 -0.04133,-0.01181 -0.0058,-0.0067 -0.0471,-0.01847 0.01329,-0.134335 0.02379,-0.274303 0.09465,-0.359923 -0.03691,-0.03838 -0.221475,-0.145656 -0.267238,-0.10875 z"
-       id="path3835"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
-       inkscape:export-xdpi="585.36584"
-       inkscape:export-ydpi="585.36584" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 19.432077,1.0884738 c -0.244695,0.1481461 -0.619723,0.3335304 -0.789941,0.5002956 0.33353,0.2984221 0.667061,0.596844 1.000591,0.8952661 l -1.088979,0.7337721 c 0.192291,0.2720907 0.587141,0.6966119 0.947003,0.838369 0,0 0.577215,-1.0856711 0.58961,-1.0981767 0.131656,0.3598618 0.263313,0.7197236 0.39497,1.0795854 C 20.782688,3.8540724 21.247618,3.372654 21.43326,2.9843312 20.99591,2.7567499 20.669044,2.5512657 20.231694,2.3236845 20.198667,2.3172157 20.894843,1.8246111 21.28166,1.586123 21.224975,1.4193577 20.982097,1.1408781 20.664745,0.9182556 20.416544,1.1687154 20.168343,1.4191751 19.920142,1.6696349 19.757454,1.4759145 19.594766,1.2821942 19.432077,1.0884738 z"
-       id="path3837"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_big.png"
-       inkscape:export-xdpi="1250.21"
-       inkscape:export-ydpi="1250.21" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 4.7734373,1.1256119 c 0.03125,1.09375 0.0625,2.309034 0.09375,3.402784 1.3281255,-0.020833 2.6562505,-0.041667 3.9843755,-0.0625 -0.03646,-0.953125 -0.07292,-1.90625 -0.109375,-2.859375 -1.177083,0.041667 -2.29948,0.114583 -3.476563,0.15625 l -0.09375,0.3125 c 0.572916,-0.088542 2.809896,-0.2395833 3.351563,-0.09375 0.05945,0.9497396 0.201758,2.171618 0.046875,2.234375 -0.273437,0.104167 -2.3125,0.052083 -3.5156255,0.09375 -0.020833,-0.9791667 -0.041667,-2.0025275 -0.0625,-2.9816942 l 1.2500005,0.028569 c -0.05729,0.1666667 -0.114583,0.3333333 -0.171875,0.5 0.09375,-0.010417 0.335938,-0.020833 0.429688,-0.03125 0.0052,-0.2109375 0.04167,-0.703125 -0.03906,-0.75 -0.162706,-0.031097 -1.182295,-0.00695 -1.6875035,0.050341 z"
-       id="path3815-4-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccc"
-       inkscape:export-filename="/home/user/tupi/src/themes/default/icons/open_big.png"
-       inkscape:export-xdpi="882.76001"
-       inkscape:export-ydpi="882.76001" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 12.265625,0.65905595 -2.171875,0.046875 0.01563,3.79687505 3.171875,-0.046875 -0.234375,-3.359375 -0.625,-0.015625 0.04687,-0.21875005 -0.328125,-0.03125 0,0.39062505 0.734375,0.015625 0.1875,2.953125 -2.640625,0.078125 -0.04687,-3.40625005 1.65625,0.0625 z"
-       id="path3857"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save.png"
-       inkscape:export-xdpi="585.36584"
-       inkscape:export-ydpi="585.36584" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="M 10.578125,1.455931 12.6875,1.330931 12.75,2.065306 10.625,2.205931 10.59375,1.659056 10.683709,1.643431 10.694752,2.1140766 12.65546,1.986396 12.60401,1.4208899 10.675663,1.5588341 z"
-       id="path3859"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save.png"
-       inkscape:export-xdpi="585.36584"
-       inkscape:export-ydpi="585.36584" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 12.704313,2.2185056 -2.108896,0.1328368 0.03755,1.7316449 2.126308,-0.1192311 -0.04572,-1.541736 -0.15699,0.00352 0.06342,1.429368 -1.90174,0.1404453 -0.03262,-1.5430052 2.002914,-0.1059695 z"
-       id="path3859-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save.png"
-       inkscape:export-xdpi="585.36584"
-       inkscape:export-ydpi="585.36584" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 16.399637,0.56351338 -2.171875,0.046875 0.01563,3.79687502 3.171875,-0.046875 -0.234375,-3.3593749 -0.625,-0.015625 0.04687,-0.2187501 -0.328125,-0.03125 0,0.39062512 0.734375,0.015625 0.1875,2.9531249 -2.640625,0.078125 -0.04687,-3.40625002 1.65625,0.0625 z"
-       id="path3857-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
-       inkscape:export-xdpi="585.36584"
-       inkscape:export-ydpi="585.36584" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 14.712137,1.3603885 2.109375,-0.125 0.0625,0.7343749 -2.125,0.140625 -0.03125,-0.546875 0.08996,-0.015625 0.01104,0.4706455 1.960708,-0.1276806 -0.05145,-0.565506 -1.928347,0.1379442 z"
-       id="path3859-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
-       inkscape:export-xdpi="585.36584"
-       inkscape:export-ydpi="585.36584" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 16.838325,2.122963 -2.108896,0.1328368 0.03755,1.7316449 2.126308,-0.1192311 -0.04572,-1.541736 -0.15699,0.00352 0.06342,1.429368 -1.90174,0.1404453 -0.03262,-1.5430052 2.002914,-0.1059695 z"
-       id="path3859-2-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
-       inkscape:export-xdpi="585.36584"
-       inkscape:export-ydpi="585.36584" />
-    <path
-       style="fill:url(#linearGradient3966);fill-opacity:1;stroke:none"
-       d="m 0.9375,1.2762434 2.546875,0.1484375 -0.03125,2.90625 -2.484375,0.046875 z"
-       id="rect3927"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-       inkscape:export-xdpi="597.56848"
-       inkscape:export-ydpi="597.56848" />
-    <path
-       style="fill:url(#linearGradient3956);fill-opacity:1;stroke:none"
-       d="M 4.953125,1.3074935 6.3867188,1.205931 6.3046875,1.7762435 C 6.999098,1.7898105 7.8369355,1.7359284 8.625,1.7137435 L 8.734375,4.2918685 5,4.4012435 z"
-       id="rect3927-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/user/tupi/src/themes/default/icons/open_big.png"
-       inkscape:export-xdpi="882.76001"
-       inkscape:export-ydpi="882.76001" />
-    <path
-       style="fill:url(#linearGradient3984);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="m 12.078125,0.76843095 -1.8125,0.078125 L 10.28125,4.346556 13.1875,4.330931 13,1.190306 12.25,1.221556 z"
-       id="path3968"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save.png"
-       inkscape:export-xdpi="585"
-       inkscape:export-ydpi="585" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:0.16222556;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       d="m 26.336312,2.0854309 c 0,0.3931982 -0.219974,0.6102563 -0.571386,0.7290148 -0.08785,0.02969 -0.25626,0.107489 -0.359159,0.2285881 -0.102898,0.121098 -0.140291,0.2854954 -0.255469,0.295475 -0.230358,0.019957 -0.482507,0.025072 -0.745381,0.025072 -0.262874,0 -0.511586,-0.00512 -0.736788,-0.025072 -0.112601,-0.00998 -0.146986,-0.174377 -0.246663,-0.295475 C 23.321789,2.9219347 23.156818,2.844135 23.072403,2.8144457 22.734738,2.6956872 22.528509,2.4786291 22.528509,2.0854309 c 0,-0.7863977 0.852406,-1.4238986 1.903901,-1.4238986 1.051496,0 1.903902,0.6375009 1.903902,1.4238986 z"
-       id="path2816"
-       sodipodi:nodetypes="csssssssssc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path3591"
-       sodipodi:cx="235"
-       sodipodi:cy="224.50504"
-       sodipodi:rx="36.42857"
-       sodipodi:ry="46.42857"
-       d="m 271.42857,224.50504 a 36.42857,46.42857 0 1 1 -72.85714,0 36.42857,46.42857 0 1 1 72.85714,0 z"
-       transform="matrix(0.01422526,0.00772429,-0.00791735,0.0145808,22.124258,-3.2207351)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path3591-8"
-       sodipodi:cx="235"
-       sodipodi:cy="224.50504"
-       sodipodi:rx="36.42857"
-       sodipodi:ry="46.42857"
-       d="m 271.42857,224.50504 a 36.42857,46.42857 0 1 1 -72.85714,0 36.42857,46.42857 0 1 1 72.85714,0 z"
-       transform="matrix(-0.01639294,0.00890135,0.00912383,0.01680267,26.959156,-3.971071)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <rect
-       style="fill:#008700;fill-opacity:1;stroke:#008707;stroke-width:0.14870277;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3615"
-       width="0.36942726"
-       height="0.3923907"
-       x="23.913172"
-       y="3.5881505"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <rect
-       style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:0.14870277;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3615-9"
-       width="0.36942726"
-       height="0.3923907"
-       x="24.512548"
-       y="3.5848243"
-       inkscape:transform-center-x="-0.052775473"
-       inkscape:transform-center-y="-0.33253582"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <rect
-       style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:0.12358502;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3615-9-4-9"
-       width="0.31207454"
-       height="0.32083583"
-       x="19.039185"
-       y="14.738649"
-       inkscape:transform-center-x="0.10964832"
-       inkscape:transform-center-y="-0.24751196"
-       transform="matrix(0.89030651,-0.45536174,0.54925699,0.83565349,0,0)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <rect
-       style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:0.12358502;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3615-9-4-9-0"
-       width="0.31207454"
-       height="0.32083583"
-       x="-21.954208"
-       y="-7.6094866"
-       inkscape:transform-center-x="-0.1096487"
-       inkscape:transform-center-y="-0.24751063"
-       transform="matrix(-0.89030651,-0.45536174,-0.54925699,0.83565349,0,0)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="path3591-9"
-       sodipodi:cx="235"
-       sodipodi:cy="224.50504"
-       sodipodi:rx="36.42857"
-       sodipodi:ry="46.42857"
-       d="m 271.42857,224.50504 a 36.42857,46.42857 0 1 1 -72.85714,0 36.42857,46.42857 0 1 1 72.85714,0 z"
-       transform="matrix(0.00409363,0.00222283,-0.00227839,0.00419594,23.77361,1.3963873)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="path3591-9-9"
-       sodipodi:cx="235"
-       sodipodi:cy="224.50504"
-       sodipodi:rx="36.42857"
-       sodipodi:ry="46.42857"
-       d="m 271.42857,224.50504 a 36.42857,46.42857 0 1 1 -72.85714,0 36.42857,46.42857 0 1 1 72.85714,0 z"
-       transform="matrix(-0.00409363,0.00222283,0.00227839,0.00419594,25.117206,1.3826967)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <g
-       id="g4105"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
-       inkscape:export-xdpi="672"
-       inkscape:export-ydpi="672">
-      <path
-         inkscape:export-ydpi="672.112"
-         inkscape:export-xdpi="672.112"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
-         id="path3590"
-         d="m 29.165006,2.4892737 c -0.659059,0 -1.193393,0.3622312 -1.193393,0.8091948 0,0.4469636 0.651809,0.7770301 1.178605,0.7965991 0.510703,0.018972 1.20818,-0.3496355 1.20818,-0.7965991 0,-0.4469636 -0.534335,-0.8091948 -1.193392,-0.8091948 z m 0.359004,0.2467288 c 0.15155,0 0.274385,0.1247738 0.274385,0.2787692 0,0.1539942 -0.122835,0.2790422 -0.274385,0.2790422 -0.151552,0 -0.274388,-0.125048 -0.274388,-0.2790422 0,-0.1539954 0.122836,-0.2787692 0.274388,-0.2787692 z m -0.802351,0.00956 c 0.151551,0 0.274387,0.1250478 0.274387,0.2790421 0,0.1539954 -0.122836,0.2787691 -0.274387,0.2787691 -0.151549,0 -0.27466,-0.1247737 -0.27466,-0.2787691 0,-0.1539943 0.123111,-0.2790421 0.27466,-0.2790421 z"
-         style="fill:url(#linearGradient4099);fill-opacity:1;stroke:#009100;stroke-opacity:1;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="672.112"
-         inkscape:export-xdpi="672.112"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
-         sodipodi:nodetypes="cc"
-         id="path3593"
-         d="M 28.865802,2.5995374 C 28.821736,2.1022278 28.711535,1.1434229 28.327536,0.81607981"
-         style="fill:none;stroke:#008700;stroke-width:0.13144293000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="672.112"
-         inkscape:export-xdpi="672.112"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
-         sodipodi:nodetypes="cc"
-         id="path3593-8"
-         d="M 28.197646,0.85616779 C 27.922209,1.1166523 27.70967,1.3247385 27.522021,1.5957247"
-         style="fill:none;stroke:#009100;stroke-width:0.13144293000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="672.112"
-         inkscape:export-xdpi="672.112"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
-         sodipodi:nodetypes="cc"
-         id="path3593-6"
-         d="M 29.320799,2.5718004 C 29.49588,1.7705848 29.556495,1.4479294 29.679657,0.9647982"
-         style="fill:none;stroke:#008700;stroke-width:0.13144293000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="672.112"
-         inkscape:export-xdpi="672.112"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
-         sodipodi:nodetypes="cc"
-         id="path3593-8-3"
-         d="m 29.803628,0.94580505 c 0.233054,0.0830416 0.52952,0.51007285 0.659727,0.81287895"
-         style="fill:none;stroke:#00a200;stroke-width:0.13144293000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="672.112"
-         inkscape:export-xdpi="672.112"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
-         sodipodi:nodetypes="csssc"
-         id="path3590-3"
-         d="m 27.838285,1.9793329 c 0,-0.1736657 -0.198651,-0.3169069 -0.344131,-0.3095361 -0.150062,0.0076 -0.335735,0.1358704 -0.335735,0.3095361 0,0.1736654 0.152193,0.3144493 0.339933,0.3144493 0.18774,0 0.339933,-0.1407839 0.339933,-0.3144493 z"
-         style="fill:#008700;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="672.112"
-         inkscape:export-xdpi="672.112"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
-         sodipodi:nodetypes="csssc"
-         id="path3590-3-1"
-         d="m 30.832243,2.1380846 c 0,-0.1736654 -0.19865,-0.316907 -0.34413,-0.3095361 -0.150064,0.0076 -0.335736,0.1358707 -0.335736,0.3095361 0,0.1736657 0.152193,0.3144492 0.339934,0.3144492 0.187739,0 0.339932,-0.1407835 0.339932,-0.3144492 z"
-         style="fill:#008700;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g4114">
-      <g
-         transform="matrix(1.4995704,0,0,1.4995704,-15.669932,-1.3367182)"
-         inkscape:export-ydpi="805.34802"
-         inkscape:export-xdpi="805.34802"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exit.png"
-         id="g4079">
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 33.084537,1.6547926 0.258805,0.4205012 -0.254943,0.3604448 -0.487965,-0.07157 0.07602,-0.5409732 -1.309641,0.7983346 1.447979,0.836127 -0.206551,-0.7010146 0.768476,0.024922 0.310004,-0.6457882 0.154739,-0.2595721 -0.562293,-0.2816572 z"
-           id="path4075"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccc" />
-        <path
-           style="fill:#ffffff;fill-opacity:0.62980772;stroke:none"
-           d="m 31.908194,2.6179699 0.57665,-0.4252064 -0.142913,0.310307 0.161776,0.5056196 z"
-           id="path4077"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-      </g>
-      <path
-         inkscape:export-ydpi="805"
-         inkscape:export-xdpi="805"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exit.png"
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path4101"
-         d="m 33.234019,2.6400669 1.071708,0.022097 C 34.41253,2.4227789 34.751352,1.7525006 34.858154,1.5462611"
-         style="fill:none;stroke:#ffffff;stroke-width:0.20000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.29326922;stroke-dasharray:none" />
-    </g>
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.20000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788461;stroke-dasharray:none"
-       d="m 18.671875,3.252806 c 0.226639,0.2518956 0.607958,0.5700825 0.8125,0.65625 0.142042,-0.2046954 0.471909,-0.8844782 0.625,-1.078125 0.140625,0.3333333 0.303347,0.7992492 0.421875,1 0.177869,-0.062175 0.665096,-0.5994369 0.765625,-0.75"
-       id="path4103"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/close.png"
-       inkscape:export-xdpi="717"
-       inkscape:export-ydpi="717" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 36.398437,0.74714599 c 0.03125,1.09375001 0.0625,2.18750001 0.09375,3.28125001 1.328126,-0.02083 2.656251,-0.04167 3.984376,-0.0625 -0.03646,-0.953125 -0.07292,-1.90625 -0.109375,-2.859375 -1.177083,0.04167 -2.45573,0.08333 -3.632813,0.125 0.02083,0.114584 0.04167,0.229167 0.0625,0.34375 0.572916,-0.08854 2.809896,-0.239583 3.351563,-0.09375 0.05945,0.94974 0.201758,2.171618 0.04687,2.234375 -0.273437,0.104167 -2.3125,0.05208 -3.515626,0.09375 -0.02083,-0.979166 -0.04167,-1.958333 -0.0625,-2.93750001 0.359376,-0.0052 0.890626,-0.01042 1.250001,-0.01563 C 37.809893,1.023183 37.7526,1.18985 37.695308,1.356516 c 0.09375,-0.01042 0.335938,-0.02083 0.429688,-0.03125 0.0052,-0.210937 0.04167,-0.70312501 -0.03906,-0.75000001 -0.162706,-0.0311 -1.182295,0.114584 -1.687504,0.171875 z"
-       id="path3815-4-6-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/create_folder.png"
-       inkscape:export-xdpi="605.49915"
-       inkscape:export-ydpi="605.49915" />
-    <path
-       style="fill:url(#linearGradient3956-8);fill-opacity:1;stroke:none"
-       d="m 36.578125,0.80749399 1.433594,-0.101562 -0.08203,0.57031201 c 0.69441,0.01357 1.532248,-0.04031 2.320312,-0.0625 l 0.109375,2.578125 -3.734375,0.109375 z"
-       id="rect3927-9-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/create_folder.png"
-       inkscape:export-xdpi="605.49915"
-       inkscape:export-ydpi="605.49915" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.24996968;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 40.532665,0.53237593 -0.745687,-0.0897591 0.112845,0.67656367 -0.506395,-0.15871266 -0.06571,0.78877526 0.666589,-0.071414 -0.161766,0.6262231 0.897585,0.055236 -0.185253,-0.6804777 0.51943,0.075662 0.04833,-0.80782672 -0.604449,0.13690972 z"
-       id="path4153"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/create_folder.png"
-       inkscape:export-xdpi="605.49915"
-       inkscape:export-ydpi="605.49915" />
-    <g
-       id="g3845"
-       transform="matrix(0.33039621,0,0,0.33039621,0.7485374,31.171459)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/crash.png"
-       inkscape:export-xdpi="825.77319"
-       inkscape:export-ydpi="825.77319">
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path3075"
-         d="m 8.0625,8.0496815 1.0625,4.4375005 -4.9375,-0.5625 3.0625,3.5625 -2.5,6.1875 5.5625,-3.4375 1.9375,2.375 3.0625,-2.6875 2.4375,3.3125 2.3125,-2.6875 4.875,2.3125 -2.5,-5.25 3.9375,-3.25 -5.0625,0.9375 0.75,-5.6250005 L 18.375,11.862182 15.6875,8.6121815 13.5625,12.237182 9.375,8.4246815 z"
-         style="fill:#00a600;fill-opacity:0.3125;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path4324"
-         d="M 15.316814,9.2217095 13.513086,11.939001 8.8278538,8.0309577"
-         style="fill:none;stroke:#43981a;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4322-0"
-         d="m 8.127156,8.001362 0.972272,4.419417 -4.772971,-0.441942 3.093592,3.712311 -2.65165,5.92202 5.391689,-3.447146 1.944544,2.65165 3.093592,-2.65165 2.65165,3.270369 2.209709,-2.916816 4.772971,2.209709 -2.121321,-4.861359 3.712311,-3.889088 c 0,0 -4.861359,1.237437 -4.861359,0.883884 0,-0.353554 0.53033,-5.126524 0.53033,-5.126524 l -4.065864,3.977475 -2.298097,-2.916815"
-         style="fill:none;stroke:#43981a;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <text
-         transform="matrix(0.95240857,-0.30482441,0.30482441,0.95240857,0,0)"
-         sodipodi:linespacing="125%"
-         id="text4243"
-         y="19.584993"
-         x="-0.19455156"
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-         xml:space="preserve"><tspan
-           y="19.584993"
-           x="-0.19455156"
-           id="tspan4245"
-           sodipodi:role="line">B</tspan></text>
-      <text
-         sodipodi:linespacing="125%"
-         id="text4243-4"
-         y="16.314077"
-         x="9.0016441"
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008800;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-         xml:space="preserve"><tspan
-           y="16.314077"
-           x="9.0016441"
-           id="tspan4245-3"
-           sodipodi:role="line">0</tspan></text>
-      <g
-         id="text4243-2"
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-         transform="matrix(0.97003396,0.24296938,-0.24296938,0.97003396,-45,27.75)">
-        <path
-           style="fill:#008700;fill-opacity:1"
-           sodipodi:nodetypes="ccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path4320"
-           d="m 57.427763,-26.726684 c 0.878907,-2.22656 1.186062,-3.627987 1.648302,-5.932679 l 2.333984,-0.380859 -0.332031,3.583984 0.908203,-3.310547 2.246094,-0.390625 c -0.266933,2.122401 -0.400396,4.036462 -0.400391,5.742188 -5e-6,0.338543 0.0033,0.673829 0.0098,1.005859 l -2.001953,0.351563 0.351562,-4.277344 -0.722389,2.703554 -1.074219,0.146484 0.08762,-3.982851 -1.023302,4.467836 -2.03125,0.273437" />
-      </g>
-      <text
-         transform="matrix(0.91529523,0.40278361,-0.40278361,0.91529523,0,0)"
-         sodipodi:linespacing="125%"
-         id="text4243-4-1"
-         y="10.638951"
-         x="16.930115"
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-         xml:space="preserve"><tspan
-           y="10.638951"
-           x="16.930115"
-           id="tspan4245-3-7"
-           sodipodi:role="line">0</tspan></text>
-      <text
-         transform="matrix(0.9986833,-0.05129977,0.05129977,0.9986833,0,0)"
-         sodipodi:linespacing="125%"
-         id="text4243-2-8"
-         y="19.620443"
-         x="23.373491"
-         style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-         xml:space="preserve"><tspan
-           y="19.620443"
-           x="23.373491"
-           id="tspan4245-34-8"
-           sodipodi:role="line">!</tspan></text>
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path4353"
-         d="m 3.39262,21.087195 c -0.766032,0.53033 -2.283365,1.193243 -0.574524,-0.397748 7.807637,-5.273838 18.178537,-3.38822 22.892582,-1.502602 -0.95287,0.328354 -2.609581,-0.873223 -8.441086,-1.546796 -1.845577,-0.192386 -3.861524,0.01609 -4.436692,0.143687 2.276533,-0.210729 4.113737,-0.07236 4.786454,0.06093 1.079346,0.239329 0.275237,0.480721 -0.305949,0.59348 C 13.779171,17.459699 6.972348,17.581124 3.39262,21.087195 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-    </g>
-    <g
-       id="g3961"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
-       inkscape:export-xdpi="1375.1899"
-       inkscape:export-ydpi="1375.1899"
-       transform="matrix(1.6613058,0,0,1.6613058,-0.70527058,-3.7273284)">
-      <g
-         inkscape:export-ydpi="1200"
-         inkscape:export-xdpi="1200"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
-         transform="translate(-0.171875,-0.59375)"
-         id="g3919">
-        <path
-           style="fill:url(#linearGradient4005);fill-opacity:1;stroke:none"
-           d="M 3.6570679,6.5899207 C 3.2022362,6.3063414 2.3828026,6.5144224 1.7898641,6.8274644 1.7861812,6.7132961 1.7051586,6.5549337 1.6572815,6.5070566 1.5136504,6.7943187 1.3700194,7.4461829 1.3589708,7.7776391 1.8672039,7.6450566 2.5190679,7.6229596 2.8726213,7.6450566 2.6921618,7.4940598 2.5117022,7.3430631 2.3312427,7.1920663 2.649809,6.9729368 3.2390646,6.6985648 3.6570679,6.5899207 z"
-           id="path3899"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 1.6257457,6.4537659 c 0.057292,0.049479 0.1695009,0.139036 0.28148,0.2275777 C 2.2130817,6.4433307 3.1045105,6.0948323 3.9959394,6.6412659 3.2214587,6.6469346 2.7618617,6.9840588 2.5508568,7.2438436 2.7904401,7.4417603 2.8201012,7.5291915 3.0596845,7.7271082 2.5232909,7.6159786 1.9603842,7.6248254 1.2383568,7.9938436 1.2774198,7.4287394 1.4110646,6.6543634 1.6024709,6.4486342 c 0.083333,0.1354167 0.05082,0.152698 0.084434,0.2881147 C 1.5801345,7.0570614 1.4623151,7.3610311 1.4649193,7.6813436 1.8841135,7.4831017 2.1537597,7.481838 2.6281966,7.5156155 2.4713148,7.4165038 2.4028212,7.3284407 2.2348908,7.2624747 2.3714086,7.0017328 3.0990235,6.6028841 3.6111918,6.5686373 2.6434384,6.2651949 2.0041352,6.7928442 1.7696068,6.9938436 1.6758568,6.7021769 1.6432664,6.8548076 1.5495164,6.5631409 c 0.083333,0.020833 -0.0071,-0.130208 0.076229,-0.109375 z"
-           id="path3897"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccc" />
-      </g>
-    </g>
-    <g
-       transform="matrix(-1.6613058,0,0,1.6613058,12.364468,-3.7273284)"
-       id="g3961-5"
-       inkscape:export-xdpi="791.24982"
-       inkscape:export-ydpi="791.24982"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/redo_big.png">
-      <g
-         inkscape:export-ydpi="1200"
-         inkscape:export-xdpi="1200"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
-         transform="translate(-0.171875,-0.59375)"
-         id="g3919-3">
-        <path
-           style="fill:url(#linearGradient3923-0);fill-opacity:1;stroke:none"
-           d="M 3.6570679,6.5899207 C 3.2022362,6.3063414 2.3828026,6.5144224 1.7898641,6.8274644 1.7861812,6.7132961 1.7051586,6.5549337 1.6572815,6.5070566 1.5136504,6.7943187 1.3700194,7.4461829 1.3589708,7.7776391 1.8672039,7.6450566 2.5190679,7.6229596 2.8726213,7.6450566 2.6921618,7.4940598 2.5117022,7.3430631 2.3312427,7.1920663 2.649809,6.9729368 3.2390646,6.6985648 3.6570679,6.5899207 z"
-           id="path3899-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 1.6023082,6.4498596 c 0.08073,0.053385 0.1929384,0.1429423 0.3049175,0.231484 C 2.2130817,6.4433307 3.1045105,6.0948323 3.9959394,6.6412659 3.2214587,6.6469346 2.7618617,6.9840588 2.5508568,7.2438436 2.7904401,7.4417603 2.8201012,7.5291915 3.0596845,7.7271082 2.5232909,7.6159786 1.9603842,7.6248254 1.2383568,7.9938436 1.2774198,7.4287394 1.4227834,6.8535821 1.5868459,6.4447279 1.6701789,6.5801446 1.6532905,6.6013322 1.6869053,6.7367489 1.5801345,7.0570614 1.4623151,7.3610311 1.4649193,7.6813436 1.8841135,7.4831017 2.1537597,7.481838 2.6281966,7.5156155 2.4713148,7.4165038 2.4028212,7.3284407 2.2348908,7.2624747 2.3714086,7.0017328 3.0990235,6.6028841 3.6111918,6.5686373 2.6434384,6.2651949 2.0041352,6.7928442 1.7696068,6.9938436 1.6758568,6.7021769 1.6432664,6.8548076 1.5495164,6.5631409 1.6328494,6.5839739 1.5189789,6.4290266 1.6023082,6.4498596 z"
-           id="path3897-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccc" />
-      </g>
-    </g>
-    <g
-       id="g4195"
-       transform="matrix(1.6613058,0,0,1.6613058,-0.70527058,-3.2381685)">
-      <path
-         inkscape:export-ydpi="1246.5846"
-         inkscape:export-xdpi="1246.5846"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
-         sodipodi:nodetypes="ccccccccsccccc"
-         inkscape:connector-curvature="0"
-         id="path4007"
-         d="M 9.7545757,5.6673457 C 9.7283513,5.5669215 9.3424413,5.1352863 9.2410043,5.1669413 9.1149559,5.2502011 8.6160804,5.8258729 8.2192047,6.2463646 8.1204594,6.3740539 7.9700527,6.7787043 7.9100532,6.9698165 7.9834743,6.9778922 8.4266549,6.841396 8.5692109,6.7499763 8.9559569,6.3837907 9.213184,6.1395545 9.5999299,5.7733689 9.5553221,5.7313308 9.5107143,5.6892928 9.4661065,5.6472548 9.1119442,6.0195182 8.8873006,6.2698323 8.5331383,6.6420957 8.4930653,6.671148 8.3250047,6.7662395 8.2266148,6.7752823 c -0.09839,0.00904 -0.08237,-0.1270532 -0.08237,-0.1270532 L 8.289521,6.3212958 c 0.3579985,-0.382787 0.5875755,-0.5591267 0.945574,-0.9419136 0.1387946,0.1195484 0.277589,0.239097 0.4163836,0.3586456 0.034366,-0.023561 0.068731,-0.047122 0.1030971,-0.070682 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="1246.5846"
-         inkscape:export-xdpi="1246.5846"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path4009"
-         d="m 8.2768724,6.3353946 0.2368475,0.00842 0.027377,0.2792868"
-         style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:export-ydpi="1246.5846"
-         inkscape:export-xdpi="1246.5846"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4011"
-         d="M 9.0445453,5.5573814 9.3333518,5.9371866 9.2743466,5.9823759 8.8922912,5.6807094 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="1246.5846"
-         inkscape:export-xdpi="1246.5846"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
-         inkscape:connector-curvature="0"
-         id="path4013"
-         d="M 8.2642565,6.2852899 8.9599573,5.5805976 9.2525543,5.9292239 8.530033,6.6924913 8.5378726,6.3522219 z"
-         style="fill:url(#linearGradient4021);fill-opacity:1;stroke:none" />
-    </g>
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.33226117;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 19.528916,6.6175155 c 0.233621,0.285537 0.48022,1.0383162 0.506178,1.4406637"
-       id="path4095"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
-       inkscape:export-xdpi="818.79968"
-       inkscape:export-ydpi="818.79968" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.33226117;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 20.085897,8.1447691 0.499689,-0.7982056 0.381996,0.7894169 0.37282,-0.3669487"
-       id="path4095-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
-       inkscape:export-xdpi="818.79968"
-       inkscape:export-ydpi="818.79968" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.33226117;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 20.003903,8.1767678 19.512711,8.4707611 19.262947,7.9221931 18.947364,8.1265627"
-       id="path4095-6-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
-       inkscape:export-xdpi="818.79968"
-       inkscape:export-ydpi="818.79968" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 19.599257,6.7370285 0.780035,0.1169261 0.169149,-0.4214381"
-       id="path4095-6-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
-       inkscape:export-xdpi="818.79968"
-       inkscape:export-ydpi="818.79968" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 19.573244,6.7206587 -0.664085,0.3651537 0.246923,0.294083"
-       id="path4095-6-4-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
-       inkscape:export-xdpi="818.79968"
-       inkscape:export-ydpi="818.79968" />
-    <g
-       id="g4209"
-       transform="matrix(1.6613058,0,0,1.6613058,-0.70527058,-3.2381685)">
-      <path
-         inkscape:export-ydpi="975.18652"
-         inkscape:export-xdpi="975.18652"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
-         sodipodi:nodetypes="cczcccczc"
-         inkscape:connector-curvature="0"
-         id="path4201"
-         d="M 15.102452,5.7188282 C 14.922759,5.5516594 14.845744,5.5202054 14.666051,5.3530365 c 0.474363,-0.6572846 1.42799,-0.3962888 1.565973,0.04776 0.137983,0.4440489 -0.0959,0.7831853 -0.520636,0.8179535 l 0.05231,0.2699684 -0.539341,-0.050677 0.198344,-0.3892328 c 0.196424,0.063891 0.658985,0.032173 0.486097,-0.4063204 -0.172889,-0.4384939 -0.69034,-0.2162326 -0.80635,0.07634 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="975.18652"
-         inkscape:export-xdpi="975.18652"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
-         transform="matrix(0.99254032,0.12191684,-0.12191684,0.99254032,0.98031351,-1.5554444)"
-         d="m 15.810465,6.7004056 c 0,0.1586505 -0.178077,0.2872621 -0.397747,0.2872621 -0.21967,0 -0.397748,-0.1286116 -0.397748,-0.2872621 0,-0.1586505 0.178078,-0.2872621 0.397748,-0.2872621 0.21967,0 0.397747,0.1286116 0.397747,0.2872621 z"
-         sodipodi:ry="0.28726214"
-         sodipodi:rx="0.39774758"
-         sodipodi:cy="6.7004056"
-         sodipodi:cx="15.412718"
-         id="path4203"
-         style="fill:#008700;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:export-ydpi="975.18652"
-         inkscape:export-xdpi="975.18652"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
-         transform="matrix(0.95560751,0.29464264,-0.50334784,1.6324961,4.0042879,-8.9550306)"
-         d="m 15.9375,6.9090548 c 0,0.051777 -0.08569,0.09375 -0.191406,0.09375 -0.105711,0 -0.191406,-0.041973 -0.191406,-0.09375 0,-0.051777 0.08569,-0.09375 0.191406,-0.09375 0.105711,0 0.191406,0.041973 0.191406,0.09375 z"
-         sodipodi:ry="0.09375"
-         sodipodi:rx="0.19140625"
-         sodipodi:cy="6.9090548"
-         sodipodi:cx="15.746094"
-         id="path4205"
-         style="fill:#ffffff;fill-opacity:0.17894736;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:export-ydpi="975.18652"
-         inkscape:export-xdpi="975.18652"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path4207"
-         d="m 15.697691,6.4444409 c -0.01289,-0.1160097 -0.02349,-0.1528315 -0.03638,-0.2688412 0.101278,-0.011049 0.235702,-0.044194 0.303835,-0.066291"
-         style="fill:none;stroke:#fffeff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.15263157;stroke-dasharray:none" />
-    </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 30.098417,5.0525461 c 0.122322,0.3066052 0.112271,0.7417501 0.132323,1.0423537 0.108267,0.651959 0.830033,-0.1834851 1.046563,-0.1639659 0.400983,-0.05075 0.729788,0.4958013 0.818004,0.9486593 -0.296726,0.062463 -0.737808,0.1249269 -1.082652,0.2576605 -0.198549,0.8138646 1.063578,1.0249345 1.648037,0.6207278 C 32.47223,8.5075384 28.783351,9.3938378 28.325493,6.7713442 28.091025,6.9739907 27.663421,6.8664092 27.599265,6.6282675 27.587135,6.4841293 28.262397,6.509759 28.312183,6.2718442 28.015457,6.0961667 27.436844,5.8805925 27.597236,5.681491 27.889952,5.587797 28.24629,5.5545805 28.389571,5.659987 c 0,0 0.441339,-0.7603259 0.823637,-0.751133 -0.205056,-0.4496828 0.762882,-0.1629143 0.885209,0.1436921 z"
-       id="path4277"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zcccccccccccz"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/news_mode.png"
-       inkscape:export-xdpi="583.88239"
-       inkscape:export-ydpi="583.88239" />
-    <path
-       style="fill:#ffffff;fill-opacity:0.07211537;stroke:none"
-       d="M 28.433307,6.7460657 C 30.017528,6.2918488 30.143382,8.040094 31.608723,8.2328216 31.28751,8.3827212 30.345074,8.5422523 29.562139,8.2236512 28.779204,7.9050501 28.549555,7.1254028 28.433307,6.7460657 z"
-       id="path4289"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/news_mode.png"
-       inkscape:export-xdpi="583.88239"
-       inkscape:export-ydpi="583.88239" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4233-6-0"
+       id="linearGradient11013"
+       gradientUnits="userSpaceOnUse"
+       x1="1.359458"
+       y1="8.3263044"
+       x2="0.9100455"
+       y2="15.422908" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3911-3"
+       id="linearGradient11015"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.70710678,0.66291261)"
+       x1="0.53699273"
+       y1="7.3049078"
+       x2="2.4555922"
+       y2="5.9325323" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3911-3-8"
+       id="linearGradient11017"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.70710678,0.66291261)"
+       x1="0.53699273"
+       y1="7.3049078"
+       x2="2.4555922"
+       y2="5.9325323" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16173-7"
+       id="radialGradient11019"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.99121265,0,0.42071887)"
+       cx="42.570312"
+       cy="47.877808"
+       fx="42.570312"
+       fy="47.877808"
+       r="0.88906252" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-7-8-4-9"
+       id="linearGradient11021"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96380962,0,0,0.96380962,-65.605076,5.1303489)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3958-6"
+       id="linearGradient11023"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5182036,0,0,1.5182036,-22.242437,15.901589)"
+       x1="0.34375"
+       y1="4.9403062"
+       x2="3.3339467"
+       y2="2.8307009" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3978-5"
+       id="linearGradient11025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,54.318857,265.39197)"
+       x1="7.3125"
+       y1="3.4793684"
+       x2="12.568782"
+       y2="2.7563672" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3948"
+       id="linearGradient11027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+       x1="6.578125"
+       y1="5.3660874"
+       x2="6.703125"
+       y2="2.3660872" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3978"
+       id="linearGradient11029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+       x1="7.3787913"
+       y1="3.5235627"
+       x2="12.723461"
+       y2="2.712173" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4083"
+       id="linearGradient11031"
+       gradientUnits="userSpaceOnUse"
+       x1="28.909113"
+       y1="4.1362715"
+       x2="29.229607"
+       y2="2.0658634" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3948-4"
+       id="linearGradient11033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,287.83888,261.94709)"
+       x1="6.6989856"
+       y1="5.1447682"
+       x2="6.7937341"
+       y2="3.0595994" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3911"
+       id="linearGradient11035"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.70710678,0.66291261)"
+       x1="0.53699273"
+       y1="7.3049078"
+       x2="2.4555922"
+       y2="5.9325323" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3911-4"
+       id="linearGradient11037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.70710678,0.66291261)"
+       x1="0.53699273"
+       y1="7.3049078"
+       x2="2.4555922"
+       y2="5.9325323" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4015"
+       id="linearGradient11039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9830445,0.18336712,-0.18336712,0.9830445,1.2727239,-1.5225429)"
+       x1="8.390625"
+       y1="5.8231173"
+       x2="9.1015625"
+       y2="6.3387423" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3958"
+       id="linearGradient11041"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+       x1="0.34375"
+       y1="4.9403062"
+       x2="3.3339467"
+       y2="2.8307009" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3931"
+       id="linearGradient11043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.86178636,-0.15467965)"
+       x1="43.765621"
+       y1="9.7606211"
+       x2="51.421875"
+       y2="7.3231211" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3931-6"
+       id="linearGradient11045"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.56571433,0,0,0.56571433,28.100609,-1.4013594)"
+       x1="43.765621"
+       y1="9.7606211"
+       x2="51.421875"
+       y2="7.3231211" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4162"
+       id="linearGradient11047"
+       gradientUnits="userSpaceOnUse"
+       x1="55.056931"
+       y1="3.7537532"
+       x2="55.039021"
+       y2="2.2161841" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3931-7"
+       id="linearGradient11049"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,85.867811,262.46762)"
+       x1="43.765621"
+       y1="9.7606211"
+       x2="51.421875"
+       y2="7.3231211" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4331"
+       id="linearGradient11051"
+       gradientUnits="userSpaceOnUse"
+       x1="52.886604"
+       y1="8.0125113"
+       x2="54.552906"
+       y2="7.2422595" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578"
+       id="linearGradient11053"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0"
+       id="linearGradient11055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-2"
+       id="linearGradient11057"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-6"
+       id="linearGradient11059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-2-6"
+       id="linearGradient11061"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4673"
+       id="linearGradient11063"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+       x1="42.511883"
+       y1="13.484196"
+       x2="43.292526"
+       y2="9.7276917" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4038"
+       id="linearGradient11065"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,24.659389,270.71773)"
+       x1="46.216057"
+       y1="13.136182"
+       x2="48.679882"
+       y2="11.622531" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4056"
+       id="linearGradient11067"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+       x1="54.391983"
+       y1="12.937309"
+       x2="52.668407"
+       y2="11.324223" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4116"
+       id="linearGradient11069"
+       gradientUnits="userSpaceOnUse"
+       x1="59.837715"
+       y1="2.4707377"
+       x2="59.850388"
+       y2="1.7519876" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4098"
+       id="linearGradient11071"
+       gradientUnits="userSpaceOnUse"
+       x1="60.0625"
+       y1="4.2918692"
+       x2="60.09375"
+       y2="3.1981189" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4075"
+       id="linearGradient11073"
+       gradientUnits="userSpaceOnUse"
+       x1="56.046875"
+       y1="12.502804"
+       x2="59"
+       y2="11.971554" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4233"
+       id="linearGradient11075"
+       gradientUnits="userSpaceOnUse"
+       x1="1.359458"
+       y1="8.3263044"
+       x2="0.9100455"
+       y2="15.422908" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4314"
+       id="linearGradient11077"
+       gradientUnits="userSpaceOnUse"
+       x1="14.695312"
+       y1="16.018433"
+       x2="14.523438"
+       y2="13.877807" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4384"
+       id="linearGradient11079"
+       gradientUnits="userSpaceOnUse"
+       x1="23.179846"
+       y1="17.202051"
+       x2="24.096874"
+       y2="17.345682" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4365"
+       id="linearGradient11081"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.81823653,0,0,0.81823653,4.9786883,1.9258249)"
+       x1="23.296875"
+       y1="17.440308"
+       x2="23.328125"
+       y2="15.049684" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4503-0"
+       id="linearGradient11083"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,-8.4891828,-5.9234777,534.98287)"
+       x1="35.40625"
+       y1="13.580935"
+       x2="34.53125"
+       y2="15.362185" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4503"
+       id="linearGradient11085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,-5.392903,261.6896)"
+       x1="35.293278"
+       y1="13.28831"
+       x2="34.87722"
+       y2="15.307266" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548"
+       id="linearGradient11087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4585"
+       id="linearGradient11089"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+       x1="50.8097"
+       y1="17.649515"
+       x2="52.988815"
+       y2="16.86507" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-2"
+       id="linearGradient11091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1519986,-4.376539,4.376539,2.1519986,369.59021,510.58524)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-7-8"
+       id="linearGradient11093"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75453713,0,0,0.75453713,6.8191319,24.23532)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4413"
+       id="linearGradient11095"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(8.125,-0.09375)"
+       x1="34.46875"
+       y1="38.534058"
+       x2="34.40625"
+       y2="35.752808" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4673-4"
+       id="linearGradient11097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9674682,0,0,2.9674682,299.40712,783.41533)"
+       x1="42.511883"
+       y1="13.484196"
+       x2="43.292526"
+       y2="9.7276917" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-2-9-1"
+       id="linearGradient11099"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10458174,-0.21268884,0.21268884,0.10458174,13.22749,55.272013)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-2-9-1-6"
+       id="linearGradient11101"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10458174,-0.21268884,0.21268884,0.10458174,13.22749,55.272013)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-2-9-1-6-1"
+       id="linearGradient11103"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10458174,-0.21268884,0.21268884,0.10458174,13.22749,55.272013)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-2-9-1-6-1-5"
+       id="linearGradient11105"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8647224,-1.0121634,1.0121634,1.8647224,154.68507,869.04825)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-2-9-1-6-1-5-4"
+       id="linearGradient11107"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8647224,-1.0121634,1.0121634,1.8647224,150.73405,878.32192)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-2-9-1-6-1-9"
+       id="linearGradient11109"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.21965865,-0.11922978,0.11922978,0.21965865,19.646342,48.954664)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-2-9-1-6-1-9-2"
+       id="linearGradient11111"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10458174,-0.21268884,0.21268884,0.10458174,13.22749,55.272013)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-2-9-1-6-1-9-2-3"
+       id="linearGradient11113"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.21965865,-0.11922978,0.11922978,0.21965865,20.279154,49.985914)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16173"
+       id="radialGradient11115"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.99121265,0,0.42071887)"
+       cx="42.570312"
+       cy="47.877808"
+       fx="42.570312"
+       fy="47.877808"
+       r="0.88906252" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4038-4"
+       id="linearGradient11117"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,73.80065,757.13301)"
+       x1="46.216057"
+       y1="13.136182"
+       x2="48.679882"
+       y2="11.622531" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-7-8-4"
+       id="linearGradient11119"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.696862,0,0,3.696862,216.63968,662.61635)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-7-8-4-4-2"
+       id="linearGradient11121"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.9414591,0,0,4.9414591,332.33614,892.18743)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-7-8-4-3"
+       id="linearGradient11123"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.696862,0,0,3.696862,291.58075,663.70298)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4233-6"
+       id="linearGradient11125"
+       gradientUnits="userSpaceOnUse"
+       x1="1.359458"
+       y1="8.3263044"
+       x2="0.9100455"
+       y2="15.422908" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-6"
+       id="linearGradient11127"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-5"
+       id="linearGradient11129"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-2-0"
+       id="linearGradient11131"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-6-1"
+       id="linearGradient11133"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-2-6-3"
+       id="linearGradient11135"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4056-6"
+       id="linearGradient11137"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(12.526812,-5.1476724)"
+       x1="54.391983"
+       y1="12.937309"
+       x2="52.949657"
+       y2="11.746098" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6283"
+       id="linearGradient11139"
+       gradientUnits="userSpaceOnUse"
+       x1="28.360025"
+       y1="21.470121"
+       x2="26.629051"
+       y2="21.412983" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-7-8-4-3-5"
+       id="linearGradient11141"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.290423,0,0,7.290423,286.1198,568.46409)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3931-6-7"
+       id="linearGradient11143"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.56571433,0,0,0.56571433,28.100609,-1.4013594)"
+       x1="43.765621"
+       y1="9.7606211"
+       x2="51.421875"
+       y2="7.3231211" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4162-2"
+       id="linearGradient11145"
+       gradientUnits="userSpaceOnUse"
+       x1="55.056931"
+       y1="3.7537532"
+       x2="55.039021"
+       y2="2.2161841" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4331-0"
+       id="linearGradient11147"
+       gradientUnits="userSpaceOnUse"
+       x1="52.886604"
+       y1="8.0125113"
+       x2="54.552906"
+       y2="7.2422595" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3958-6-0">
+      <stop
+         style="stop-color:#008700;stop-opacity:1;"
+         offset="0"
+         id="stop3960-3-4" />
+      <stop
+         style="stop-color:#008700;stop-opacity:0;"
+         offset="1"
+         id="stop3962-6-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4548-7-8-4-9-2">
+      <stop
+         style="stop-color:#008700;stop-opacity:1;"
+         offset="0"
+         id="stop4550-7-6-0-16-2" />
+      <stop
+         style="stop-color:#008700;stop-opacity:0;"
+         offset="1"
+         id="stop4552-6-2-3-2-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient16173-7-1">
+      <stop
+         style="stop-color:#008700;stop-opacity:1;"
+         offset="0"
+         id="stop16175-2-3" />
+      <stop
+         style="stop-color:#008700;stop-opacity:0;"
+         offset="1"
+         id="stop16177-6-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3911-3-8-9">
+      <stop
+         style="stop-color:#008700;stop-opacity:1;"
+         offset="0"
+         id="stop3913-8-3-5" />
+      <stop
+         style="stop-color:#008700;stop-opacity:0;"
+         offset="1"
+         id="stop3915-4-1-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3911-3-0">
+      <stop
+         style="stop-color:#008700;stop-opacity:1;"
+         offset="0"
+         id="stop3913-8-4" />
+      <stop
+         style="stop-color:#008700;stop-opacity:0;"
+         offset="1"
+         id="stop3915-4-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3911-3-0"
+       id="linearGradient15484"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.70710678,0.66291261)"
+       x1="0.53699273"
+       y1="7.3049078"
+       x2="2.4555922"
+       y2="5.9325323" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3911-3-8-9"
+       id="linearGradient15486"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.70710678,0.66291261)"
+       x1="0.53699273"
+       y1="7.3049078"
+       x2="2.4555922"
+       y2="5.9325323" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16173-7-1"
+       id="radialGradient15488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.99121265,0,0.42071887)"
+       cx="42.570312"
+       cy="47.877808"
+       fx="42.570312"
+       fy="47.877808"
+       r="0.88906252" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-7-8-4-9-2"
+       id="linearGradient15490"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96380962,0,0,0.96380962,-65.605076,5.1303489)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3958-6-0"
+       id="linearGradient15492"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5182036,0,0,1.5182036,-22.242437,15.901589)"
+       x1="0.34375"
+       y1="4.9403062"
+       x2="3.3339467"
+       y2="2.8307009" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3911-3-0"
+       id="linearGradient15722"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.70710678,0.66291261)"
+       x1="0.53699273"
+       y1="7.3049078"
+       x2="2.4555922"
+       y2="5.9325323" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3911-3-8-9"
+       id="linearGradient15724"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.70710678,0.66291261)"
+       x1="0.53699273"
+       y1="7.3049078"
+       x2="2.4555922"
+       y2="5.9325323" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16173-7-1"
+       id="radialGradient15762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.99121265,0,0.42071887)"
+       cx="42.570312"
+       cy="47.877808"
+       fx="42.570312"
+       fy="47.877808"
+       r="0.88906252" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4548-7-8-4-9-2"
+       id="linearGradient15764"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96380962,0,0,0.96380962,-65.605076,5.1303489)"
+       x1="40.328125"
+       y1="20.75281"
+       x2="40.211685"
+       y2="16.28406" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3958-6-0"
+       id="linearGradient15766"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5182036,0,0,1.5182036,-22.242437,15.901589)"
+       x1="0.34375"
+       y1="4.9403062"
+       x2="3.3339467"
+       y2="2.8307009" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4038-5"
+       id="linearGradient11065-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.4891828,0,0,8.4891828,24.659389,270.71773)"
+       x1="46.216057"
+       y1="13.136182"
+       x2="48.679882"
+       y2="11.622531" />
+    <linearGradient
+       id="linearGradient4038-5">
+      <stop
+         style="stop-color:#008700;stop-opacity:1;"
+         offset="0"
+         id="stop4040-8" />
+      <stop
+         style="stop-color:#008700;stop-opacity:0;"
+         offset="1"
+         id="stop4042-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4015-9"
+       id="linearGradient11039-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9830445,0.18336712,-0.18336712,0.9830445,1.2727239,-1.5225429)"
+       x1="8.390625"
+       y1="5.8231173"
+       x2="9.1015625"
+       y2="6.3387423" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4015-9">
+      <stop
+         style="stop-color:#008700;stop-opacity:1;"
+         offset="0"
+         id="stop4017-6" />
+      <stop
+         style="stop-color:#008700;stop-opacity:0;"
+         offset="1"
+         id="stop4019-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-23"
+       id="linearGradient11055-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4578-0-23">
+      <stop
+         style="stop-color:#008700;stop-opacity:1;"
+         offset="0"
+         id="stop4580-1-99" />
+      <stop
+         style="stop-color:#008700;stop-opacity:0;"
+         offset="1"
+         id="stop4582-1-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-2-7"
+       id="linearGradient11057-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4578-0-2-7">
+      <stop
+         style="stop-color:#008700;stop-opacity:1;"
+         offset="0"
+         id="stop4580-1-9-6" />
+      <stop
+         style="stop-color:#008700;stop-opacity:0;"
+         offset="1"
+         id="stop4582-1-6-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-23"
+       id="linearGradient8059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-2-7"
+       id="linearGradient8061"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-2-7"
+       id="linearGradient8074"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4578-0-23"
+       id="linearGradient8076"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0890844,0,0,1.0890844,-0.89919539,-0.93076426)"
+       x1="9.3125"
+       y1="11.76062"
+       x2="10.96875"
+       y2="10.401245" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.563211"
+     inkscape:cx="427.70547"
+     inkscape:cy="297.33975"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="737"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,197.63782)">
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="7.71875"
+       y="45.049683"
+       id="text3576"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3578"
+         x="7.71875"
+         y="45.049683" /></text>
+    <g
+       id="g4005"
+       transform="matrix(8.4891828,0,0,8.4891828,-347.97701,116.25007)">
+      <g
+         inkscape:export-ydpi="605"
+         inkscape:export-xdpi="605"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
+         transform="matrix(0.88697263,0,0,0.84134706,55.443788,50.840646)"
+         id="g4300-8">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 5.1520053,30.938157 -0.047381,0.829166 2.0373806,4e-6 -0.2724404,-0.900238 z"
+           id="path4296-5"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
+           inkscape:export-xdpi="605"
+           inkscape:export-ydpi="605"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           d="m 5.3770648,31.186907 -0.00592,0.307975 1.3088985,0 -0.071071,-0.379046 z"
+           id="path4298-0"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
+           inkscape:export-xdpi="605"
+           inkscape:export-ydpi="605"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         id="g4330-4-8"
+         transform="translate(55.800435,60.04959)">
+        <path
+           sodipodi:type="arc"
+           style="fill:url(#linearGradient11013);fill-opacity:1;stroke:#008700;stroke-width:0.48670816;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4227-3-8"
+           sodipodi:cx="0.9375"
+           sodipodi:cy="12.471557"
+           sodipodi:rx="1.515625"
+           sodipodi:ry="1.890625"
+           d="m 2.453125,12.471557 c 0,1.044163 -0.6785684,1.890625 -1.515625,1.890625 -0.83705657,0 -1.515625,-0.846462 -1.515625,-1.890625 0,-1.044164 0.67856843,-1.890625 1.515625,-1.890625 0.8326241,0 1.5093424,0.83785 1.5155824,1.876455"
+           sodipodi:start="0"
+           sodipodi:end="6.2756908"
+           sodipodi:open="true"
+           transform="matrix(-0.40843576,0.79784217,-0.67078462,-0.34339177,12.174183,18.302799)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478.02069"
+           inkscape:export-ydpi="478.02069" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 2.6128964,15.72286 -0.4241288,0.65382 0.4384136,0.223158 0.3660673,-0.673829 z"
+           id="path4229-1-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478.02069"
+           inkscape:export-ydpi="478.02069" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 1.9404663,16.101159 1.2267026,0.861431 -0.204936,0.314437 -0.2783296,-0.219831 -0.4622049,0.997603 -1.1096529,-0.679111 0.6536897,-0.796767 -0.3761518,-0.223419 0.2920539,-0.308125 0.2057024,0.158526 -0.086507,0.130351 0.4477842,0.325187 -0.6992561,0.645753 0.3939934,0.243915 0.3881413,-0.80822 0.3222082,0.150978 0.051865,-0.08732 -0.8083818,-0.49483 z"
+           id="path4231-4-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478.02069"
+           inkscape:export-ydpi="478.02069" />
+        <path
+           style="fill:#008700;fill-opacity:0.50480772;stroke:none"
+           d="m 1.9997864,16.251873 c -0.066291,-0.01105 -0.3756505,0.0442 -0.3756505,0.0442 l 0.3425048,0.287262 -0.5524271,0.718155 0.6187184,0.45299 0.4087961,-0.850738 0.3314563,0.07734 0.055243,-0.110485 z"
+           id="path4241-9-7"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478"
+           inkscape:export-ydpi="478" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:0.50480772;stroke:none"
+           id="path4243-2-6"
+           sodipodi:cx="2.9610097"
+           sodipodi:cy="14.218942"
+           sodipodi:rx="0.8175922"
+           sodipodi:ry="0.86178637"
+           d="m 3.7786019,14.218942 c 0,0.475951 -0.3660485,0.861786 -0.8175922,0.861786 -0.4515437,0 -0.8175922,-0.385835 -0.8175922,-0.861786 0,-0.475952 0.3660485,-0.861787 0.8175922,-0.861787 0.3269274,0 0.6224252,0.205283 0.7513422,0.521959"
+           sodipodi:start="0"
+           sodipodi:end="5.8778476"
+           sodipodi:open="true"
+           transform="matrix(0.71794871,0,0,0.71794871,1.0685925,4.2756359)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478"
+           inkscape:export-ydpi="478" />
+      </g>
+    </g>
+    <g
+       id="g9837"
+       transform="translate(19.057125,11.056921)">
+      <g
+         transform="matrix(2.9172006,0,0,2.9172006,146.82421,639.15203)"
+         id="g4814">
+        <g
+           id="g4664">
+          <rect
+             inkscape:export-ydpi="93.218567"
+             inkscape:export-xdpi="93.218567"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style01.png"
+             y="52.336418"
+             x="4.0658641"
+             height="12.551146"
+             width="140.18391"
+             id="rect4641"
+             style="fill:#edeceb;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:export-ydpi="93.218567"
+             inkscape:export-xdpi="93.218567"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style01.png"
+             inkscape:connector-curvature="0"
+             id="path4639"
+             d="m 4.2456671,58.700379 139.9705929,0"
+             style="fill:none;stroke:#008700;stroke-width:4.95940208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g9391"
+       transform="translate(115.20361,-265.94308)">
+      <g
+         transform="matrix(3.355789,0,0,3.355789,334.89925,597.17152)"
+         id="g4565">
+        <rect
+           style="fill:#edeceb;fill-opacity:1;stroke:none"
+           id="rect4563"
+           width="12.002192"
+           height="6.408155"
+           x="22.655628"
+           y="49.37907"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/border03.png"
+           inkscape:export-xdpi="224.71411"
+           inkscape:export-ydpi="224.71411" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:4.0518117px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 26.190366,52.562035 5.593507,0 -0.17385,0"
+           id="path4480"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/border03.png"
+           inkscape:export-xdpi="224.71411"
+           inkscape:export-ydpi="224.71411" />
+      </g>
+    </g>
+    <g
+       id="g8491"
+       transform="translate(6.7991839,-178.33538)">
+      <path
+         inkscape:export-ydpi="585"
+         inkscape:export-xdpi="585"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
+         inkscape:connector-curvature="0"
+         id="path3968-0"
+         d="m 156.85227,271.91532 -15.38664,0.66321 0.13268,29.71214 24.67169,-0.13264 -1.59172,-26.66134 -6.36689,0.26529 z"
+         style="fill:url(#linearGradient11025);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="585"
+         inkscape:export-xdpi="585"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
+         inkscape:connector-curvature="0"
+         id="path4020"
+         d="m 161.934,285.22713 c -0.56275,-0.0938 -17.07035,0.37517 -17.07035,0.37517 l 0.28142,13.88138 17.16413,-1.3131 z"
+         style="fill:#ffffff;fill-opacity:0.59615383;stroke:none" />
+      <path
+         inkscape:export-ydpi="585.36584"
+         inkscape:export-xdpi="585.36584"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
+         sodipodi:nodetypes="cccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3835"
+         d="m 148.05997,289.07634 c -0.39339,2.20029 0.15578,6.1748 0.92132,7.4014 1.90847,0.18209 4.3431,-0.0229 6.39501,0.15527 -0.22564,-0.7018 -0.717,-1.29723 -1.42111,-1.99901 -1.02761,0.0755 -1.31086,0.0441 -2.33848,0.11927 -0.17547,-0.1253 -0.35086,-0.2506 -0.52633,-0.37598 1.93102,-2.29636 3.85558,-3.78119 7.2973,-4.40244 -0.36266,-0.95012 -0.96006,-2.36584 -2.05107,-2.81966 -3.5135,1.76698 -5.23867,3.86699 -6.41168,6.05663 -0.35086,-0.10025 -0.0492,-0.0569 -0.39984,-0.15679 0.11282,-1.1404 0.20195,-2.32861 0.8035,-3.05545 -0.31334,-0.32582 -1.88014,-1.2365 -2.26863,-0.9232 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="585.36584"
+         inkscape:export-xdpi="585.36584"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
+         sodipodi:nodetypes="ccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3857-2"
+         d="m 158.58799,270.97544 -18.43744,0.39793 0.13269,32.23236 26.92662,-0.39793 -1.98965,-28.51834 -5.30574,-0.13265 0.39789,-1.85701 -2.78551,-0.26528 0,3.31608 6.23424,0.13265 1.59172,25.06962 -22.41675,0.66321 -0.39789,-28.91628 14.06021,0.53058 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="585.36584"
+         inkscape:export-xdpi="585.36584"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3859-5"
+         d="m 144.2625,277.74026 17.90687,-1.06115 0.53057,6.23424 -18.03951,1.19379 -0.26529,-4.64252 0.76369,-0.13264 0.0937,3.99539 16.64481,-1.0839 -0.43677,-4.80068 -16.37009,1.17103 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="585.36584"
+         inkscape:export-xdpi="585.36584"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save_as.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3859-2-2"
+         d="m 162.3121,284.21389 -17.90281,1.12768 0.31877,14.70025 18.05062,-1.01218 -0.38813,-13.08808 -1.33271,0.0299 0.53838,12.13416 -16.14422,1.19227 -0.27692,-13.09886 17.00311,-0.89959 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g8481"
+       transform="translate(2.5447818,-180.96373)">
+      <path
+         inkscape:export-ydpi="882.76001"
+         inkscape:export-xdpi="882.76001"
+         inkscape:export-filename="/home/user/tupi/src/themes/default/icons/open_big.png"
+         sodipodi:nodetypes="ccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3815-4-6"
+         d="m 59.891059,275.7472 c 0.265287,9.28504 0.530574,19.60181 0.795861,28.88685 11.2747,-0.17685 22.549396,-0.35372 33.824092,-0.53057 -0.309516,-8.09126 -0.619032,-16.18251 -0.928505,-24.27376 -9.992472,0.35372 -19.520706,0.97272 -29.513179,1.32643 l -0.79586,2.65287 c 4.863588,-0.75165 23.85372,-2.03386 28.452031,-0.79586 0.504681,8.06252 1.71276,18.43527 0.39793,18.96802 -2.321257,0.88429 -19.631235,0.44214 -29.844788,0.79586 -0.176855,-8.31232 -0.353718,-16.99982 -0.530573,-25.31215 l 10.611482,0.24253 c -0.486345,1.41487 -0.972716,2.82973 -1.459078,4.24459 0.795861,-0.0884 2.851839,-0.17685 3.6477,-0.26528 0.04414,-1.79069 0.353744,-5.96896 -0.331587,-6.36689 -1.381241,-0.26399 -10.036719,-0.059 -14.325526,0.42735 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="882.76001"
+         inkscape:export-xdpi="882.76001"
+         inkscape:export-filename="/home/user/tupi/src/themes/default/icons/open_big.png"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="rect3927-9"
+         d="m 61.416461,277.29122 12.170039,-0.86218 -0.696378,4.84149 c 5.894977,0.11517 13.007533,-0.34225 19.697557,-0.53058 l 0.928504,21.88618 -31.701792,0.9285 z"
+         style="fill:url(#linearGradient11027);fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g8485"
+       transform="translate(3.4169404,-179.14646)">
+      <path
+         inkscape:export-ydpi="585.36584"
+         inkscape:export-xdpi="585.36584"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save.png"
+         sodipodi:nodetypes="ccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3857"
+         d="m 123.49361,271.78652 -18.43744,0.39793 0.13268,32.23236 26.92663,-0.39793 -1.98965,-28.51835 -5.30574,-0.13264 0.39789,-1.85701 -2.78552,-0.26529 0,3.31609 6.23425,0.13265 1.59172,25.06961 -22.41675,0.66322 -0.39789,-28.91628 14.06021,0.53058 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="585.36584"
+         inkscape:export-xdpi="585.36584"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3859"
+         d="m 109.16811,278.55133 17.90687,-1.06114 0.53058,6.23424 -18.03952,1.19379 -0.26528,-4.64252 0.76368,-0.13264 0.0937,3.99539 16.64481,-1.0839 -0.43677,-4.80069 -16.37009,1.17104 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="585.36584"
+         inkscape:export-xdpi="585.36584"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3859-2"
+         d="m 127.21771,285.02497 -17.9028,1.12768 0.31877,14.70025 18.05061,-1.01218 -0.38812,-13.08808 -1.33272,0.0299 0.53839,12.13417 -16.14422,1.19227 -0.27692,-13.09886 17.0031,-0.89959 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="585"
+         inkscape:export-xdpi="585"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/save.png"
+         inkscape:connector-curvature="0"
+         id="path3968"
+         d="m 121.90189,272.71502 -15.38665,0.66322 0.13265,29.71214 24.67169,-0.13265 -1.59173,-26.66133 -6.36688,0.26528 z"
+         style="fill:url(#linearGradient11029);fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g8515"
+       transform="translate(16.486725,-178.01853)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         inkscape:export-ydpi="672"
+         inkscape:export-xdpi="672"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
+         id="g4105">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient11031);fill-opacity:1;stroke:#009100;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 29.165006,2.4892737 c -0.659059,0 -1.193393,0.3622312 -1.193393,0.8091948 0,0.4469636 0.651809,0.7770301 1.178605,0.7965991 0.510703,0.018972 1.20818,-0.3496355 1.20818,-0.7965991 0,-0.4469636 -0.534335,-0.8091948 -1.193392,-0.8091948 z m 0.359004,0.2467288 c 0.15155,0 0.274385,0.1247738 0.274385,0.2787692 0,0.1539942 -0.122835,0.2790422 -0.274385,0.2790422 -0.151552,0 -0.274388,-0.125048 -0.274388,-0.2790422 0,-0.1539954 0.122836,-0.2787692 0.274388,-0.2787692 z m -0.802351,0.00956 c 0.151551,0 0.274387,0.1250478 0.274387,0.2790421 0,0.1539954 -0.122836,0.2787691 -0.274387,0.2787691 -0.151549,0 -0.27466,-0.1247737 -0.27466,-0.2787691 0,-0.1539943 0.123111,-0.2790421 0.27466,-0.2790421 z"
+           id="path3590"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
+           inkscape:export-xdpi="672.112"
+           inkscape:export-ydpi="672.112" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#008700;stroke-width:0.13144293;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 28.865802,2.5995374 C 28.821736,2.1022278 28.711535,1.1434229 28.327536,0.81607981"
+           id="path3593"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
+           inkscape:export-xdpi="672.112"
+           inkscape:export-ydpi="672.112" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#009100;stroke-width:0.13144293;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 28.197646,0.85616779 C 27.922209,1.1166523 27.70967,1.3247385 27.522021,1.5957247"
+           id="path3593-8"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
+           inkscape:export-xdpi="672.112"
+           inkscape:export-ydpi="672.112" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#008700;stroke-width:0.13144293;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 29.320799,2.5718004 C 29.49588,1.7705848 29.556495,1.4479294 29.679657,0.9647982"
+           id="path3593-6"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
+           inkscape:export-xdpi="672.112"
+           inkscape:export-ydpi="672.112" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#00a200;stroke-width:0.13144293;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 29.803628,0.94580505 c 0.233054,0.0830416 0.52952,0.51007285 0.659727,0.81287895"
+           id="path3593-8-3"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
+           inkscape:export-xdpi="672.112"
+           inkscape:export-ydpi="672.112" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 27.838285,1.9793329 c 0,-0.1736657 -0.198651,-0.3169069 -0.344131,-0.3095361 -0.150062,0.0076 -0.335735,0.1358704 -0.335735,0.3095361 0,0.1736654 0.152193,0.3144493 0.339933,0.3144493 0.18774,0 0.339933,-0.1407839 0.339933,-0.3144493 z"
+           id="path3590-3"
+           sodipodi:nodetypes="csssc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
+           inkscape:export-xdpi="672.112"
+           inkscape:export-ydpi="672.112" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 30.832243,2.1380846 c 0,-0.1736654 -0.19865,-0.316907 -0.34413,-0.3095361 -0.150064,0.0076 -0.335736,0.1358707 -0.335736,0.3095361 0,0.1736657 0.152193,0.3144492 0.339934,0.3144492 0.187739,0 0.339932,-0.1407835 0.339932,-0.3144492 z"
+           id="path3590-3-1"
+           sodipodi:nodetypes="csssc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/debug.png"
+           inkscape:export-xdpi="672.112"
+           inkscape:export-ydpi="672.112" />
+      </g>
+    </g>
+    <g
+       id="g8525"
+       transform="translate(23.366008,-178.04642)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         id="g4114">
+        <g
+           id="g4079"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exit.png"
+           inkscape:export-xdpi="805.34802"
+           inkscape:export-ydpi="805.34802"
+           transform="matrix(1.4995704,0,0,1.4995704,-15.669932,-1.3367182)">
+          <path
+             sodipodi:nodetypes="ccccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4075"
+             d="m 33.084537,1.6547926 0.258805,0.4205012 -0.254943,0.3604448 -0.487965,-0.07157 0.07602,-0.5409732 -1.309641,0.7983346 1.447979,0.836127 -0.206551,-0.7010146 0.768476,0.024922 0.310004,-0.6457882 0.154739,-0.2595721 -0.562293,-0.2816572 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4077"
+             d="m 31.908194,2.6179699 0.57665,-0.4252064 -0.142913,0.310307 0.161776,0.5056196 z"
+             style="fill:#ffffff;fill-opacity:0.62980772;stroke:none" />
+        </g>
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.29326926;stroke-dasharray:none"
+           d="m 33.234019,2.6400669 1.071708,0.022097 c 0.106803,-0.239385 0.445625,-0.9096633 0.552427,-1.1159028"
+           id="path4101"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exit.png"
+           inkscape:export-xdpi="805"
+           inkscape:export-ydpi="805" />
+      </g>
+    </g>
+    <g
+       id="g8499"
+       transform="translate(8.5517175,-178.3509)">
+      <path
+         inkscape:export-ydpi="1250.21"
+         inkscape:export-xdpi="1250.21"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_big.png"
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3837"
+         d="m 184.33093,275.43192 c -2.07726,1.25764 -5.26094,2.8314 -6.70595,4.2471 2.83139,2.53336 5.6628,5.06672 8.4942,7.60008 l -9.24454,6.22913 c 1.63239,2.30982 4.98434,5.91366 8.03928,7.11706 0,0 4.90008,-9.21646 5.0053,-9.32262 1.11766,3.05493 2.23532,6.10987 3.35298,9.1648 2.52431,-1.55787 6.47119,-5.64472 8.04714,-8.94127 -3.71274,-1.93198 -6.48757,-3.67637 -10.20031,-5.60835 -0.28038,-0.0549 5.62959,-4.23672 8.91335,-6.26129 -0.48121,-1.4157 -2.54305,-3.77977 -5.23711,-5.66965 -2.10702,2.1262 -4.21404,4.2524 -6.32107,6.3786 -1.38108,-1.64453 -2.76217,-3.28906 -4.14327,-4.93359 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="717"
+         inkscape:export-xdpi="717"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/close.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4103"
+         d="m 177.87744,293.80533 c 1.92398,2.13839 5.16106,4.83954 6.89746,5.57103 1.20582,-1.7377 4.00612,-7.5085 5.30574,-9.1524 1.19379,2.82973 2.57517,6.78497 3.58137,8.48918 1.50996,-0.52781 5.64612,-5.08873 6.49953,-6.36688"
+         style="fill:none;stroke:#ffffff;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g8532"
+       transform="translate(23.571559,-175.68358)">
+      <path
+         inkscape:export-ydpi="605.49915"
+         inkscape:export-xdpi="605.49915"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/create_folder.png"
+         sodipodi:nodetypes="ccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3815-4-6-0"
+         d="m 328.36146,272.53433 c 0.26529,9.28504 0.53058,18.57009 0.79586,27.85513 11.27471,-0.17683 22.5494,-0.35374 33.8241,-0.53057 -0.30952,-8.09126 -0.61903,-16.18251 -0.9285,-24.27376 -9.99248,0.35374 -20.84715,0.7074 -30.83962,1.06115 0.17683,0.97272 0.35375,1.94544 0.53058,2.91815 4.86358,-0.75163 23.85372,-2.03386 28.45203,-0.79586 0.50468,8.06252 1.71276,18.43526 0.39788,18.96802 -2.32125,0.88429 -19.63123,0.44212 -29.84479,0.79586 -0.17683,-8.31232 -0.35374,-16.62465 -0.53057,-24.93697 3.05081,-0.0442 7.56069,-0.0885 10.61149,-0.13269 -0.48635,1.41487 -0.97272,2.82973 -1.45908,4.24459 0.79586,-0.0885 2.85184,-0.17683 3.6477,-0.26528 0.0441,-1.79069 0.35374,-5.96896 -0.33159,-6.36689 -1.38124,-0.26402 -10.03672,0.97272 -14.32553,1.45908 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="605.49915"
+         inkscape:export-xdpi="605.49915"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/create_folder.png"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="rect3927-9-8"
+         d="m 329.88687,273.04663 12.17004,-0.86217 -0.69637,4.84148 c 5.89497,0.1152 13.00753,-0.3422 19.69755,-0.53058 l 0.92851,21.88618 -31.70179,0.9285 z"
+         style="fill:url(#linearGradient11033);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="605.49915"
+         inkscape:export-xdpi="605.49915"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/create_folder.png"
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4153"
+         d="m 363.45768,270.71111 -6.33027,-0.76198 0.95796,5.74347 -4.29888,-1.34734 -0.55783,6.69605 5.6588,-0.60624 -1.37326,5.31612 7.61976,0.46891 -1.57264,-5.7767 4.40953,0.64231 0.41028,-6.85779 -5.13127,1.16225 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:2.12203836;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9411"
+       transform="translate(-23.442875,-197.44308)">
+      <g
+         inkscape:export-ydpi="825.77319"
+         inkscape:export-xdpi="825.77319"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/crash.png"
+         transform="matrix(2.8047938,0,0,2.8047938,25.722948,716.81188)"
+         id="g3845">
+        <path
+           style="fill:#00a600;fill-opacity:0.3125;stroke:none"
+           d="m 8.0625,8.0496815 1.0625,4.4375005 -4.9375,-0.5625 3.0625,3.5625 -2.5,6.1875 5.5625,-3.4375 1.9375,2.375 3.0625,-2.6875 2.4375,3.3125 2.3125,-2.6875 4.875,2.3125 -2.5,-5.25 3.9375,-3.25 -5.0625,0.9375 0.75,-5.6250005 L 18.375,11.862182 15.6875,8.6121815 13.5625,12.237182 9.375,8.4246815 z"
+           id="path3075"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccccccccccccc" />
+        <path
+           style="fill:none;stroke:#43981a;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 15.316814,9.2217095 13.513086,11.939001 8.8278538,8.0309577"
+           id="path4324"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="fill:none;stroke:#43981a;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 8.127156,8.001362 0.972272,4.419417 -4.772971,-0.441942 3.093592,3.712311 -2.65165,5.92202 5.391689,-3.447146 1.944544,2.65165 3.093592,-2.65165 2.65165,3.270369 2.209709,-2.916816 4.772971,2.209709 -2.121321,-4.861359 3.712311,-3.889088 c 0,0 -4.861359,1.237437 -4.861359,0.883884 0,-0.353554 0.53033,-5.126524 0.53033,-5.126524 l -4.065864,3.977475 -2.298097,-2.916815"
+           id="path4322-0"
+           inkscape:connector-curvature="0" />
+        <text
+           xml:space="preserve"
+           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+           x="-0.19455156"
+           y="19.584993"
+           id="text4243"
+           sodipodi:linespacing="125%"
+           transform="matrix(0.95240857,-0.30482441,0.30482441,0.95240857,0,0)"><tspan
+             sodipodi:role="line"
+             id="tspan4245"
+             x="-0.19455156"
+             y="19.584993">B</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008800;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+           x="9.0016441"
+           y="16.314077"
+           id="text4243-4"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan4245-3"
+             x="9.0016441"
+             y="16.314077">0</tspan></text>
+        <g
+           transform="matrix(0.97003396,0.24296938,-0.24296938,0.97003396,-45,27.75)"
+           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+           id="text4243-2">
+          <path
+             d="m 57.427763,-26.726684 c 0.878907,-2.22656 1.186062,-3.627987 1.648302,-5.932679 l 2.333984,-0.380859 -0.332031,3.583984 0.908203,-3.310547 2.246094,-0.390625 c -0.266933,2.122401 -0.400396,4.036462 -0.400391,5.742188 -5e-6,0.338543 0.0033,0.673829 0.0098,1.005859 l -2.001953,0.351563 0.351562,-4.277344 -0.722389,2.703554 -1.074219,0.146484 0.08762,-3.982851 -1.023302,4.467836 -2.03125,0.273437"
+             id="path4320"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccccc"
+             style="fill:#008700;fill-opacity:1" />
+        </g>
+        <text
+           xml:space="preserve"
+           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+           x="16.930115"
+           y="10.638951"
+           id="text4243-4-1"
+           sodipodi:linespacing="125%"
+           transform="matrix(0.91529523,0.40278361,-0.40278361,0.91529523,0,0)"><tspan
+             sodipodi:role="line"
+             id="tspan4245-3-7"
+             x="16.930115"
+             y="10.638951">0</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+           x="23.373491"
+           y="19.620443"
+           id="text4243-2-8"
+           sodipodi:linespacing="125%"
+           transform="matrix(0.9986833,-0.05129977,0.05129977,0.9986833,0,0)"><tspan
+             sodipodi:role="line"
+             id="tspan4245-34-8"
+             x="23.373491"
+             y="19.620443">!</tspan></text>
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 3.39262,21.087195 c -0.766032,0.53033 -2.283365,1.193243 -0.574524,-0.397748 7.807637,-5.273838 18.178537,-3.38822 22.892582,-1.502602 -0.95287,0.328354 -2.609581,-0.873223 -8.441086,-1.546796 -1.845577,-0.192386 -3.861524,0.01609 -4.436692,0.143687 2.276533,-0.210729 4.113737,-0.07236 4.786454,0.06093 1.079346,0.239329 0.275237,0.480721 -0.305949,0.59348 C 13.779171,17.459699 6.972348,17.581124 3.39262,21.087195 z"
+           id="path4353"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+      </g>
+    </g>
+    <g
+       id="g8598"
+       transform="translate(4.2925075,-145.86462)">
+      <g
+         transform="matrix(14.103129,0,0,14.103129,1.9425027,228.8303)"
+         inkscape:export-ydpi="1375.1899"
+         inkscape:export-xdpi="1375.1899"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
+         id="g3961">
+        <g
+           id="g3919"
+           transform="translate(-0.171875,-0.59375)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
+           inkscape:export-xdpi="1200"
+           inkscape:export-ydpi="1200">
+          <path
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path3899"
+             d="M 3.6570679,6.5899207 C 3.2022362,6.3063414 2.3828026,6.5144224 1.7898641,6.8274644 1.7861812,6.7132961 1.7051586,6.5549337 1.6572815,6.5070566 1.5136504,6.7943187 1.3700194,7.4461829 1.3589708,7.7776391 1.8672039,7.6450566 2.5190679,7.6229596 2.8726213,7.6450566 2.6921618,7.4940598 2.5117022,7.3430631 2.3312427,7.1920663 2.649809,6.9729368 3.2390646,6.6985648 3.6570679,6.5899207 z"
+             style="fill:url(#linearGradient11035);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path3897"
+             d="m 1.6257457,6.4537659 c 0.057292,0.049479 0.1695009,0.139036 0.28148,0.2275777 C 2.2130817,6.4433307 3.1045105,6.0948323 3.9959394,6.6412659 3.2214587,6.6469346 2.7618617,6.9840588 2.5508568,7.2438436 2.7904401,7.4417603 2.8201012,7.5291915 3.0596845,7.7271082 2.5232909,7.6159786 1.9603842,7.6248254 1.2383568,7.9938436 1.2774198,7.4287394 1.4110646,6.6543634 1.6024709,6.4486342 c 0.083333,0.1354167 0.05082,0.152698 0.084434,0.2881147 C 1.5801345,7.0570614 1.4623151,7.3610311 1.4649193,7.6813436 1.8841135,7.4831017 2.1537597,7.481838 2.6281966,7.5156155 2.4713148,7.4165038 2.4028212,7.3284407 2.2348908,7.2624747 2.3714086,7.0017328 3.0990235,6.6028841 3.6111918,6.5686373 2.6434384,6.2651949 2.0041352,6.7928442 1.7696068,6.9938436 1.6758568,6.7021769 1.6432664,6.8548076 1.5495164,6.5631409 c 0.083333,0.020833 -0.0071,-0.130208 0.076229,-0.109375 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8604"
+       transform="translate(0.52891115,-151.58402)">
+      <g
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/redo_big.png"
+         inkscape:export-ydpi="791.24982"
+         inkscape:export-xdpi="791.24982"
+         id="g3961-5"
+         transform="matrix(-14.103129,0,0,14.103129,124.33271,234.5497)">
+        <g
+           id="g3919-3"
+           transform="translate(-0.171875,-0.59375)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
+           inkscape:export-xdpi="1200"
+           inkscape:export-ydpi="1200">
+          <path
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path3899-3"
+             d="M 3.6570679,6.5899207 C 3.2022362,6.3063414 2.3828026,6.5144224 1.7898641,6.8274644 1.7861812,6.7132961 1.7051586,6.5549337 1.6572815,6.5070566 1.5136504,6.7943187 1.3700194,7.4461829 1.3589708,7.7776391 1.8672039,7.6450566 2.5190679,7.6229596 2.8726213,7.6450566 2.6921618,7.4940598 2.5117022,7.3430631 2.3312427,7.1920663 2.649809,6.9729368 3.2390646,6.6985648 3.6570679,6.5899207 z"
+             style="fill:url(#linearGradient11037);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path3897-6"
+             d="m 1.6023082,6.4498596 c 0.08073,0.053385 0.1929384,0.1429423 0.3049175,0.231484 C 2.2130817,6.4433307 3.1045105,6.0948323 3.9959394,6.6412659 3.2214587,6.6469346 2.7618617,6.9840588 2.5508568,7.2438436 2.7904401,7.4417603 2.8201012,7.5291915 3.0596845,7.7271082 2.5232909,7.6159786 1.9603842,7.6248254 1.2383568,7.9938436 1.2774198,7.4287394 1.4227834,6.8535821 1.5868459,6.4447279 1.6701789,6.5801446 1.6532905,6.6013322 1.6869053,6.7367489 1.5801345,7.0570614 1.4623151,7.3610311 1.4649193,7.6813436 1.8841135,7.4831017 2.1537597,7.481838 2.6281966,7.5156155 2.4713148,7.4165038 2.4028212,7.3284407 2.2348908,7.2624747 2.3714086,7.0017328 3.0990235,6.6028841 3.6111918,6.5686373 2.6434384,6.2651949 2.0041352,6.7928442 1.7696068,6.9938436 1.6758568,6.7021769 1.6432664,6.8548076 1.5495164,6.5631409 1.6328494,6.5839739 1.5189789,6.4290266 1.6023082,6.4498596 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8612"
+       transform="translate(-4.3528493,-148.53305)">
+      <g
+         transform="matrix(14.103129,0,0,14.103129,13.381306,238.70227)"
+         id="g4195">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 9.7545757,5.6673457 C 9.7283513,5.5669215 9.3424413,5.1352863 9.2410043,5.1669413 9.1149559,5.2502011 8.6160804,5.8258729 8.2192047,6.2463646 8.1204594,6.3740539 7.9700527,6.7787043 7.9100532,6.9698165 7.9834743,6.9778922 8.4266549,6.841396 8.5692109,6.7499763 8.9559569,6.3837907 9.213184,6.1395545 9.5999299,5.7733689 9.5553221,5.7313308 9.5107143,5.6892928 9.4661065,5.6472548 9.1119442,6.0195182 8.8873006,6.2698323 8.5331383,6.6420957 8.4930653,6.671148 8.3250047,6.7662395 8.2266148,6.7752823 c -0.09839,0.00904 -0.08237,-0.1270532 -0.08237,-0.1270532 L 8.289521,6.3212958 c 0.3579985,-0.382787 0.5875755,-0.5591267 0.945574,-0.9419136 0.1387946,0.1195484 0.277589,0.239097 0.4163836,0.3586456 0.034366,-0.023561 0.068731,-0.047122 0.1030971,-0.070682 z"
+           id="path4007"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccsccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
+           inkscape:export-xdpi="1246.5846"
+           inkscape:export-ydpi="1246.5846" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 8.2768724,6.3353946 0.2368475,0.00842 0.027377,0.2792868"
+           id="path4009"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
+           inkscape:export-xdpi="1246.5846"
+           inkscape:export-ydpi="1246.5846" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 9.0445453,5.5573814 9.3333518,5.9371866 9.2743466,5.9823759 8.8922912,5.6807094 z"
+           id="path4011"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
+           inkscape:export-xdpi="1246.5846"
+           inkscape:export-ydpi="1246.5846" />
+        <path
+           style="fill:url(#linearGradient11039);fill-opacity:1;stroke:none"
+           d="M 8.2642565,6.2852899 8.9599573,5.5805976 9.2525543,5.9292239 8.530033,6.6924913 8.5378726,6.3522219 z"
+           id="path4013"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
+           inkscape:export-xdpi="1246.5846"
+           inkscape:export-ydpi="1246.5846" />
+      </g>
+    </g>
+    <g
+       id="g8631"
+       transform="translate(-28.956327,-149.12469)">
+      <g
+         transform="matrix(14.103129,0,0,14.103129,13.381306,238.70227)"
+         id="g4209">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 15.102452,5.7188282 C 14.922759,5.5516594 14.845744,5.5202054 14.666051,5.3530365 c 0.474363,-0.6572846 1.42799,-0.3962888 1.565973,0.04776 0.137983,0.4440489 -0.0959,0.7831853 -0.520636,0.8179535 l 0.05231,0.2699684 -0.539341,-0.050677 0.198344,-0.3892328 c 0.196424,0.063891 0.658985,0.032173 0.486097,-0.4063204 -0.172889,-0.4384939 -0.69034,-0.2162326 -0.80635,0.07634 z"
+           id="path4201"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cczcccczc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
+           inkscape:export-xdpi="975.18652"
+           inkscape:export-ydpi="975.18652" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           id="path4203"
+           sodipodi:cx="15.412718"
+           sodipodi:cy="6.7004056"
+           sodipodi:rx="0.39774758"
+           sodipodi:ry="0.28726214"
+           d="m 15.810465,6.7004056 c 0,0.1586505 -0.178077,0.2872621 -0.397747,0.2872621 -0.21967,0 -0.397748,-0.1286116 -0.397748,-0.2872621 0,-0.1586505 0.178078,-0.2872621 0.397748,-0.2872621 0.21967,0 0.397747,0.1286116 0.397747,0.2872621 z"
+           transform="matrix(0.99254032,0.12191684,-0.12191684,0.99254032,0.98031351,-1.5554444)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
+           inkscape:export-xdpi="975.18652"
+           inkscape:export-ydpi="975.18652" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:0.17894736;stroke:none"
+           id="path4205"
+           sodipodi:cx="15.746094"
+           sodipodi:cy="6.9090548"
+           sodipodi:rx="0.19140625"
+           sodipodi:ry="0.09375"
+           d="m 15.9375,6.9090548 c 0,0.051777 -0.08569,0.09375 -0.191406,0.09375 -0.105711,0 -0.191406,-0.041973 -0.191406,-0.09375 0,-0.051777 0.08569,-0.09375 0.191406,-0.09375 0.105711,0 0.191406,0.041973 0.191406,0.09375 z"
+           transform="matrix(0.95560751,0.29464264,-0.50334784,1.6324961,4.0042879,-8.9550306)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
+           inkscape:export-xdpi="975.18652"
+           inkscape:export-ydpi="975.18652" />
+        <path
+           style="fill:none;stroke:#fffeff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.15263157;stroke-dasharray:none"
+           d="m 15.697691,6.4444409 c -0.01289,-0.1160097 -0.02349,-0.1528315 -0.03638,-0.2688412 0.101278,-0.011049 0.235702,-0.044194 0.303835,-0.066291"
+           id="path4207"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
+           inkscape:export-xdpi="975.18652"
+           inkscape:export-ydpi="975.18652" />
+      </g>
+    </g>
+    <g
+       id="g8638"
+       transform="translate(-28.74182,-146.49976)">
+      <path
+         inkscape:export-ydpi="583.88239"
+         inkscape:export-xdpi="583.88239"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/news_mode.png"
+         sodipodi:nodetypes="zcccccccccccz"
+         inkscape:connector-curvature="0"
+         id="path4277"
+         d="m 274.87944,309.08366 c 1.03841,2.60283 0.95309,6.29685 1.12332,8.84873 0.91909,5.5346 7.0463,-1.55764 8.88446,-1.39194 3.40402,-0.43082 6.1953,4.20895 6.94419,8.05334 -2.51897,0.53026 -6.26339,1.06053 -9.19084,2.18733 -1.68551,6.90905 9.02891,8.70086 13.99049,5.26947 -1.59989,6.36313 -32.91545,13.88709 -36.8023,-8.37574 -1.99044,1.7203 -5.62045,0.80702 -6.16508,-1.21461 -0.10297,-1.22361 5.62945,-1.00604 6.05209,-3.02574 -2.51896,-1.49136 -7.43091,-3.32141 -6.06931,-5.01161 2.48492,-0.79539 5.50994,-1.07737 6.72627,-0.18256 0,0 3.74661,-6.45454 6.99201,-6.3765 -1.74076,-3.81744 6.47624,-1.38301 7.5147,1.21983 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="583.88239"
+         inkscape:export-xdpi="583.88239"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/news_mode.png"
+         sodipodi:nodetypes="cczc"
+         inkscape:connector-curvature="0"
+         id="path4289"
+         d="m 260.74402,323.46025 c 13.44874,-3.85593 14.51714,10.98525 26.95668,12.62135 -2.72683,1.27252 -10.72734,2.62681 -17.37382,-0.0778 -6.64648,-2.70466 -8.59601,-9.32323 -9.58286,-12.5435 z"
+         style="fill:#ffffff;fill-opacity:0.07211537;stroke:none" />
+    </g>
+    <g
+       id="g8642"
+       transform="translate(-30.342774,-148.99476)">
+      <g
+         inkscape:export-ydpi="994.16998"
+         inkscape:export-xdpi="994.16998"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette_big.png"
+         transform="matrix(0,8.4891828,-8.4891828,0,382.91248,19.740031)"
+         id="g4827">
+        <path
+           style="fill:#009aff;fill-opacity:1;stroke:none"
+           d="m 34.260023,5.0859996 1.440663,0.1038316 -0.05192,1.6353479 -1.349809,-0.090852 z"
+           id="rect4291"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
+           inkscape:export-xdpi="1017.6678"
+           inkscape:export-ydpi="1017.6678" />
+        <path
+           style="fill:#009a00;fill-opacity:1;stroke:none"
+           d="m 37.225713,5.1768518 -1.245978,-0.038936 -0.02597,1.7521584 1.427683,-0.2076624 z"
+           id="rect4291-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
+           inkscape:export-xdpi="1017.6678"
+           inkscape:export-ydpi="1017.6678" />
+        <path
+           style="fill:#ff5900;fill-opacity:1;stroke:none"
+           d="m 35.759092,7.0198629 -1.440663,0.1038316 -0.194685,1.5834321 1.59641,-0.038936 z"
+           id="rect4291-8-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
+           inkscape:export-xdpi="1017.6678"
+           inkscape:export-ydpi="1017.6678" />
+        <path
+           style="fill:#e89aff;fill-opacity:1;stroke:none"
+           d="m 35.966757,7.0717787 1.466621,-0.012975 0.298516,1.6223689 -1.700241,-0.077874 z"
+           id="rect4291-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
+           inkscape:export-xdpi="1017.6678"
+           inkscape:export-ydpi="1017.6678" />
+      </g>
+    </g>
+    <g
+       id="g8649"
+       transform="translate(-32.13571,-146.09836)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         id="g5236">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 42.140214,6.7965104 41.096336,6.5417208 41.229606,7.7484091 42.484654,7.5995063 42.266616,7.301418 41.502271,7.4346763 41.402792,7.017865 42.238932,7.109192 z"
+           id="path4350"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 41.218515,7.7809647 c 0.05954,-0.1151733 0.04532,-0.5732844 -0.0103,-0.9705059 C 41.064512,5.919346 40.386246,6.3888145 40.04495,6.4021871 c -0.431697,-0.028427 0.0081,-1.1549823 -0.0615,-1.5055589 -0.148936,0.2997617 -0.639902,0.7059498 -0.657937,1.0325403 -0.252944,0.7792545 -0.03399,1.7892681 0.372616,2.0762826 0.406616,0.2870147 1.202493,0.3349163 1.520354,-0.2244814 z"
+           id="path4352"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccczc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
+        <path
+           style="fill:#ffffff;fill-opacity:0.47058824;stroke:none"
+           d="m 39.636532,6.7186813 c 0.0462,0.7665583 0.590039,0.4550748 0.883299,0.1166901 0.388395,-0.1370162 0.687126,1.0741156 0.03376,1.1784466 -0.159485,0.081196 -0.539285,-0.1136201 -0.742394,-0.3328225 -0.05079,-0.054806 0.39559,0.3442611 0.723802,-0.056815 -0.42545,0.1313461 -0.881874,-0.056526 -0.944807,-0.3554733 -0.03442,-0.1634874 -0.03034,-0.3485938 0.04633,-0.5500258 z"
+           id="path4354"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccscsc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.16613059;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 41.808079,6.854845 c -0.0091,0.2233194 0.09177,0.5475912 0.238617,0.6974905"
+           id="path4364"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
+      </g>
+    </g>
+    <g
+       id="g8473"
+       transform="translate(-3.2567176,-179.11508)">
+      <path
+         inkscape:export-ydpi="597.56848"
+         inkscape:export-xdpi="597.56848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3121"
+         d="m 46.958321,276.16378 c 1.436972,0.35372 0.129655,1.96381 -1.019941,1.82011 l -16.888881,0.52196 -0.279447,23.22123 18.007332,-0.0342 1.195182,-23.45376 c 0.221082,-1.37065 1.595712,-0.18223 1.949428,0.96735 l -0.825282,24.49882 c 0,0 -22.445841,0.31388 -22.304913,0.34672 l -0.44816,-27.88829 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="597.56848"
+         inkscape:export-xdpi="597.56848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3759-9"
+         d="m 49.110142,277.05368 c 0.992228,-1.3509 1.633159,-2.64326 2.976682,-4.05271 -0.0037,0.0808 2.188417,1.98631 2.188417,1.98631 -2.072995,1.09865 -3.443399,1.3776 -5.165099,2.0664 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="597.56848"
+         inkscape:export-xdpi="597.56848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+         inkscape:transform-center-y="1.9509752"
+         inkscape:transform-center-x="0.91815024"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3759-9-2"
+         d="m 48.542942,276.86166 c -0.479853,-1.59104 -0.959707,-3.18207 -1.439559,-4.77311 -0.968166,0.0454 -2.352549,0.74395 -2.702916,1.13148 1.873257,1.38839 2.76165,2.42775 4.142475,3.64163 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="597.56848"
+         inkscape:export-xdpi="597.56848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3759-6"
+         d="m 49.942268,277.72035 c 1.403187,0.73852 3.52643,1.53243 4.209562,2.21556 0.0034,0.0685 -1.550892,2.32633 -1.550892,2.32633 -0.775446,-1.01546 -1.772447,-3.02793 -2.65867,-4.54189 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="597.56848"
+         inkscape:export-xdpi="597.56848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect3927"
+         d="m 27.327086,277.02593 21.620887,1.26012 -0.265287,24.67168 -21.090313,0.39793 z"
+         style="fill:url(#linearGradient11041);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:transform-center-y="-0.08535887"
+         inkscape:transform-center-x="-0.11381181"
+         inkscape:export-ydpi="597.56848"
+         inkscape:export-xdpi="597.56848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3759"
+         d="m 47.307443,278.60196 c -0.09712,0.11498 -4.326838,2.27728 -4.326838,2.27728 0.759094,0.68318 1.518189,1.82183 1.594099,2.39115 0.910912,-1.55615 1.195573,-2.71377 2.732739,-4.66843 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g8537"
+       transform="translate(1.0686392,-179.09767)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,22.56241,223.83679)"
+         id="g4224">
+        <path
+           style="fill:url(#linearGradient11043);fill-opacity:1;stroke:none"
+           d="m 45.002411,6.7387535 4.09375,-0.03125 -0.01563,2.328125 -4.109375,0.0625 z"
+           id="rect3928"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
+           inkscape:export-xdpi="583.88239"
+           inkscape:export-ydpi="583.88239" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 45.53477,6.6649749 -0.210939,-0.6976682 3.456535,-0.051776 -0.05658,0.6968828"
+           id="path3906-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           inkscape:export-xdpi="583.88239"
+           inkscape:export-ydpi="583.88239" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 44.879183,6.573351 -0.0221,2.7400384 4.441515,-0.0221 -0.08839,-2.7621355 -3.999572,-0.022097 0,0.3756505 3.71231,-0.1546796 0.04419,2.298097 -3.756504,0 -0.0442,-2.4748737 z"
+           id="path3132"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
+           inkscape:export-xdpi="583.88239"
+           inkscape:export-ydpi="583.88239" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 46.608118,7.9674974 -0.02187,0.725183 1.126721,0.004 0,-0.773398 -0.375651,-0.0221 0.0221,0.441942 -0.419844,-0.04419 -0.0221,-0.331457 z"
+           id="path3902"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
+           inkscape:export-xdpi="583.88239"
+           inkscape:export-ydpi="583.88239" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 46.58602,7.9564484 1.115902,-0.03315"
+           id="path3985"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+      </g>
+    </g>
+    <g
+       id="g8656"
+       transform="translate(-43.471077,-152.12224)">
+      <g
+         inkscape:export-ydpi="799"
+         inkscape:export-xdpi="799"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library.png"
+         transform="matrix(0,8.4891828,-8.4891828,0,475.74039,-66.83291)"
+         id="g4371">
+        <path
+           sodipodi:nodetypes="scscs"
+           inkscape:connector-curvature="0"
+           id="path4204"
+           d="m 46.726563,8.6434331 c -0.664468,0 -1.820313,0.1232635 -2.007814,-0.1484375 -0.01031,-0.3455895 1.163658,-0.3671875 1.828126,-0.3671875 0.558752,0 1.497092,0.038055 1.624768,0.1533009 0.437732,0.3918372 -0.780612,0.3623241 -1.44508,0.3623241 z"
+           style="fill:#008700;fill-opacity:0.43269234;stroke:none" />
+        <g
+           id="g4144"
+           transform="matrix(0.95243881,0,0,1.2224944,-5.2816729,3.4051066)">
+          <path
+             inkscape:export-ydpi="583.88239"
+             inkscape:export-xdpi="583.88239"
+             inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="rect3928-0"
+             d="m 53.071592,2.4983545 2.315893,-0.017679 -0.0088,1.3170537 -2.324732,0.035357 z"
+             style="fill:url(#linearGradient11045);fill-opacity:1;stroke:none" />
+          <path
+             inkscape:export-ydpi="583.88239"
+             inkscape:export-xdpi="583.88239"
+             inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
+             inkscape:connector-curvature="0"
+             id="path3132-2"
+             d="m 53.001881,2.4047839 -0.0125,1.550079 2.512629,-0.012502 -0.05,-1.5625796 -2.262616,-0.012501 0,0.2125109 2.100107,-0.087505 0.025,1.3000664 -2.125108,0 -0.02501,-1.4000715 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           id="path4140-2"
+           sodipodi:cx="54.977551"
+           sodipodi:cy="2.8499913"
+           sodipodi:rx="0.9722718"
+           sodipodi:ry="0.9722718"
+           d="m 55.949822,2.8499913 c 0,0.5369709 -0.435301,0.9722718 -0.972271,0.9722718 -0.536971,0 -0.972272,-0.4353009 -0.972272,-0.9722718 0,-0.5369709 0.435301,-0.9722718 0.972272,-0.9722718 0.53697,0 0.972271,0.4353009 0.972271,0.9722718 z"
+           transform="matrix(0.6656206,0,0,0.6656206,11.046434,5.8557945)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:url(#linearGradient11047);fill-opacity:1;stroke:#008700;stroke-width:0.30047148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           id="path4140"
+           sodipodi:cx="54.977551"
+           sodipodi:cy="2.8499913"
+           sodipodi:rx="0.9722718"
+           sodipodi:ry="0.9722718"
+           d="m 55.949822,2.8499913 c 0,0.5369709 -0.435301,0.9722718 -0.972271,0.9722718 -0.536971,0 -0.972272,-0.4353009 -0.972272,-0.9722718 0,-0.5369709 0.435301,-0.9722718 0.972272,-0.9722718 0.53697,0 0.972271,0.4353009 0.972271,0.9722718 z"
+           transform="matrix(0.6656206,0,0,0.6656206,11.01578,5.8612866)" />
+        <g
+           id="g4150"
+           transform="matrix(-1.4043648,0.03338636,0.03338636,1.4043648,121.08734,-0.1589198)">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4148"
+             d="M 53.804739,3.5818324 53.34375,4.6824949 54.4273,4.7256384 z"
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             sodipodi:nodetypes="cccc" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4142"
+             d="m 53.733355,3.5196701 -0.591586,1.3059784 1.413838,-0.03288 -0.612329,-1.2068077 -0.110476,0.1375425 0.504143,0.9226537 -0.940554,0.014349 0.502693,-1.162932 z"
+             style="fill:#008700;fill-opacity:1;stroke:none"
+             sodipodi:nodetypes="ccccccccc" />
+        </g>
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 46.988951,6.3880713 -0.0046,-0.4165133 0.95234,-0.012944 -0.03582,1.1821384"
+           id="path4206"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+    <g
+       id="g8673"
+       transform="translate(-65.62856,-151.98617)">
+      <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="rect3928-2"
+         d="m 461.05461,322.11275 2.21643,-3.16149 c 9.38358,0.46424 18.77038,0.61327 28.1625,0.71151 l 4.09228,2.74749 -0.32029,18.0756 -34.88524,0.53058 z"
+         style="fill:url(#linearGradient11049);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4327"
+         d="m 464.71423,322.96806 -0.49169,15.22277 28.23839,-0.34299 -0.9929,-14.29426 z"
+         style="fill:none;stroke:#008700;stroke-width:0.84891832;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccccccccccccc"
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
+         inkscape:connector-curvature="0"
+         id="path3132-4"
+         d="m 459.4069,325.28677 -0.0552,17.55702 37.70483,-0.18761 -0.65655,-21.66621 -4.89425,-2.64092 -28.62389,-0.29609 -3.95473,6.20091 3.0508,-0.26253 2.6691,-3.56609 26.522,-0.0459 2.79235,2.29891 0.28133,17.7269 -31.88965,0 -0.50782,-15.30599 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0"
+         id="path4303"
+         d="m 486.48717,330.69598 c 0,4.09492 -3.5567,7.4145 -7.94412,7.4145 -4.38741,0 -7.94411,-3.31958 -7.94411,-7.4145 0,-4.09492 3.04529,-7.43895 7.41451,-7.8382 3.47754,-0.31776 8.90572,1.73517 8.89985,7.4181"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:1.91738439;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+      <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
+         transform="matrix(6.8883176,0,0,6.8883176,108.11928,279.74165)"
+         sodipodi:open="true"
+         sodipodi:end="6.2342569"
+         sodipodi:start="0"
+         d="m 54.491418,7.3577971 c 0,0.3661166 -0.30669,0.6629127 -0.68501,0.6629127 -0.37832,0 -0.68501,-0.2967961 -0.68501,-0.6629127 0,-0.3661165 0.30669,-0.6629126 0.68501,-0.6629126 0.365297,0 0.666324,0.2774004 0.68419,0.6304903"
+         sodipodi:ry="0.66291261"
+         sodipodi:rx="0.68500972"
+         sodipodi:cy="7.3577971"
+         sodipodi:cx="53.806408"
+         id="path4325"
+         style="fill:url(#linearGradient11051);fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
+         sodipodi:nodetypes="cccsccccc"
+         inkscape:connector-curvature="0"
+         id="path4329"
+         d="m 484.76987,319.08646 -1.21931,-6.47173 7.22206,0.0938 c 0,0 -0.93793,6.8469 -1.4069,6.8469 -0.46894,0 -2.06344,-0.56276 -2.06344,-0.56276 l 0.93793,-3.93931 -1.96965,-0.0938 0.56275,4.22069 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4341"
+         d="m 488.06421,322.19105 4.50989,0.0663 0.0662,2.52023 -3.6477,0.26529 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g8811"
+       transform="translate(7.3627143,-120.94308)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,74.518822,268.4427)"
+         inkscape:export-ydpi="900"
+         inkscape:export-xdpi="900"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/play_small.png"
+         id="g4488">
+        <g
+           id="g4436"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
+           inkscape:export-xdpi="900"
+           inkscape:export-ydpi="900"
+           transform="translate(0.01562501,0.03906137)">
+          <g
+             transform="matrix(0.86458333,0,0,1,0.54589844,0)"
+             inkscape:export-ydpi="799"
+             inkscape:export-xdpi="799"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
+             id="g4401">
+            <path
+               style="fill:#008700;fill-opacity:1;stroke:none"
+               d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
+               id="path4387"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccccccccc" />
+            <path
+               style="fill:#008700;fill-opacity:0.3942308;stroke:none"
+               d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
+               id="path4389"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
+               d="m 1.1269514,11.335273 2.662699,-0.806544"
+               id="path4399"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+          </g>
+        </g>
+        <rect
+           style="fill:#ffffff;fill-opacity:0;stroke:none"
+           id="rect4472"
+           width="2.8125"
+           height="2.546875"
+           x="1.234375"
+           y="8.9715576" />
+      </g>
+    </g>
+    <g
+       id="g8804"
+       transform="translate(2.0329671,-119.81952)">
+      <g
+         transform="matrix(-7.3396059,0,0,8.4891828,88.351378,267.65074)"
+         inkscape:export-ydpi="1008"
+         inkscape:export-xdpi="1008"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
+         id="g4401-5">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
+           id="path4387-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc" />
+        <path
+           style="fill:#008700;fill-opacity:0.3942308;stroke:none"
+           d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
+           id="path4389-7"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
+           d="M 1.2805659,9.2180855 3.825795,10.520916"
+           id="path4399-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+      </g>
+      <path
+         inkscape:export-ydpi="1008"
+         inkscape:export-xdpi="1008"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
+         sodipodi:nodetypes="ccccc"
+         style="fill:#ffffff;fill-opacity:0;stroke:none"
+         d="m 82.639418,343.6793 -26.130766,0 -0.0663,21.22296 26.197088,-0.39789 z"
+         id="rect4472-8"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g8820"
+       transform="translate(15.776924,-121.54193)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,34.000202,267.31719)"
+         id="g4714">
+        <rect
+           style="fill:#ffffff;fill-opacity:0;stroke:none"
+           id="rect4472-8-7"
+           width="2.8125"
+           height="2.546875"
+           x="-11.546796"
+           y="9.1746817"
+           transform="scale(-1,1)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
+           inkscape:export-xdpi="900"
+           inkscape:export-ydpi="900" />
+        <g
+           id="g4586"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
+           inkscape:export-xdpi="900"
+           inkscape:export-ydpi="900">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4576"
+             d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+             style="fill:url(#linearGradient11053);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4574"
+             d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.56088,0.0073 0.07364,0.9981615 -1.0868434,0.04956 0.017018,-1.0805781 1.5655594,-0.051051 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8827"
+       transform="translate(21.607815,-120.1886)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         id="g4720">
+        <g
+           transform="matrix(0.33765768,0,0,1,10.445758,-0.00244945)"
+           id="g4586-3"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4576-9"
+             d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+             style="fill:url(#linearGradient11055);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4574-3"
+             d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.769116,0.0073 0.07364,0.9981615 -0.6935087,0.03393 0.017018,-1.0805781 1.3804607,-0.035426 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           transform="matrix(0.30793803,0,0,1,11.526216,-0.05122005)"
+           id="g4586-3-5"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4576-9-9"
+             d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+             style="fill:url(#linearGradient11057);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4574-3-5"
+             d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.814584,0.030738 0.07364,0.9981625 -0.6555468,0.0105 0.017018,-1.0805786 1.3879668,-0.035426 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g4436-4"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176"
+           transform="matrix(0.81929493,0,0,0.81929493,13.891593,1.9839848)">
+          <g
+             transform="matrix(0.86458333,0,0,1,0.54589844,0)"
+             inkscape:export-ydpi="799"
+             inkscape:export-xdpi="799"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
+             id="g4401-52">
+            <path
+               style="fill:#008700;fill-opacity:1;stroke:none"
+               d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
+               id="path4387-2"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccccccccc" />
+            <path
+               style="fill:#008700;fill-opacity:0.3942308;stroke:none"
+               d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
+               id="path4389-0"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
+               d="m 1.1269514,11.335273 2.662699,-0.806544"
+               id="path4399-0"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+          </g>
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8790"
+       transform="translate(-4.9428747,-121.85107)">
+      <g
+         inkscape:export-ydpi="1018"
+         inkscape:export-xdpi="1018"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/rw.png"
+         id="g4720-8"
+         transform="matrix(-8.4891828,0,0,8.4891828,170.24188,267.85414)">
+        <g
+           transform="matrix(0.33765768,0,0,1,10.445758,-0.00244945)"
+           id="g4586-3-8"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4576-9-7"
+             d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+             style="fill:url(#linearGradient11059);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4574-3-2"
+             d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.769116,0.0073 0.07364,0.9981615 -0.6935087,0.03393 0.017018,-1.0805781 1.3804607,-0.035426 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           transform="matrix(0.30793803,0,0,1,11.526216,-0.05122005)"
+           id="g4586-3-5-2"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4576-9-9-4"
+             d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+             style="fill:url(#linearGradient11061);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4574-3-5-9"
+             d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.814584,0.030738 0.07364,0.9981625 -0.6555468,0.0105 0.017018,-1.0805786 1.3879668,-0.035426 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g4436-4-7"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176"
+           transform="matrix(0.81929493,0,0,0.81929493,13.891593,1.9839848)">
+          <g
+             transform="matrix(0.86458333,0,0,1,0.54589844,0)"
+             inkscape:export-ydpi="799"
+             inkscape:export-xdpi="799"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
+             id="g4401-52-7">
+            <path
+               style="fill:#008700;fill-opacity:1;stroke:none"
+               d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
+               id="path4387-2-9"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccccccccc" />
+            <path
+               style="fill:#008700;fill-opacity:0.3942308;stroke:none"
+               d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
+               id="path4389-0-2"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
+               d="m 1.1269514,11.335273 2.662699,-0.806544"
+               id="path4399-0-0"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+          </g>
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8841"
+       transform="translate(20.735747,-118.65314)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,15.616753,266.56684)"
+         inkscape:export-ydpi="1084"
+         inkscape:export-xdpi="1084"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/loop.png"
+         id="g4823">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 19.553223,9.2036448 c 0.01027,0.0026 0.36352,0.1295764 0.36352,0.1295764 0.736883,-0.1478626 0.868423,0.5197788 0.541513,1.1704668 -0.32691,0.650688 -0.923244,0.460998 -1.123593,0.272327 -0.200348,-0.188671 -0.110361,-0.44965 -0.04548,-0.619313 l 0.325838,0.2601 -0.08642,-0.9565095 -0.883939,0.5596905 0.441407,0.0625 c -0.170922,0.385494 -0.239344,0.64453 0.135931,0.980144 0.375275,0.335614 1.507425,0.185638 1.703125,-0.640625 0.1957,-0.8262635 -0.203608,-1.4235592 -1.371902,-1.2183572 z"
+           id="path4819"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cczzccccczzc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/loop.png"
+           inkscape:export-xdpi="1084.8734"
+           inkscape:export-ydpi="1084.8734" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.19711537;stroke-dasharray:none"
+           d="m 19.119505,10.125456 c -0.150997,0.369206 -0.128635,0.570741 0.01838,0.749076 0.506889,0.614879 1.366431,0.14378 1.589182,-0.185599 0.222752,-0.329379 0.30936,-1.1214277 -0.226495,-1.3755444"
+           id="path4821"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cszc" />
+      </g>
+    </g>
+    <g
+       id="g8862"
+       transform="translate(24.563563,-124.92256)">
+      <path
+         inkscape:export-ydpi="846.08673"
+         inkscape:export-xdpi="846.08673"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import.png"
+         sodipodi:nodetypes="ccscccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4847"
+         d="m 290.65194,360.11176 -1.27977,0.59255 c 0.0535,-4.16885 -4.62443,-4.63878 -6.84285,-2.60654 -2.21841,2.03224 -1.06254,7.76046 3.94859,6.95321 1.19027,2.66191 4.86467,4.74107 6.8308,5.63034 l 11.94829,-0.0458 c 2.57701,-1.46276 4.35816,-1.46644 4.54758,-3.72506 l 1.48188,-18.80415 -5.82851,7.12829 c -1.2833,-1.1711 -5.48475,-1.94421 -7.43127,-1.12559 l -4.74459,-5.31288 0.84026,6.81357 c -2.81381,0.21223 -4.53153,2.68873 -3.47039,4.5021 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="846.08673"
+         inkscape:export-xdpi="846.08673"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import.png"
+         transform="matrix(11.004496,0,0,11.004496,-51.493389,238.58667)"
+         d="m 31.78125,10.92469 c 0,0.198478 -0.160898,0.359375 -0.359375,0.359375 -0.198477,0 -0.359375,-0.160897 -0.359375,-0.359375 0,-0.198477 0.160898,-0.359375 0.359375,-0.359375 0.198477,0 0.359375,0.160898 0.359375,0.359375 z"
+         sodipodi:ry="0.359375"
+         sodipodi:rx="0.359375"
+         sodipodi:cy="10.92469"
+         sodipodi:cx="31.421875"
+         id="path4359-4"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.06171429;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="846.08673"
+         inkscape:export-xdpi="846.08673"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import.png"
+         transform="matrix(11.004496,0,0,11.004496,-43.561035,238.58667)"
+         d="m 31.78125,10.92469 c 0,0.198478 -0.160898,0.359375 -0.359375,0.359375 -0.198477,0 -0.359375,-0.160897 -0.359375,-0.359375 0,-0.198477 0.160898,-0.359375 0.359375,-0.359375 0.198477,0 0.359375,0.160898 0.359375,0.359375 z"
+         sodipodi:ry="0.359375"
+         sodipodi:rx="0.359375"
+         sodipodi:cy="10.92469"
+         sodipodi:cx="31.421875"
+         id="path4359-4-2"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.06171429;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g8867"
+       transform="translate(25.121196,-128.19305)">
+      <path
+         inkscape:export-ydpi="705.26117"
+         inkscape:export-xdpi="705.26117"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/today_tip.png"
+         sodipodi:nodetypes="cczzzcccczzzccc"
+         inkscape:connector-curvature="0"
+         id="path5165"
+         d="m 326.71341,369.69692 c 0.26529,-2.56444 0.0662,-2.14441 0.33168,-4.70885 -2.56444,-0.39788 -5.98976,-1.82239 -6.05194,-6.13516 -0.062,-4.31277 4.44694,-6.5766 8.37263,-6.69378 3.92568,-0.11715 10.04966,2.79447 9.34665,7.05285 -0.70299,4.25839 -4.56612,5.6823 -7.13056,5.94758 0.17683,2.82973 0.28744,1.61384 0.46427,4.44357 l 1.35586,-0.12463 -0.15213,-2.55574 c 3.36568,-1.04368 6.87473,-2.58264 7.79908,-7.6331 0.92434,-5.05046 -6.53664,-9.79999 -11.8386,-9.97102 -5.30196,-0.17103 -11.21712,5.15334 -10.76964,9.45654 0.44746,4.3032 2.47324,6.27586 6.47677,7.72551 l -0.66793,3.50839 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="705.26117"
+         inkscape:export-xdpi="705.26117"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/today_tip.png"
+         sodipodi:nodetypes="cccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path5167"
+         d="m 334.52938,368.92274 -10.77169,-0.10747 -0.30399,3.06218 7.97201,-0.3304 -0.24423,0.49161 -6.90781,-0.10748 -0.47717,1.61167 6.80272,-0.10738 -0.35273,0.43515 -6.1219,-0.43532 3.41772,2.47122 3.05682,0.10748 2.03789,-1.18189 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="705.26117"
+         inkscape:export-xdpi="705.26117"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/today_tip.png"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4614"
+         d="m 328.41676,363.82583 -2.6262,-5.81518 7.40965,-0.0938 -4.31449,7.50345"
+         style="fill:none;stroke:#008700;stroke-width:0.67913461;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="705"
+         inkscape:export-xdpi="705"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/today_tip.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4651"
+         d="m 323.7271,369.35962 10.50482,0.18761"
+         style="fill:none;stroke:#008600;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g8873"
+       transform="translate(18.081966,-129.47855)">
+      <path
+         inkscape:export-ydpi="541.99011"
+         inkscape:export-xdpi="541.99011"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/properties.png"
+         sodipodi:nodetypes="cccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4653-8"
+         d="m 356.49112,352.99418 3.18735,12.56438 9.55665,3.72536 4.91414,-3.30472 12.17863,13.90917 c 7.78239,3.84936 11.83838,-4.83053 9.0869,-8.28324 l -19.20044,-8.34207 2.4339,-10.27091 -7.4139,-5.94586 -11.29679,1.47247 6.24092,4.98989 2.83818,-2.07956 4.46354,1.51564 -0.37319,6.6016 -6.53057,4.36391 -3.8777,-1.87033 0.15705,-3.99978 z"
+         style="fill:url(#linearGradient11063);fill-opacity:1;stroke:#008600;stroke-width:1.27337742;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g8888"
+       transform="translate(13.190327,-131.4855)">
+      <path
+         inkscape:export-ydpi="1054.48"
+         inkscape:export-xdpi="1054.48"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil_big.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3266"
+         d="m 409.4925,369.00837 8.34759,-9.84828 20.63448,-8.25379 -2.43863,20.25931 -7.58781,9.84161 -3.1046,-0.64984 7.78483,-9.56691 3.04022,-16.35885 -15.80275,5.88621 -9.65402,11.59816 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="1054.48"
+         inkscape:export-xdpi="1054.48"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil_big.png"
+         sodipodi:nodetypes="cccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4036"
+         d="m 418.02767,361.97389 6.28414,1.3131 0,4.87724 6.37793,-1.3131 0.56275,3.75172 3.93931,0.37514 -7.40965,9.37931 -6.38216,-0.90132 0.017,-3.27988 -4.36463,0.63609 -6.52824,-6.39698 z"
+         style="fill:url(#linearGradient11065);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="1054.48"
+         inkscape:export-xdpi="1054.48"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil_big.png"
+         inkscape:connector-curvature="0"
+         id="path4046"
+         d="m 417.18353,361.59872 7.22207,1.68827 0,4.68966 6.00276,-1.12552 0.65655,4.31448 3.09518,0"
+         style="fill:none;stroke:#008700;stroke-width:0.84891832;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="1054.48"
+         inkscape:export-xdpi="1054.48"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil_big.png"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4050"
+         d="m 429.96603,356.51132 c -0.33159,1.90122 3.51505,4.59831 5.37205,3.71401 0.37582,-2.1665 0.75164,-4.33302 1.12748,-6.49953 -2.16651,0.92851 -4.33302,1.85701 -6.49953,2.78552 z"
+         style="fill:#006000;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g8894"
+       transform="translate(3.5489906,-131.55198)">
+      <path
+         inkscape:export-ydpi="1152.0601"
+         inkscape:export-xdpi="1152.0601"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
+         inkscape:connector-curvature="0"
+         id="path4054"
+         d="m 481.29952,352.383 -21.76,11.44276 0.28141,2.62621 5.06483,2.90758 -8.25379,4.1269 5.06482,2.72 1.59449,4.31448 3.75172,-9.4731 5.06483,4.68966 2.34483,-0.56275 z"
+         style="fill:url(#linearGradient11067);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="1152.0601"
+         inkscape:export-xdpi="1152.0601"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
+         sodipodi:nodetypes="ccccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4052"
+         d="m 482.33125,350.88232 -23.58483,12.34103 0.28133,3.37656 4.32116,2.44804 -7.54506,5.01069 4.29839,3.46092 4.1108,3.6446 3.16231,-8.18633 4.0739,3.87966 3.68344,-0.34025 6.5969,-22.42321 -2.06344,0.56275 -5.72527,20.0093 -1.92885,-0.3135 -4.96494,-4.00092 -3.38069,8.29346 -1.82896,-3.18897 -3.23587,-1.40687 7.19638,-4.80035 -3.39362,-2.46137 -1.40691,-2.43863 20.39586,-11.21552 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g8545"
+       transform="translate(-3.8959689,-180.29337)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,-37.657731,264.69098)"
+         id="g4124">
+        <rect
+           style="fill:url(#linearGradient11069);fill-opacity:1;stroke:#008700;stroke-width:0.2291861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           id="rect4085"
+           width="3.3303607"
+           height="1.1280254"
+           x="58.436684"
+           y="1.1410999"
+           ry="0.19695681"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/fillcolor.png"
+           inkscape:export-xdpi="603.55609"
+           inkscape:export-ydpi="603.55609" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 62.698115,1.5171084 62.545921,3.048 60.15672,3.1325854 60.138815,3.6800413 59.888143,3.6621366 59.861286,2.855056 62.29525,2.779423 62.390106,1.8361682 61.892384,1.8125439 61.758099,1.5260613 z"
+           id="path4091"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/fillcolor.png"
+           inkscape:export-xdpi="603.55609"
+           inkscape:export-ydpi="603.55609" />
+        <g
+           id="g4110"
+           transform="translate(-0.04419417,0.4308932)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/fillcolor.png"
+           inkscape:export-xdpi="603.55609"
+           inkscape:export-ydpi="603.55609">
+          <path
+             sodipodi:nodetypes="ccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4087"
+             d="m 59.618426,4.3103141 -0.161146,-1.1817408 1.342887,-0.053715 -0.429724,1.2533615 -0.286483,-0.017905 0.340199,-0.9668789 -0.662491,0 0.125332,0.9310685 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4096"
+             d="m 59.6875,4.2684313 c 0.03906,0 0.523438,-0.023437 0.523438,-0.023437 l 0.375,-1.0234375 -0.875,0.085937 z"
+             style="fill:url(#linearGradient11071);fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8553"
+       transform="translate(-0.82098034,-180.18128)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,8.863649,229.42477)"
+         inkscape:export-ydpi="658.9682"
+         inkscape:export-xdpi="658.9682"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/contour.png"
+         id="g4162">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 58.669474,8.6452196 2.493949,-2.0797213 -0.581828,-0.4571348 -2.380856,2.2886704 0.238099,0.021231 2.162844,-2.0573612 0.223788,0.1346521 -2.279981,1.998131 z"
+           id="path4350-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 60.572168,6.0896414 c 0.02468,0.075067 0.230045,0.2644386 0.426589,0.4098084 0.448998,0.3178823 0.534306,-0.1775847 0.674181,-0.3317646 0.19665,-0.1756624 0.498986,0.4965611 0.681205,0.615937 C 62.287318,6.5908705 62.320201,6.2038953 62.185824,6.0566354 61.954807,5.6139515 61.421961,5.278048 61.123531,5.3324103 60.825098,5.3867762 60.464517,5.7125538 60.572179,6.0896256 z"
+           id="path4352-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccczc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
+        <path
+           style="fill:#ffffff;fill-opacity:0.47058824;stroke:none"
+           d="M 61.709601,5.8549091 C 61.356408,5.5477799 61.259757,5.9173276 61.281776,6.1893518 61.175583,6.416802 60.521191,6.0297499 60.754713,5.700984 c 0.03276,-0.1040419 0.279637,-0.1860986 0.461698,-0.1808832 0.04552,0.00128 -0.318631,0.025135 -0.284258,0.3391259 0.124477,-0.2411496 0.401046,-0.359504 0.557957,-0.2592689 0.08581,0.054817 0.164598,0.1356089 0.219497,0.2549489 z"
+           id="path4354-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccscsc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.1012539;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 60.723378,6.7414563 C 60.630114,6.6421671 60.445989,6.5476234 60.318094,6.5475161"
+           id="path4364-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 58.203125,8.4012433 0.03516,0.3398437 0.445313,-0.1054687 -0.0078,-0.125 -0.3125,-0.1484375 z"
+           id="path4160"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+      </g>
+    </g>
+    <g
+       id="g8621"
+       transform="translate(-21.443237,-152.05755)">
+      <path
+         inkscape:export-ydpi="818.79968"
+         inkscape:export-xdpi="818.79968"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4095"
+         d="m 185.15301,322.36897 c 1.98326,2.42397 4.07668,8.81445 4.29704,12.23006"
+         style="fill:none;stroke:#008700;stroke-width:2.82062578;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="818.79968"
+         inkscape:export-xdpi="818.79968"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4095-6"
+         d="m 189.88133,335.3341 4.24195,-6.77611 3.24283,6.7015 3.16494,-3.11509"
+         style="fill:none;stroke:#008700;stroke-width:2.82062578;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="818.79968"
+         inkscape:export-xdpi="818.79968"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4095-6-6"
+         d="m 189.18527,335.60575 -4.16982,2.49576 -2.12029,-4.65689 -2.67905,1.73493"
+         style="fill:none;stroke:#008700;stroke-width:2.82062578;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="818.79968"
+         inkscape:export-xdpi="818.79968"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4095-6-4"
+         d="m 185.75015,323.38354 6.62186,0.9926 1.43594,-3.57766"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="818.79968"
+         inkscape:export-xdpi="818.79968"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4095-6-4-3"
+         d="m 185.52932,323.24457 -5.63754,3.09986 2.09618,2.49652"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="818.79968"
+         inkscape:export-xdpi="818.79968"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
+         transform="matrix(7.9848749,0,0,7.9848749,29.008769,269.53019)"
+         sodipodi:open="true"
+         sodipodi:end="6.2342569"
+         sodipodi:start="0"
+         d="m 19.773437,6.2254639 c 0,0.2178936 -0.176637,0.3945312 -0.394531,0.3945312 -0.217893,0 -0.394531,-0.1766376 -0.394531,-0.3945312 0,-0.2178936 0.176638,-0.3945313 0.394531,-0.3945313 0.210393,0 0.383769,0.1650943 0.394059,0.3752352"
+         sodipodi:ry="0.39453125"
+         sodipodi:rx="0.39453125"
+         sodipodi:cy="6.2254639"
+         sodipodi:cx="19.378906"
+         id="path4598"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="818.79968"
+         inkscape:export-xdpi="818.79968"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
+         transform="matrix(-1.4671153,2.7274203,-3.3169579,-1.6014465,243.07198,277.40718)"
+         sodipodi:open="true"
+         sodipodi:end="6.2342569"
+         sodipodi:start="0"
+         d="m 19.773437,6.2254639 c 0,0.2178936 -0.176637,0.3945312 -0.394531,0.3945312 -0.217893,0 -0.394531,-0.1766376 -0.394531,-0.3945312 0,-0.2178936 0.176638,-0.3945313 0.394531,-0.3945313 0.210393,0 0.383769,0.1650943 0.394059,0.3752352"
+         sodipodi:ry="0.39453125"
+         sodipodi:rx="0.39453125"
+         sodipodi:cy="6.2254639"
+         sodipodi:cx="19.378906"
+         id="path4598-9"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="818.79968"
+         inkscape:export-xdpi="818.79968"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
+         transform="matrix(1.4671154,2.7786636,3.3169579,-1.6315349,133.20641,285.78363)"
+         sodipodi:open="true"
+         sodipodi:end="6.2342569"
+         sodipodi:start="0"
+         d="m 19.773437,6.2254639 c 0,0.2178936 -0.176637,0.3945312 -0.394531,0.3945312 -0.217893,0 -0.394531,-0.1766376 -0.394531,-0.3945312 0,-0.2178936 0.176638,-0.3945313 0.394531,-0.3945313 0.210393,0 0.383769,0.1650943 0.394059,0.3752352"
+         sodipodi:ry="0.39453125"
+         sodipodi:rx="0.39453125"
+         sodipodi:cy="6.2254639"
+         sodipodi:cx="19.378906"
+         id="path4598-9-2"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g8686"
+       transform="translate(-50.403701,-150.00064)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,34.750547,229.0496)"
+         id="g4210">
+        <path
+           style="fill:url(#linearGradient11073);fill-opacity:1;stroke:none"
+           d="m 56.421875,13.596557 0.514055,-0.747319 -0.56093,-2.424556 2.65625,-0.01563 0.03125,2.34375 0.25,0.78125 z"
+           id="path4073"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
+           inkscape:export-xdpi="470.28806"
+           inkscape:export-ydpi="470.28806" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 59.598652,10.304258 -3.504902,-0.0046 -0.125,1.234375 0.59375,0.09375 -0.08728,-0.410176 0.4375,0.04687 -0.0625,0.140625 0.491632,-0.100547 -0.04955,-0.51327 0.613951,0.102115 0.03773,1.307329 0.4375,-0.234375 -0.0221,-1.244829 0.183384,0.07355 0.17031,0.651998 0.490387,0.08002 -0.01563,-0.515625 0.109375,0 0.21875,0.3125 0.25,0 z"
+           id="path4064"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
+           inkscape:export-xdpi="470.28806"
+           inkscape:export-ydpi="470.28806" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 56.234375,10.737182 0.491172,2.051126 -0.491172,0.933249 3.40625,0.0625 -0.277229,-0.93999 -0.144646,-2.31001 -0.179688,0.02343 -0.179687,0.02344 0.183709,2.12251 0.183708,0.75249 -2.601792,0 0.390625,-0.609375 -0.421875,-2.265625 z"
+           id="path4066"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
+           inkscape:export-xdpi="470.28806"
+           inkscape:export-ydpi="470.28806" />
+        <path
+           style="fill:none;stroke:#004b00;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 56.679028,10.528729 C 56.736999,8.62825 58.65689,8.6473144 58.778251,10.418245"
+           id="path4131"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
+           inkscape:export-xdpi="470.28806"
+           inkscape:export-ydpi="470.28806" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 56.890625,12.799682 c 0.117188,-0.03906 0.234375,-0.140625 0.375,-0.171875"
+           id="path4208"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
+           inkscape:export-xdpi="470"
+           inkscape:export-ydpi="470" />
+      </g>
+    </g>
+    <g
+       id="g8996"
+       transform="translate(-12.863667,-92.74169)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         id="g4330">
+        <path
+           sodipodi:type="arc"
+           style="fill:url(#linearGradient11075);fill-opacity:1;stroke:#008700;stroke-width:0.48670816;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4227"
+           sodipodi:cx="0.9375"
+           sodipodi:cy="12.471557"
+           sodipodi:rx="1.515625"
+           sodipodi:ry="1.890625"
+           d="m 2.453125,12.471557 c 0,1.044163 -0.6785684,1.890625 -1.515625,1.890625 -0.83705657,0 -1.515625,-0.846462 -1.515625,-1.890625 0,-1.044164 0.67856843,-1.890625 1.515625,-1.890625 0.8326241,0 1.5093424,0.83785 1.5155824,1.876455"
+           sodipodi:start="0"
+           sodipodi:end="6.2756908"
+           sodipodi:open="true"
+           transform="matrix(-0.40843576,0.79784217,-0.67078462,-0.34339177,12.174183,18.302799)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478.02069"
+           inkscape:export-ydpi="478.02069" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 2.6128964,15.72286 -0.4241288,0.65382 0.4384136,0.223158 0.3660673,-0.673829 z"
+           id="path4229"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478.02069"
+           inkscape:export-ydpi="478.02069" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 1.9404663,16.101159 1.2267026,0.861431 -0.204936,0.314437 -0.2783296,-0.219831 -0.4622049,0.997603 -1.1096529,-0.679111 0.6536897,-0.796767 -0.3761518,-0.223419 0.2920539,-0.308125 0.2057024,0.158526 -0.086507,0.130351 0.4477842,0.325187 -0.6992561,0.645753 0.3939934,0.243915 0.3881413,-0.80822 0.3222082,0.150978 0.051865,-0.08732 -0.8083818,-0.49483 z"
+           id="path4231"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478.02069"
+           inkscape:export-ydpi="478.02069" />
+        <path
+           style="fill:#008700;fill-opacity:0.50480772;stroke:none"
+           d="m 1.9997864,16.251873 c -0.066291,-0.01105 -0.3756505,0.0442 -0.3756505,0.0442 l 0.3425048,0.287262 -0.5524271,0.718155 0.6187184,0.45299 0.4087961,-0.850738 0.3314563,0.07734 0.055243,-0.110485 z"
+           id="path4241"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478"
+           inkscape:export-ydpi="478" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:0.50480772;stroke:none"
+           id="path4243"
+           sodipodi:cx="2.9610097"
+           sodipodi:cy="14.218942"
+           sodipodi:rx="0.8175922"
+           sodipodi:ry="0.86178637"
+           d="m 3.7786019,14.218942 c 0,0.475951 -0.3660485,0.861786 -0.8175922,0.861786 -0.4515437,0 -0.8175922,-0.385835 -0.8175922,-0.861786 0,-0.475952 0.3660485,-0.861787 0.8175922,-0.861787 0.3269274,0 0.6224252,0.205283 0.7513422,0.521959"
+           sodipodi:start="0"
+           sodipodi:end="5.8778476"
+           sodipodi:open="true"
+           transform="matrix(0.71794871,0,0,0.71794871,1.0685925,4.2756359)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+           inkscape:export-xdpi="478"
+           inkscape:export-ydpi="478" />
+      </g>
+    </g>
+    <g
+       id="g9006"
+       transform="translate(-2.2420675,-81.758834)">
+      <path
+         inkscape:export-ydpi="923.27002"
+         inkscape:export-xdpi="923.27002"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/hand_big.png"
+         sodipodi:nodetypes="cccsccczccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4245"
+         d="m 79.323331,395.14496 c -4.211185,-1.73639 -3.77961,-4.41072 -5.645967,-5.58435 -4.1295,-2.50169 -8.446585,2.87524 -4.509878,5.43838 1.792028,1.01828 3.771642,1.40345 5.417119,1.92345 1.405117,0.44407 2.487848,1.73758 3.412291,2.7324 0.508459,0.92855 1.404009,2.33212 1.591721,2.52023 2.343693,3.47669 5.850334,1.3261 7.494357,0.72956 2.741341,2.82974 5.644048,0.0858 5.836313,-2.1223 0.192263,-2.20854 0.265287,-3.49293 -2.188617,-6.56585 3.095014,-2.12229 6.58796,-3.84666 9.68297,-5.96895 1.50882,-3.1259 -2.985125,-7.94007 -5.040448,-5.43839 -1.901223,2.78552 -3.802447,5.57103 -5.70367,8.35654 -0.574786,-0.26528 -1.149577,-0.53057 -1.724365,-0.79586 1.591722,-4.24459 3.183443,-8.48918 4.775165,-12.73377 0.812109,-3.32291 -7.567502,-9.27203 -7.693322,-2.65287 0.04423,4.64252 -0.05229,9.75401 -0.008,14.39653 l -1.87172,-0.35103 c 0.08843,0.53055 -1.790037,-8.2092 -3.028043,-13.51494 -0.346893,-6.01349 -11.198612,-4.52353 -8.356539,0.53057 3.316087,5.7921 8.887113,14.45814 8.887113,14.45814 1.215902,1.87911 0.309499,4.81935 -1.326434,4.64251 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="923.27002"
+         inkscape:export-xdpi="923.27002"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/hand_big.png"
+         sodipodi:nodetypes="ccssccc"
+         inkscape:connector-curvature="0"
+         id="path4247"
+         d="m 80.050917,396.31518 c 0.575439,-0.56691 1.615131,-1.33284 2.057931,-2.03241 1.045908,-0.12335 7.255761,0.82107 7.963082,1.34276 0.707318,0.52166 -4.087892,0.62056 -3.667285,1.43231 0.841219,1.62343 1.160877,3.47188 1.166488,4.12516 -0.50728,0.28651 -0.351334,0.50663 -0.858614,0.79306 -0.116285,-2.90667 -4.193823,-6.42827 -6.661602,-5.66088 z"
+         style="fill:#ffffff;fill-opacity:0.09134617;stroke:none" />
+    </g>
+    <g
+       id="g9010"
+       transform="translate(-0.85387064,-74.02583)">
+      <g
+         inkscape:export-ydpi="1100.9"
+         inkscape:export-xdpi="1100.9"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes_big.png"
+         transform="matrix(4.0177827,0,0,4.0177827,69.970127,323.26996)"
+         id="g4322">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 13.101792,13.380488 0.195083,2.153569 2.90625,-0.21875 -0.242188,-2.445312 -2.704561,-0.1048 -0.132812,0.515625 2.501436,-0.02801 c 0,0 0.15625,1.703125 0.04687,1.65625 -0.109375,-0.04687 -1.96875,0.09375 -1.96875,0.09375 l -0.08081,-1.50615 z"
+           id="path4249"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes.png"
+           inkscape:export-xdpi="812.59094"
+           inkscape:export-ydpi="812.59094" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 11.516735,14.664665 C 13.567097,15.57523 10.946641,13.581272 13.5,14.440307"
+           id="path4292"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes.png"
+           inkscape:export-xdpi="812.59094"
+           inkscape:export-ydpi="812.59094" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 15.96875,14.049548 c 1.222237,-0.901935 0.585886,1.736206 2.049881,-0.682004"
+           id="path4292-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes.png"
+           inkscape:export-xdpi="812.59094"
+           inkscape:export-ydpi="812.59094" />
+        <path
+           style="fill:url(#linearGradient11077);fill-opacity:1;stroke:none"
+           d="m 13.359375,13.018431 2.421875,0.05469 0.15625,1.992187 -2.40625,0.234375 z"
+           id="path4312"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes.png"
+           inkscape:export-xdpi="812.59094"
+           inkscape:export-ydpi="812.59094" />
+      </g>
+    </g>
+    <g
+       id="g9019"
+       transform="translate(3.9538324,-78.745932)">
+      <path
+         inkscape:export-ydpi="1042.52"
+         inkscape:export-xdpi="1042.52"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/polyline_big.png"
+         sodipodi:nodetypes="czczcscczzczcc"
+         inkscape:connector-curvature="0"
+         id="path4337"
+         d="m 182.0189,382.2031 c -1.90788,1.93747 -4.4346,4.64313 -4.87952,2.24828 -0.44492,-2.39484 -0.0975,-4.32306 -0.75588,-7.98528 -0.85812,-4.34664 -6.40851,-4.52849 -8.22113,-1.21186 -1.81261,3.31666 -0.82531,12.60829 -3.39345,15.23158 -2.79347,1.70917 -5.45561,0.47115 -4.20217,-2.36677 1.655,-3.74708 11.88702,-17.3925 -4.29011,-13.43227 -0.51758,0.8754 -1.55443,5.29804 -1.80677,6.83666 14.52248,-6.65589 -1.58805,7.98207 1.14551,11.39468 2.73355,3.41261 9.13136,4.70781 12.53595,3.13873 3.40459,-1.56909 2.0776,-10.51493 3.1164,-15.77239 2.34298,-2.15296 0.66843,8.63629 3.27723,9.76734 2.60877,1.13105 6.17198,-0.15815 9.23952,-1.87585 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="1042.52"
+         inkscape:export-xdpi="1042.52"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/polyline_big.png"
+         sodipodi:nodetypes="czczcscczzzzcc"
+         inkscape:connector-curvature="0"
+         id="path4337-1"
+         d="m 180.79313,383.37217 c -3.10167,3.79448 -5.23046,4.44416 -5.67538,1.65134 -0.44492,-2.79278 0.43329,-4.63191 -0.2253,-8.29412 -0.85813,-4.34665 -5.08208,-4.13057 -6.8947,-0.81395 -1.81262,3.31667 -1.22325,13.66945 -3.79139,16.29273 -4.29416,3.39745 -9.76571,-1.47618 -2.71561,-10.32813 1.88578,-2.36775 3.53049,-8.34252 -5.70562,-6.36057 -0.51759,0.87541 -0.2186,1.44862 -0.4709,2.98725 10.92226,-3.13337 -0.34211,10.46621 -0.26138,13.08296 0.0806,2.61674 7.27436,4.30987 11.07687,2.74079 3.80252,-1.56908 0.40799,-15.16896 4.84077,-17.36411 4.43275,-2.19515 2.32649,10.13894 4.66998,12.13217 2.34349,1.99322 4.77923,-0.15816 6.52034,-1.47797 z"
+         style="fill:#ffffff;fill-opacity:0.19230772;stroke:none" />
+    </g>
+    <g
+       id="g9023"
+       transform="translate(-5.8262457,-93.20403)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         inkscape:export-ydpi="544.11847"
+         inkscape:export-xdpi="544.11847"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/eraser.png"
+         id="g4397">
+        <path
+           style="fill:url(#linearGradient11079);fill-opacity:1;stroke:none"
+           d="m 23.190893,17.544554 0.0221,-0.939125 1.005417,0.06629 0.01105,0.950175 z"
+           id="path4382"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:url(#linearGradient11081);fill-opacity:1;stroke:none"
+           d="m 22.634699,13.754198 2.22458,0.115064 -0.409118,1.444699 -1.431914,-0.102279 z"
+           id="path4363"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 22.826473,15.403456 -0.409118,-1.789892 2.646483,0.127849 -0.485827,1.777108 -1.431914,-0.115065 -0.12785,-0.485828 1.29128,0.281269 c 0,0 0.447473,-1.21457 0.319623,-1.227355 -0.127849,-0.01279 -1.968881,-0.115064 -1.892172,-0.06393 0.07671,0.05114 0.332409,1.598118 0.332409,1.598118 z"
+           id="path4359"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 22.788123,15.460316 0.02712,0.361612 0.216968,-0.01808 0.01356,0.239568 -0.239569,-0.04972 0.0452,0.253129 0.180806,-0.009 0.009,0.207928 -0.171766,-0.03616 0.0452,0.262169 1.595616,-0.0045 0,-0.226007 -0.257648,0.02712 0.05424,-0.248609 0.235048,0.01808 0.02712,-0.316411 -0.226008,0.07232 0.03617,-0.216968 0.27121,0.02712 -0.02712,-0.221489 z"
+           id="path4361"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccccccccc" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 22.974512,17.527586 0.02114,-0.969535 1.422756,0.03906 -0.01885,1.148437 -0.409698,-0.07868 0.01395,-0.851007 -0.631289,0.0078 0.05424,0.805473 z"
+           id="path4380"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc" />
+      </g>
+    </g>
+    <g
+       id="g9043"
+       transform="translate(-26.682904,-91.96933)">
+      <g
+         id="g9035">
+        <path
+           style="fill:url(#linearGradient11083);fill-opacity:1;stroke:none"
+           d="m 272.62784,411.73323 25.20226,-1.06115 -1.06115,-25.73284 -26.52869,-0.26529 z"
+           id="path4501-7"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
+           inkscape:export-xdpi="913.15002"
+           inkscape:export-ydpi="913.15002" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:3.39567327;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 272.79745,388.96233 -0.93793,21.38483"
+           id="path4445"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
+           inkscape:export-xdpi="913.15002"
+           inkscape:export-ydpi="913.15002"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:3.39567327;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 298.96573,384.64785 -1.31311,25.93242"
+           id="path4445-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
+           inkscape:export-xdpi="913.15002"
+           inkscape:export-ydpi="913.15002" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:3.39567327;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 300.76503,385.56969 -29.96161,-1.00897"
+           id="path4445-1-2"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
+           inkscape:export-xdpi="913.15002"
+           inkscape:export-ydpi="913.15002"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:3.39567327;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 297.74642,411.00371 -21.38483,0.56275"
+           id="path4445-1-2-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
+           inkscape:export-xdpi="913.15002"
+           inkscape:export-ydpi="913.15002" />
+        <path
+           style="fill:url(#linearGradient11085);fill-opacity:1;stroke:none"
+           d="m 273.15841,384.93924 25.20226,1.06115 -1.06114,25.73284 -26.5287,0.26528 z"
+           id="path4501"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
+           inkscape:export-xdpi="913.15002"
+           inkscape:export-ydpi="913.15002" />
+      </g>
+    </g>
+    <g
+       id="g9056"
+       transform="translate(-49.935872,-98.99899)">
+      <path
+         inkscape:export-ydpi="836.16998"
+         inkscape:export-xdpi="836.16998"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ellipse_big.png"
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0"
+         id="path4545"
+         d="m 376.17944,399.78751 c 1.72437,15.33588 -7.73021,20.82503 -16.44779,20.82503 -8.71758,0 -15.78457,-6.94823 -15.78457,-15.51929 0,-8.57107 7.06699,-15.51929 15.78457,-15.51929 6.31172,0 12.01664,3.69679 14.50554,9.39958"
+         style="fill:url(#linearGradient11087);fill-opacity:1;stroke:#008700;stroke-width:4.24459124;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="836.16998"
+         inkscape:export-xdpi="836.16998"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ellipse_big.png"
+         transform="matrix(6.6525633,0,0,7.0198872,96.047189,288.89032)"
+         sodipodi:open="true"
+         sodipodi:end="5.8778476"
+         sodipodi:start="0"
+         d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
+         sodipodi:ry="0.078125"
+         sodipodi:rx="0.0625"
+         sodipodi:cy="15.221559"
+         sodipodi:cx="41.859375"
+         id="path4556"
+         style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g9062"
+       transform="translate(-50.673839,-99.48242)">
+      <path
+         inkscape:export-ydpi="712.18268"
+         inkscape:export-xdpi="712.18268"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4558"
+         d="m 395.35398,410.96372 3.23797,8.02299 25.47647,-22.95851 -3.73403,-3.86155 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="712.18268"
+         inkscape:export-xdpi="712.18268"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4558-0"
+         d="m 396.37108,413.29745 1.29208,3.68038 26.45915,-21.01004 -1.69747,-1.27389 z"
+         style="fill:#ffffff;fill-opacity:0.17307691;stroke:none" />
+    </g>
+    <g
+       id="g8989"
+       transform="translate(250.65233,-173.33505)">
+      <g
+         id="g8985">
+        <path
+           style="fill:url(#linearGradient11089);fill-opacity:1;stroke:none"
+           d="m 470.23194,416.81888 2.95448,0.85586 0.56275,3.1538 -12.61517,1.66482 -0.14067,-4.73655 2.6262,-0.32828 0.70341,-17.77379 c 0,0 -10.59862,3.28276 -10.03586,1.78207 0.56275,-1.50069 2.43862,-8.72276 2.43862,-8.72276 l 23.26069,-0.0938 2.62621,7.12828 -0.56275,1.78206 -12.38069,-2.72 z"
+           id="path4582"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccscccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/text.png"
+           inkscape:export-xdpi="583.30957"
+           inkscape:export-ydpi="583.30957" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 456.00348,391.82495 -3.99132,6.52855 1.82384,5.12164 9.22492,-2.49389 -1.78206,15.76963 -1.71495,0.59687 0.53058,6.83114 14.57468,-1.97636 -0.16214,-5.37401 -2.78551,-0.92851 -0.43677,-15.44939 8.83675,2.03907 1.79288,-2.40011 -1.86506,-5.77666 -3.67517,0.18761 2.53355,5.79194 -10.54111,-2.62734 1.1777,20.03283 2.92603,0.52353 0.25298,2.35253 -10.7962,1.32851 0.084,-3.03287 2.28794,-0.64119 0.81802,-20.29812 -9.76492,1.99356 1.6977,-5.70951 22.83958,-0.86782 -0.80206,-1.91286 z"
+           id="path4580"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccccccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/text.png"
+           inkscape:export-xdpi="583.30957"
+           inkscape:export-ydpi="583.30957" />
+      </g>
+    </g>
+    <g
+       id="g8948"
+       transform="translate(-0.89746854,-135.51875)">
+      <path
+         inkscape:export-ydpi="667.39081"
+         inkscape:export-xdpi="667.39081"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0"
+         id="path4545-6"
+         d="m 528.91581,360.50024 c 8.34343,2.99865 8.7766,9.26438 6.5667,13.75867 -2.20989,4.49428 -7.58349,6.37626 -12.00223,4.20349 -4.41877,-2.17276 -6.20939,-7.57747 -3.99947,-12.07176 1.60001,-3.25396 4.95206,-5.25796 8.52302,-5.09545"
+         style="fill:url(#linearGradient11091);fill-opacity:1;stroke:#008700;stroke-width:3.39567327;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="667.39081"
+         inkscape:export-xdpi="667.39081"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
+         transform="matrix(1.6864176,-3.4296827,3.6190539,1.7795338,400.73032,476.80815)"
+         sodipodi:open="true"
+         sodipodi:end="5.8778476"
+         sodipodi:start="0"
+         d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
+         sodipodi:ry="0.078125"
+         sodipodi:rx="0.0625"
+         sodipodi:cy="15.221559"
+         sodipodi:cx="41.859375"
+         id="path4556-7"
+         style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="667.39081"
+         inkscape:export-xdpi="667.39081"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4630"
+         d="m 495.31459,356.05278 c 9.675,1.63447 13.70796,23.98228 14.29607,27.87446 0.22106,-5.1731 1.35456,-8.79446 6.49953,-11.51171"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.69783656, 1.69783656;stroke-dashoffset:0" />
+      <path
+         inkscape:export-ydpi="667.39081"
+         inkscape:export-xdpi="667.39081"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4630-8"
+         d="m 531.41474,381.65075 c 2.82958,0.59959 4.70696,-1.63129 4.54798,-2.93313"
+         style="fill:none;stroke:#008700;stroke-width:0.84891832;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="667.39081"
+         inkscape:export-xdpi="667.39081"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4630-8-9"
+         d="m 534.56636,358.00108 c 1.23785,0.19627 2.51834,1.83025 2.55833,2.93313"
+         style="fill:none;stroke:#008700;stroke-width:0.84891832;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9066"
+       transform="translate(339.45062,-150.13303)">
+      <path
+         inkscape:export-ydpi="484.84848"
+         inkscape:export-xdpi="484.84848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4758-1-6"
+         d="m 75.644255,436.55267 -25.006862,-0.0229 -0.530574,32.63029 13.997453,-1.03839 0,-2.65287 -11.079296,1.30367 1.061147,-28.12042 19.135605,0.011 -0.05756,5.30859 2.860571,0.26817 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="484.84848"
+         inkscape:export-xdpi="484.84848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
+         inkscape:connector-curvature="0"
+         id="path4760-0-1"
+         d="m 55.918216,446.5907 8.731367,-0.57412 c 0,0 0.47075,1.87586 0.09558,1.78207 -0.375137,-0.0938 -9.671083,-0.0823 -9.671083,-0.0823 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="484.84848"
+         inkscape:export-xdpi="484.84848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
+         inkscape:connector-curvature="0"
+         id="path4760-7-43-0"
+         d="m 56.303124,451.16764 7.811963,0.0868 c 0,0 0.99369,1.82601 0.626154,1.70575 -0.367497,-0.12029 -9.360269,-0.73016 -9.360269,-0.73016 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="484.84848"
+         inkscape:export-xdpi="484.84848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
+         inkscape:connector-curvature="0"
+         id="path4760-7-3-5-5"
+         d="m 56.500243,457.39271 7.847453,0.91541 c 0,0 0.484393,-1.75149 0.102745,-1.6891 -0.381589,0.0628 -8.698271,-0.41775 -8.698271,-0.41775 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="484.84848"
+         inkscape:export-xdpi="484.84848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4758-1"
+         d="m 87.582172,443.31741 -25.006866,-0.0229 -0.530574,32.63029 27.659736,-1.83425 -2.06069,-26.44157 -2.89735,0.4254 1.774596,23.3633 -21.558135,2.09953 1.061148,-28.12042 21.558135,0.55341 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="484.84848"
+         inkscape:export-xdpi="484.84848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
+         inkscape:connector-curvature="0"
+         id="path4760-0"
+         d="m 67.85613,453.35544 13.904466,-0.70681 c 0,0 2.626205,1.87587 2.251034,1.78208 -0.375137,-0.0938 -16.999639,0.0501 -16.999639,0.0501 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="484.84848"
+         inkscape:export-xdpi="484.84848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
+         inkscape:connector-curvature="0"
+         id="path4760-7-43"
+         d="m 68.241038,457.93239 14.04621,0.45162 c 0,0 2.48593,2.05814 2.118391,1.93788 -0.367497,-0.1203 -17.086756,-1.32709 -17.086756,-1.32709 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="484.84848"
+         inkscape:export-xdpi="484.84848"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
+         inkscape:connector-curvature="0"
+         id="path4760-7-3-5"
+         d="m 68.438157,464.15745 13.451644,1.28018 c 0,0 2.772491,-1.652 2.390843,-1.58961 -0.381589,0.0628 -16.590563,-0.88202 -16.590563,-0.88202 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9076"
+       transform="translate(335.86535,-138.50445)">
+      <path
+         inkscape:export-ydpi="426.04535"
+         inkscape:export-xdpi="426.04535"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4758-9"
+         d="m 148.66534,433.55549 -23.26623,0.24576 -0.45426,27.9359 25.53744,-1.83565 -1.76422,-22.63752 -2.48052,0.36419 1.51929,20.0021 -20.31365,2.06278 0.90848,-24.07484 20.31366,0.2085 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="426.04535"
+         inkscape:export-xdpi="426.04535"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+         inkscape:connector-curvature="0"
+         id="path4760-3"
+         d="m 129.9202,442.41468 13.89374,-0.47243 c 0,0 2.24838,1.606 1.92719,1.5257 -0.32115,-0.0806 -16.54362,-0.0894 -16.54362,-0.0894 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="426.04535"
+         inkscape:export-xdpi="426.04535"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+         inkscape:connector-curvature="0"
+         id="path4760-7-4"
+         d="m 130.24973,446.33315 13.74981,0.25399 c 0,0 2.12829,1.76204 1.81362,1.65909 -0.31461,-0.10298 -16.35291,-1.00353 -16.35291,-1.00353 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="426.04535"
+         inkscape:export-xdpi="426.04535"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+         inkscape:connector-curvature="0"
+         id="path4760-7-3-8"
+         d="m 130.4185,451.66264 13.50605,1.096 c 0,0 2.37363,-1.41433 2.04689,-1.36091 -0.32667,0.0535 -16.1934,-0.75512 -16.1934,-0.75512 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="426.04535"
+         inkscape:export-xdpi="426.04535"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+         sodipodi:nodetypes="ccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4836"
+         d="m 138.1182,459.54096 0.12598,5.28965 -26.36549,-1.2648 0.10985,-33.90155 25.27216,-0.21979 0.31359,4.92918 3.44873,0 -0.12598,-8.16228 -13.64521,0.38557 2.77477,-4.41396 -9.60591,0.36945 2.21201,3.74603 -13.23401,-0.13269 0.0924,40.84867 31.70341,-0.0297 -0.17428,-7.36367 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="426.04535"
+         inkscape:export-xdpi="426.04535"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4952"
+         d="m 111.62089,431.63347 24.54162,-1.06113"
+         style="fill:none;stroke:#008700;stroke-width:0.84891832;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9084"
+       transform="translate(333.64167,-137.48995)">
+      <path
+         inkscape:export-ydpi="477.82242"
+         inkscape:export-xdpi="477.82242"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
+         sodipodi:nodetypes="cccccccscccccccccccccscccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4973"
+         d="m 175.22609,423.59658 9.81337,19.33319 -16.22456,-4.22318 2.12326,3.53663 9.44223,8.37348 7.21877,-0.64951 1.5154,3.33225 c -6.88216,3.6943 -3.07303,9.20569 0.9138,10.14319 3.98685,0.9375 7.71882,-3.47301 8.73149,-5.3004 l -8.46927,-8.57912 1.25366,-1.47794 8.64913,7.48592 c 2.50971,-0.35442 4.87134,-1.85588 5.94451,-5.42202 0.26122,-9.92702 -9.09608,-9.31473 -10.57241,-3.98481 l -3.91731,-1.66821 0.22675,-7.03994 -13.57371,-12.65394 z m 22.27161,23.10987 c 0.33312,-0.27352 0.63848,-0.40069 1.07373,-0.3849 1.20241,0.0442 2.27587,1.24744 2.35534,2.74536 0.0798,1.49791 -0.79569,2.63477 -1.99809,2.59057 -1.2024,-0.0442 -2.27585,-1.24744 -2.35533,-2.74536 l 0.1798,-1.09316 c 0.14517,-0.49195 0.41113,-0.83933 0.74442,-1.11259 z m -8.45183,8.37794 c 0.37217,-0.25306 0.81879,-0.54874 1.32835,-0.56759 l 1.09316,0.17981 c 1.36867,0.44602 2.13593,1.81394 1.75482,2.98337 -0.38108,1.16944 -1.76144,1.72757 -3.13006,1.2816 -1.36866,-0.44602 -2.26319,-1.72263 -1.88213,-2.89204 0.13795,-0.42344 0.46385,-0.73169 0.83576,-0.9853 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="477.82242"
+         inkscape:export-xdpi="477.82242"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path5015"
+         d="m 186.86657,442.91708 -7.99626,-15.68245 9.79493,9.23713 z"
+         style="fill:#ffffff;fill-opacity:0.15384617;stroke:none" />
+      <path
+         inkscape:export-ydpi="477.82242"
+         inkscape:export-xdpi="477.82242"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path5015-9"
+         d="m 185.50026,443.85603 -15.16852,-3.86355 7.8582,6.92667 z"
+         style="fill:#ffffff;fill-opacity:0.15294118;stroke:none" />
+      <path
+         inkscape:export-ydpi="477.82242"
+         inkscape:export-xdpi="477.82242"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path5035"
+         d="m 203.49178,451.53661 c -1.74013,0.16274 -0.2961,-2.83995 -1.64314,-4.14083 -1.60833,-1.55319 -1.97534,-2.7564 -0.54823,-3.3006 1.9333,-0.38609 3.05188,1.06138 3.40178,2.81178 0.34992,1.75039 0.41452,4.24306 -1.21042,4.62964 z"
+         style="fill:#ffffff;fill-opacity:0.25480766;stroke:none" />
+    </g>
+    <g
+       id="g9112"
+       transform="translate(327.6312,-145.34293)">
+      <path
+         inkscape:export-ydpi="487.24844"
+         inkscape:export-xdpi="487.24844"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path5154-7"
+         d="m 346.99187,447.73953 -4.31448,2.43861 23.23517,7.92691 16.60137,-15.56967 -2.15723,-0.84416 -14.72553,12.75587 z"
+         style="fill:#00ad00;fill-opacity:0.85263157;stroke:none" />
+      <path
+         inkscape:export-ydpi="487.24844"
+         inkscape:export-xdpi="487.24844"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path5154-7-8"
+         d="m 347.34153,453.60297 -4.31449,2.43862 25.27863,11.01932 13.17654,-13.92691 -4.0331,-1.50069 -10.03586,10.50484 z"
+         style="fill:#009e00;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="487.24844"
+         inkscape:export-xdpi="487.24844"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path5248"
+         d="m 344.01339,444.42203 c 18.94266,7.69143 30.89374,-1.59973 37.60443,-7.75965 l 0,0"
+         style="fill:none;stroke:#00bc00;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="487.24844"
+         inkscape:export-xdpi="487.24844"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5248-3"
+         d="m 343.92168,444.4175 c 13.22127,5.15901 17.38753,1.02647 19.78374,-5.6962"
+         style="fill:none;stroke:#00bc00;stroke-width:0.84891832;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="487.24844"
+         inkscape:export-xdpi="487.24844"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5248-3-1"
+         d="m 381.52611,436.74154 c -7.03093,7.22246 -14.38616,6.09131 -18.00168,2.08863"
+         style="fill:none;stroke:#00bc00;stroke-width:0.84891832;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9125"
+       transform="translate(-379.93103,-72.352814)">
+      <path
+         inkscape:export-ydpi="79.964424"
+         inkscape:export-xdpi="79.964424"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ungroup.png"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path5288"
+         d="m 468.80628,438.3807 -18.86674,-3.73092 -2.98093,15.96557 10.83917,3.63311 -2.23868,-12.0705 11.72893,4.29298 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="79.964424"
+         inkscape:export-xdpi="79.964424"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ungroup.png"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path5288-8"
+         d="m 467.28617,439.42063 -15.55838,-2.7817 -3.06953,14.54815 9.13986,3.06123 -2.13539,-12.02506 10.06178,3.64439 z"
+         style="fill:#52bd61;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="79.964424"
+         inkscape:export-xdpi="79.964424"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ungroup.png"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path5288-2"
+         d="m 449.55072,464.04468 20.43135,4.99514 1.66923,-16.87782 -10.73593,-3.92164 2.11826,11.98206 -11.53669,-3.92807 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="79.964424"
+         inkscape:export-xdpi="79.964424"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ungroup.png"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path5288-2-7"
+         d="m 451.42904,463.27773 17.22129,3.73047 0.98439,-15.58708 -8.71082,-3.17242 2.11458,11.97816 -9.8364,-3.34837 z"
+         style="fill:#52bd61;fill-opacity:0.85263157;stroke:none" />
+    </g>
+    <g
+       id="g9119"
+       transform="translate(-377.18597,-71.31425)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,13.365718,262.43995)"
+         id="g5408">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 45.706553,20.370929 -0.267969,3.081591 2.313855,0.554506 0.216062,-3.201579 z"
+           id="path5352"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/group.png"
+           inkscape:export-xdpi="89.089745"
+           inkscape:export-ydpi="89.089745" />
+        <path
+           style="fill:#52bd61;fill-opacity:0.85098039;stroke:none"
+           d="m 45.947168,20.657134 -0.114052,2.607618 1.646133,0.367605 0.246753,-2.656479 z"
+           id="path5396"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/group.png"
+           inkscape:export-xdpi="89.089745"
+           inkscape:export-ydpi="89.089745" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:0.08367011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 45.501289,22.405501 1.394494,0.576177 -0.380385,-1.610288 1.543483,0.571546"
+           id="path5354"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/group.png"
+           inkscape:export-xdpi="89.089745"
+           inkscape:export-ydpi="89.089745" />
+      </g>
+    </g>
+    <g
+       id="g9179"
+       transform="translate(327.48904,-304.64552)">
+      <g
+         inkscape:export-ydpi="843.49261"
+         inkscape:export-xdpi="843.49261"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help.png"
+         transform="matrix(0,-14.103129,14.103129,0,-24.777721,902.29681)"
+         id="g4209-3">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 15.102452,5.7188282 C 14.922759,5.5516594 14.845744,5.5202054 14.666051,5.3530365 c 0.474363,-0.6572846 1.42799,-0.3962888 1.565973,0.04776 0.137983,0.4440489 -0.0959,0.7831853 -0.520636,0.8179535 l 0.05231,0.2699684 -0.539341,-0.050677 0.198344,-0.3892328 c 0.196424,0.063891 0.658985,0.032173 0.486097,-0.4063204 -0.172889,-0.4384939 -0.69034,-0.2162326 -0.80635,0.07634 z"
+           id="path4201-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cczcccczc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
+           inkscape:export-xdpi="975.18652"
+           inkscape:export-ydpi="975.18652" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           id="path4203-3"
+           sodipodi:cx="15.412718"
+           sodipodi:cy="6.7004056"
+           sodipodi:rx="0.39774758"
+           sodipodi:ry="0.28726214"
+           d="m 15.810465,6.7004056 c 0,0.1586505 -0.178077,0.2872621 -0.397747,0.2872621 -0.21967,0 -0.397748,-0.1286116 -0.397748,-0.2872621 0,-0.1586505 0.178078,-0.2872621 0.397748,-0.2872621 0.21967,0 0.397747,0.1286116 0.397747,0.2872621 z"
+           transform="matrix(0.99254032,0.12191684,-0.12191684,0.99254032,0.98031351,-1.5554444)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
+           inkscape:export-xdpi="975.18652"
+           inkscape:export-ydpi="975.18652" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:0.17894736;stroke:none"
+           id="path4205-1"
+           sodipodi:cx="15.746094"
+           sodipodi:cy="6.9090548"
+           sodipodi:rx="0.19140625"
+           sodipodi:ry="0.09375"
+           d="m 15.9375,6.9090548 c 0,0.051777 -0.08569,0.09375 -0.191406,0.09375 -0.105711,0 -0.191406,-0.041973 -0.191406,-0.09375 0,-0.051777 0.08569,-0.09375 0.191406,-0.09375 0.105711,0 0.191406,0.041973 0.191406,0.09375 z"
+           transform="matrix(0.95560751,0.29464264,-0.50334784,1.6324961,4.0042879,-8.9550306)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
+           inkscape:export-xdpi="975.18652"
+           inkscape:export-ydpi="975.18652" />
+        <path
+           style="fill:none;stroke:#fffeff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.15263157;stroke-dasharray:none"
+           d="m 15.697691,6.4444409 c -0.01289,-0.1160097 -0.02349,-0.1528315 -0.03638,-0.2688412 0.101278,-0.011049 0.235702,-0.044194 0.303835,-0.066291"
+           id="path4207-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
+           inkscape:export-xdpi="975.18652"
+           inkscape:export-ydpi="975.18652" />
+      </g>
+    </g>
+    <g
+       id="g9099"
+       transform="translate(326.5162,-136.8929)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,78.645719,212.16684)"
+         id="g6468">
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 24.7531,26.275701 4.03125,0"
+           id="path5062-7"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 24.686809,27.214713 4.101332,-0.02321"
+           id="path5062-3-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 24.731003,28.076498 4.079235,-0.0054"
+           id="path5062-3-7-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 25.61889,25.446406 0.0054,3.628791"
+           id="path5062-3-7-0-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 26.656344,25.360699 0.0011,3.769416"
+           id="path5062-3-7-0-6-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 27.745573,25.27185 0.01941,3.71875"
+           id="path5062-3-7-0-6-3-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 24.537031,25.396279 4.648858,-0.109375"
+           id="path5062-7-4"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 24.399547,29.181353 4.634803,-0.1875"
+           id="path5062-7-4-2"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 24.701862,25.183462 0.04956,4.167624"
+           id="path5062-7-4-5"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 28.878211,25.028782 -0.01674,4.233915"
+           id="path5062-7-4-5-2"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+           inkscape:export-xdpi="486.3132"
+           inkscape:export-ydpi="486.3132"
+           sodipodi:nodetypes="cc" />
+      </g>
+    </g>
+    <g
+       id="g9131"
+       transform="translate(-391.56785,-71.818384)">
+      <g
+         inkscape:export-ydpi="829.91998"
+         inkscape:export-xdpi="829.91998"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet_big.png"
+         transform="matrix(0,-4.8290231,4.8290231,0,497.57205,853.49399)"
+         id="g6568">
+        <g
+           id="g6341"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
+           inkscape:export-xdpi="292.81195"
+           inkscape:export-ydpi="292.81195"
+           transform="matrix(0,1,-1,0,88.914396,-77.820007)">
+          <path
+             inkscape:connector-curvature="0"
+             id="path6081-0-6"
+             d="m 79.798869,9.1907487 4.78125,0.125 0.0404,-5.1146577 -4.84375,0.15625 z"
+             style="fill:none;stroke:none"
+             sodipodi:nodetypes="ccccc" />
+          <g
+             inkscape:export-ydpi="431"
+             inkscape:export-xdpi="431"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
+             transform="matrix(0,-1,1,0,60.778734,87.1724)"
+             id="g6029-5-6-8">
+            <g
+               id="g5868-1-7-9-9"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
+               inkscape:export-xdpi="431"
+               inkscape:export-ydpi="431"
+               transform="translate(9.1711719,-0.30610924)">
+              <g
+                 id="g5860-7-9-3-9">
+                <g
+                   id="g5853-1-2-8-4"
+                   inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
+                   inkscape:export-xdpi="431"
+                   inkscape:export-ydpi="431">
+                  <path
+                     inkscape:connector-curvature="0"
+                     id="path5783-9-2-8-9"
+                     d="m 68.633552,19.301274 5.058472,0.0156 0.154679,4.905553 -5.102665,-0.0156 0.08727,-4.308472"
+                     style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                     sodipodi:nodetypes="ccccc" />
+                  <path
+                     inkscape:connector-curvature="0"
+                     id="path5785-7-9-0-0-9"
+                     d="m 69.277048,21.777257 c 0.08839,0 3.875953,-0.08413 3.875953,-0.08413"
+                     style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                     sodipodi:nodetypes="cc" />
+                  <path
+                     sodipodi:nodetypes="cc"
+                     inkscape:connector-curvature="0"
+                     id="path5785-7-6-8-9-0-4-1"
+                     d="m 71.93249,23.808621 c 0,-0.08839 -0.05066,-4.319522 -0.05066,-4.319522"
+                     style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+                </g>
+              </g>
+            </g>
+          </g>
+          <path
+             sodipodi:nodetypes="cccc"
+             inkscape:connector-curvature="0"
+             id="path6233-7"
+             d="M 83.26418,5.228599 86.960741,4.1010096 84.667016,1.841765 z"
+             style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        </g>
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path5785-7-6-8-9-0-4-1-0"
+           d="m 81.26152,6.938665 c 0,-0.08839 -0.05066,-4.319522 -0.05066,-4.319522"
+           style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
+           inkscape:export-xdpi="292"
+           inkscape:export-ydpi="292" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path5785-7-6-8-9-0-4-1-0-1"
+           d="M 86.778494,8.8656953 86.020727,8.0596101"
+           style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
+           inkscape:export-xdpi="292"
+           inkscape:export-ydpi="292" />
+      </g>
+    </g>
+    <g
+       id="g9186"
+       transform="translate(321.35938,-309.49671)">
+      <g
+         transform="matrix(4.2758523,0,0,4.2758523,61.002068,568.52392)"
+         inkscape:export-ydpi="170.99156"
+         inkscape:export-xdpi="170.99156"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
+         id="g5121">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 13.03125,27.018433 0.03125,-1.0625 -2.3125,0.03125 -0.15625,4.484375 2.375,-0.140625 0.03125,-0.9375 -1.328125,0 -0.04687,-2.28125 z"
+           id="path5036"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 14.9375,26.619996 0.03125,-1.0625 -2.3125,0.03125 -0.15625,5.28125 2.5,-0.09375 0.03125,-0.9375 -1.53125,-0.03125 0.03125,-3.09375 z"
+           id="path5036-8"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 18.65625,25.244995 -3.9375,0.34375 -0.3125,5.59375 4.15625,-0.15625 z m -0.828125,1.15625 -0.140625,3.28125 -2.21875,0.09375 0.140625,-3.21875 z"
+           id="path5074"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccc" />
+      </g>
+      <path
+         inkscape:export-ydpi="170.99156"
+         inkscape:export-xdpi="170.99156"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path5079"
+         d="m 144.98873,687.05852 7.70922,0.70163 0.12012,-7.48831 10.5493,8.80552 -10.91773,8.21846 0.41428,-6.87276 -7.75508,-0.003 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="170"
+         inkscape:export-xdpi="170"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path5081"
+         d="m 199.16556,687.57968 -22.181,0.53448 0,4.67671 -3.87499,0.13362 0,-3.47413 -5.47843,-0.13362 0,8.95256 5.87929,-0.13362 0.13362,-2.53878 3.20689,-0.26724 0.40078,7.34913 21.51288,-0.26724 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="170"
+         inkscape:export-xdpi="170"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
+         id="path5083-3-2"
+         d="m 182.86386,675.68747 c -3.25048,0 -5.8793,2.95925 -5.8793,6.54739 0,3.58814 2.62882,6.41379 5.8793,6.41379 3.25048,0 5.8793,-2.82565 5.8793,-6.41379 0,-3.58814 -2.62882,-6.54739 -5.8793,-6.54739 z m 0.66809,3.47413 c 1.61911,0 2.93966,1.55321 2.93966,3.3405 0,1.78732 -1.32055,3.20689 -2.93966,3.20689 -1.6191,0 -2.93964,-1.41957 -2.93964,-3.20689 0,-1.78729 1.32054,-3.3405 2.93964,-3.3405 z"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="170"
+         inkscape:export-xdpi="170"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
+         id="path5083-3-2-7"
+         d="m 193.82073,675.29862 c 3.25048,0 5.87931,2.95925 5.87931,6.5474 0,3.58814 -2.62883,6.41378 -5.87931,6.41378 -3.25047,0 -5.8793,-2.82564 -5.8793,-6.41378 0,-3.58815 2.62883,-6.5474 5.8793,-6.5474 z m -0.6681,3.47413 c -1.6191,0 -2.93965,1.5532 -2.93965,3.3405 0,1.78731 1.32055,3.2069 2.93965,3.2069 1.61912,0 2.93966,-1.41959 2.93966,-3.2069 0,-1.7873 -1.32054,-3.3405 -2.93966,-3.3405 z"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g9199"
+       transform="translate(348.612,-309.76996)">
+      <path
+         inkscape:export-ydpi="170"
+         inkscape:export-xdpi="170"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_up.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path5233"
+         d="m 258.09213,674.02923 -13.22842,18.17237 11.0905,-0.80172 -0.13362,13.0948 6.09513,-0.72345 -1.16067,-12.49547 11.50085,0.39135 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9196"
+       transform="translate(329.24,-311.37341)">
+      <path
+         inkscape:export-ydpi="170"
+         inkscape:export-xdpi="170"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_down.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path5233-7"
+         d="m 227.55988,706.09812 -13.22841,-18.17237 11.09049,0.80172 -0.13362,-13.0948 6.09513,0.72345 -1.16066,12.49548 11.50084,-0.39135 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9222"
+       transform="translate(-163.05764,-248.43918)">
+      <path
+         sodipodi:nodetypes="ccccccccccccccccccc"
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_layer.png"
+         inkscape:connector-curvature="0"
+         id="path5311"
+         d="m 348.41952,679.69608 -29.53011,0.40086 0.40086,26.72407 c 0,0 32.33614,0.53448 31.5344,0.6681 -0.80172,0.13362 -2.40516,-27.79305 -2.40517,-27.7931 z m -16.43532,3.20689 4.67672,0 -0.15747,8.66883 10.527,-0.006 -0.48159,4.69947 -9.62067,-0.40086 1.06896,7.2155 -5.07758,0 -0.53448,-7.48274 -9.48705,0 -0.6102,-4.07286 9.51604,0.0127 0.18022,-8.63357 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9225"
+       transform="translate(-142.55835,-247.75606)">
+      <path
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_layer.png"
+         inkscape:connector-curvature="0"
+         id="path5311-5"
+         d="m 389.52971,679.41378 -0.40078,26.72408 c 0,0 -32.33613,0.53448 -31.53441,0.6681 0.80172,0.13362 2.40517,-27.79304 2.40517,-27.79304 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_layer.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path5313-8"
+         d="m 385.72834,690.97383 -0.11546,4.436 -20.84871,-0.10773 -0.54857,-4.32569 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9202"
+       transform="translate(363.45878,-313.98459)">
+      <g
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
+         transform="matrix(4.2758523,0,0,4.2758523,105.59846,537.5332)"
+         id="g5306">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 45.409894,35.302305 -4.568466,0.02053 -0.0723,4.432362 6.408155,0.08839 -0.0944,-4.624303 -1.421145,-0.0404 0.454886,3.64824 -4.154253,0 -0.32544,-2.708788 4.762248,-0.08839 z"
+           id="path5253-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
+           inkscape:export-xdpi="170"
+           inkscape:export-ydpi="170" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 42.330898,35.320145 c -0.0028,-2.135681 3.051859,-2.329526 3.147097,0.0221"
+           id="path5255-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
+           inkscape:export-xdpi="170"
+           inkscape:export-ydpi="170" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 43.637495,36.877209 -0.0065,1.686311 0.707106,-0.0221 -0.104015,-1.730505 z"
+           id="path5259-7"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
+           inkscape:export-xdpi="170"
+           inkscape:export-ydpi="170"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <rect
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
+         y="689.50293"
+         x="281.8385"
+         height="16.814381"
+         width="23.950237"
+         id="rect3484"
+         style="fill:#008700;fill-opacity:0.25480766;stroke:none" />
+    </g>
+    <g
+       id="g8979"
+       transform="translate(160.4812,-174.77498)">
+      <g
+         transform="matrix(6.5563168,0,0,6.5563168,2.2788233,272.67204)"
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/scenes.png"
+         id="g4256">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 78.066763,18.183357 0.09375,5.375 3,-0.171875 0.01563,-5.140625 z m 0.5625,4.5 0.766735,-0.137944 -0.03125,0.34375 1.209598,-0.165403 -0.113952,-3.840284 -1.094535,0.09028 0.01451,3.231694 -0.753006,0.07734 -0.09185,-3.771312 2.25,0.09375 0.0095,4.497319 -2.10325,0.04956 z"
+           id="path6113-6-3-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/scenes.png"
+           inkscape:export-xdpi="372"
+           inkscape:export-ydpi="372" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 75.042607,18.53096 2.191174,5.319485 0.847963,-0.325814 -1.519765,-5.713211 z"
+           id="path6585-1-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/scenes.png"
+           inkscape:export-xdpi="372"
+           inkscape:export-ydpi="372" />
+      </g>
+      <rect
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/scenes.png"
+         y="392.47961"
+         x="515.534"
+         height="32.733795"
+         width="17.257929"
+         id="rect3484-5"
+         style="fill:#008700;fill-opacity:0.25480766;stroke:none" />
+    </g>
+    <g
+       id="g9229"
+       transform="translate(-126.82608,-248.1087)">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_frame.png"
+         inkscape:connector-curvature="0"
+         id="path4318-7-8"
+         d="m 418.83287,678.48492 -17.79564,0.54874 0.94074,29.0061 19.67712,-1.01913 -0.23524,-3.99813 -3.76296,-0.1568 1.01914,1.64629 -13.09196,1.01914 -1.09752,-24.45922 12.13161,-0.29398 0.60757,10.68131 2.9594,0.098 c -0.54619,-4.59586 -1.28293,-8.44565 -1.35231,-13.07237 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_frame.png"
+         transform="matrix(3.5477477,0,0,3.5477477,221.32926,583.22469)"
+         d="m 54.226252,28.71464 c 0,0.427136 -0.346262,0.773398 -0.773398,0.773398 -0.427136,0 -0.773398,-0.346262 -0.773398,-0.773398 0,-0.427136 0.346262,-0.773398 0.773398,-0.773398 0.427136,0 0.773398,0.346262 0.773398,0.773398 z"
+         sodipodi:ry="0.77339804"
+         sodipodi:rx="0.77339804"
+         sodipodi:cy="28.71464"
+         sodipodi:cx="53.452854"
+         id="path4323-6-9"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_frame.png"
+         inkscape:connector-curvature="0"
+         id="path4357-1"
+         d="m 402.44835,690.34388 15.83575,-1.09753"
+         style="fill:none;stroke:#008700;stroke-width:1.06432426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_frame.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4383"
+         d="m 415.03072,696.00618 10.42653,-0.70554 -0.0781,3.84137 -10.58332,0 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9235"
+       transform="translate(-105.06992,-247.03279)">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
+         inkscape:connector-curvature="0"
+         id="path4318-7-8-2"
+         d="m 448.73654,677.40899 -17.79565,0.54874 0.94075,29.0061 19.62169,-0.24305 -0.23523,-3.99814 -3.76295,-0.15679 1.01912,1.64628 -13.03652,0.24304 -1.09752,-24.4592 12.13162,-0.2939 0.29398,9.427 2.95939,0.098 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
+         transform="matrix(3.5477477,0,0,3.5477477,251.23293,582.14876)"
+         d="m 54.226252,28.71464 c 0,0.427136 -0.346262,0.773398 -0.773398,0.773398 -0.427136,0 -0.773398,-0.346262 -0.773398,-0.773398 0,-0.427136 0.346262,-0.773398 0.773398,-0.773398 0.427136,0 0.773398,0.346262 0.773398,0.773398 z"
+         sodipodi:ry="0.77339804"
+         sodipodi:rx="0.77339804"
+         sodipodi:cy="28.71464"
+         sodipodi:cx="53.452854"
+         id="path4323-6-9-7"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
+         inkscape:connector-curvature="0"
+         id="path4357-1-5"
+         d="m 432.35202,689.26794 15.83576,-1.09752"
+         style="fill:none;stroke:#008700;stroke-width:1.06432426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4383-1"
+         d="m 444.07435,696.22376 10.42653,0.70553 0.23524,-2.90062 -10.58331,0 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4383-1-8"
+         d="m 447.89129,691.39437 0.18141,8.98526 3.97008,0.017 -0.72056,-9.30834 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9242"
+       transform="translate(-94.619291,-248.1011)">
+      <path
+         sodipodi:nodetypes="ssssssssss"
+         inkscape:connector-curvature="0"
+         inkscape:export-ydpi="439.86255"
+         inkscape:export-xdpi="439.86255"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/time_line.png"
+         id="path4495"
+         d="m 481.00713,682.3369 c -7.77713,3.16024 -11.51986,12.02673 -8.35963,19.80387 3.16024,7.77712 12.02673,11.51986 19.80386,8.35962 7.77712,-3.16024 11.51986,-12.02672 8.35962,-19.80385 -3.16022,-7.77713 -12.02671,-11.51986 -19.80385,-8.35964 z m 1.74746,3.69776 c 5.62972,-2.28763 12.19579,0.48405 14.48342,6.11375 2.28763,5.62973 -0.56946,11.98562 -6.19917,14.27325 -5.62972,2.28763 -11.9002,-0.35926 -14.18784,-5.98899 -2.28763,-5.62972 0.27387,-12.11037 5.90359,-14.39801 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="439.86255"
+         inkscape:export-xdpi="439.86255"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/time_line.png"
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4518"
+         d="m 478.93361,684.78633 -1.90553,-4.40726 -3.03503,1.41719 -0.33124,-3.27576 7.78824,-3.63367 3.22239,3.08359 -3.89936,1.0583 2.85603,5.49443 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="439.86255"
+         inkscape:export-xdpi="439.86255"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/time_line.png"
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4520"
+         d="m 479.45797,690.62835 7.28315,7.33439 5.99697,-5.438"
+         style="fill:none;stroke:#008700;stroke-width:1.4519341;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9255"
+       transform="translate(-78.931449,-245.81188)">
+      <g
+         id="g9247">
+        <g
+           id="g3569"
+           transform="matrix(8.4891828,0,0,8.4891828,5.1119251,452.19167)">
+          <path
+             inkscape:export-ydpi="407.36514"
+             inkscape:export-xdpi="407.36514"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
+             sodipodi:nodetypes="ccccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4590"
+             d="m 60.520847,28.375656 0.106901,1.617702 2.485559,-0.08662 0.27302,-3.50957 -3.051905,-0.136861 0.04009,0.815081 0.374136,-0.09353 -0.09353,-0.40086 2.383806,0.19031 -0.336225,2.792608 -1.700842,0.02863 -0.213792,-1.163395 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="cccc"
+             inkscape:export-ydpi="407.36514"
+             inkscape:export-xdpi="407.36514"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
+             inkscape:connector-curvature="0"
+             id="path4596"
+             d="m 61.799207,27.394037 -0.66607,1.009833 1.324635,0.222224 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:export-ydpi="407.36514"
+             inkscape:export-xdpi="407.36514"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4601"
+             d="m 60.055859,27.827886 c 0.440262,-0.665281 1.0036,-0.362209 1.705844,0.41992"
+             style="fill:none;stroke:#008700;stroke-width:0.34206688;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <path
+             inkscape:export-ydpi="407"
+             inkscape:export-xdpi="407"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="rect4659"
+             d="m 60.734085,28.908849 c 0.731602,0.569633 1.950029,0.545166 1.991902,-0.699282 l 0.188943,0.0077 -0.134424,1.444971 c -0.666509,-0.02205 -1.238537,-0.04409 -1.905047,-0.06614 -0.01337,-0.29755 -0.140105,-0.547857 -0.141374,-0.687223 z"
+             style="fill:#008700;fill-opacity:0.39215686;stroke:none" />
+          <path
+             inkscape:export-ydpi="407"
+             inkscape:export-xdpi="407"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
+             sodipodi:nodetypes="cccccc"
+             inkscape:connector-curvature="0"
+             id="rect4659-3"
+             d="m 60.47584,26.958102 c 0.62767,-0.125559 2.222411,-0.203877 2.254834,1.248434 l 0.239559,0.01065 0.156719,-1.596718 c -0.817684,-0.06299 -1.975508,-0.173219 -2.556984,-0.198415 -0.01337,0.29755 -0.09286,0.396683 -0.09413,0.536051 z"
+             style="fill:#008700;fill-opacity:0.39215686;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g9277"
+       transform="translate(18.887368,-273.80797)">
+      <path
+         inkscape:export-ydpi="1309.09"
+         inkscape:export-xdpi="1309.09"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/plus_sign_medium.png"
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4153-6"
+         d="m 50.141671,711.58806 -6.330273,-0.76199 0.957962,5.74347 -4.29888,-1.34734 -0.557824,6.69605 5.658796,-0.60621 -1.373261,5.31612 7.619763,0.46895 -1.572647,-5.7767 4.409536,0.64229 0.410283,-6.85779 -5.131278,1.16226 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:2.12229562;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9280"
+       transform="translate(55.760651,-273.7961)">
+      <g
+         inkscape:export-ydpi="1257.0618"
+         inkscape:export-xdpi="1257.0618"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign_medium.png"
+         transform="matrix(8.9495444,0,0,8.4891828,17.018506,452.19167)"
+         id="g4300">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 5.1520053,30.938157 -0.047381,0.829166 2.0373806,4e-6 -0.2724404,-0.900238 z"
+           id="path4296"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
+           inkscape:export-xdpi="605"
+           inkscape:export-ydpi="605"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           d="m 5.3770648,31.186907 -0.00592,0.307975 1.3088985,0 -0.071071,-0.379046 z"
+           id="path4298"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
+           inkscape:export-xdpi="605"
+           inkscape:export-ydpi="605"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
+    <g
+       id="g9327"
+       transform="translate(-92.065447,-214.90627)">
+      <path
+         inkscape:export-ydpi="1047.33"
+         inkscape:export-xdpi="1047.33"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_big.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4304-2"
+         d="m 164.21026,733.27372 -0.18761,-21.00965 28.9923,-0.35247 0.18761,2.62621 -26.55367,0.72761 0,14.63172 23.36471,-0.16486 -1.11411,-13.90218 4.19323,0.52862 -0.96266,16.53978 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="1047.33"
+         inkscape:export-xdpi="1047.33"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_big.png"
+         transform="matrix(10.960717,0,0,10.960717,45.093464,377.44101)"
+         d="m 12.765625,31.397337 c 0,0.170432 -0.138162,0.308594 -0.308594,0.308594 -0.170431,0 -0.308593,-0.138162 -0.308593,-0.308594 0,-0.170432 0.138162,-0.308594 0.308593,-0.308594 0.170432,0 0.308594,0.138162 0.308594,0.308594 z"
+         sodipodi:ry="0.30859375"
+         sodipodi:rx="0.30859375"
+         sodipodi:cy="31.397337"
+         sodipodi:cx="12.457031"
+         id="path4306-8"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="1047.33"
+         inkscape:export-xdpi="1047.33"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_big.png"
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4367"
+         d="m 169.11398,731.47554 4.90748,-7.24564 5.89839,7.10552"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9316"
+       transform="translate(-95.942875,-216.98814)">
+      <g
+         inkscape:export-ydpi="952.07001"
+         inkscape:export-xdpi="952.07001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_big.png"
+         transform="matrix(8.4891828,0,0,8.4891828,38.127098,415.79994)"
+         id="g6733">
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 12.387089,36.050866 -2.189855,-0.0068 -0.0022,1.573913 2.193155,0.0011 z"
+           id="path4477-1-8"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+           inkscape:export-xdpi="715"
+           inkscape:export-ydpi="715"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 11.901447,36.037339 0.0045,-0.573774 -2.4163504,-0.0013 0.00879,1.524195 0.6850294,-0.0044"
+           id="path4477-1-8-7"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+           inkscape:export-xdpi="715"
+           inkscape:export-ydpi="715"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 11.431883,35.507008 -10e-4,-0.540629 -2.6207482,-0.0014 0.014318,1.689922 0.6297862,-0.0043"
+           id="path4477-1-8-7-4"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+           inkscape:export-xdpi="715"
+           inkscape:export-ydpi="715"
+           sodipodi:nodetypes="ccccc" />
+        <g
+           id="g4661"
+           transform="translate(0.11533046,0.11048543)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+           inkscape:export-xdpi="715"
+           inkscape:export-ydpi="715">
+          <path
+             inkscape:export-ydpi="715"
+             inkscape:export-xdpi="715"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+             sodipodi:nodetypes="ccc"
+             inkscape:connector-curvature="0"
+             id="path4367-4"
+             d="m 10.467336,37.505134 0.492148,-0.798826 0.504212,0.760453"
+             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <path
+             inkscape:export-ydpi="715"
+             inkscape:export-xdpi="715"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+             transform="matrix(1.2864983,0,0,1.2864983,-3.3807595,-10.134925)"
+             d="m 11.844038,36.338123 c 0,0.05492 -0.04452,0.09944 -0.09944,0.09944 -0.05492,0 -0.09944,-0.04452 -0.09944,-0.09944 0,-0.05492 0.04452,-0.09944 0.09944,-0.09944 0.05492,0 0.09944,0.04452 0.09944,0.09944 z"
+             sodipodi:ry="0.099436894"
+             sodipodi:rx="0.099436894"
+             sodipodi:cy="36.338123"
+             sodipodi:cx="11.744601"
+             id="path4637"
+             style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+             sodipodi:type="arc" />
+        </g>
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.10284942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 10.095152,37.763386 2.392918,-0.0016"
+           id="path4641"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+           inkscape:export-xdpi="715"
+           inkscape:export-ydpi="715" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.10284942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 10.095152,37.852577 2.392918,-0.0016"
+           id="path4641-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+           inkscape:export-xdpi="715"
+           inkscape:export-ydpi="715" />
+      </g>
+    </g>
+    <g
+       id="g9332"
+       transform="translate(-91.757505,-218.80815)">
+      <g
+         inkscape:export-ydpi="1334.74"
+         inkscape:export-xdpi="1334.74"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/svg_big.png"
+         transform="matrix(0.65284312,0,0,0.65284312,204.30268,674.14498)"
+         id="g6753">
+        <g
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           transform="matrix(0.14324862,0,0,0.14324862,35.786798,80.187048)"
+           id="svgstar">
+          <path
+             d="m -84.1487,-15.8513 a 22.4171,22.4171 0 1 0 0,31.7026 H 84.1487 a 22.4171,22.4171 0 1 0 0,-31.7026 z"
+             id="svgbar"
+             inkscape:connector-curvature="0"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3057"
+             transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+             xlink:href="#svgbar"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3059"
+             transform="matrix(0,1,-1,0,0,0)"
+             xlink:href="#svgbar"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3061"
+             transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
+             xlink:href="#svgbar"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g9340"
+       transform="translate(-76.794741,-218.37161)">
+      <g
+         inkscape:export-ydpi="728.57355"
+         inkscape:export-xdpi="728.57355"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/svg_array.png"
+         transform="matrix(0.25573128,0,0,0.25573128,243.70237,699.05219)"
+         id="g6753-2">
+        <g
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           transform="matrix(0.14324862,0,0,0.14324862,35.786798,80.187048)"
+           id="svgstar-2">
+          <path
+             d="m -84.1487,-15.8513 a 22.4171,22.4171 0 1 0 0,31.7026 H 84.1487 a 22.4171,22.4171 0 1 0 0,-31.7026 z"
+             id="svgbar-1"
+             inkscape:connector-curvature="0"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3057-2"
+             transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+             xlink:href="#svgbar-1"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3059-1"
+             transform="matrix(0,1,-1,0,0,0)"
+             xlink:href="#svgbar-1"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3061-4"
+             transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
+             xlink:href="#svgbar-1"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+      <g
+         inkscape:export-ydpi="728.57355"
+         inkscape:export-xdpi="728.57355"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/svg_array.png"
+         transform="matrix(0.20278306,0,0,0.20278306,255.24702,708.90214)"
+         id="g6753-2-8">
+        <g
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           transform="matrix(0.14324862,0,0,0.14324862,35.786798,80.187048)"
+           id="svgstar-2-8">
+          <path
+             d="m -84.1487,-15.8513 a 22.4171,22.4171 0 1 0 0,31.7026 H 84.1487 a 22.4171,22.4171 0 1 0 0,-31.7026 z"
+             id="svgbar-1-3"
+             inkscape:connector-curvature="0"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3057-2-6"
+             transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+             xlink:href="#svgbar-1-3"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3059-1-6"
+             transform="matrix(0,1,-1,0,0,0)"
+             xlink:href="#svgbar-1-3"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3061-4-4"
+             transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
+             xlink:href="#svgbar-1-3"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+      <g
+         inkscape:export-ydpi="728.57355"
+         inkscape:export-xdpi="728.57355"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/svg_array.png"
+         transform="matrix(0.30678854,0,0,0.30678854,241.87519,707.06166)"
+         id="g6753-2-8-1">
+        <g
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           transform="matrix(0.14324862,0,0,0.14324862,35.786798,80.187048)"
+           id="svgstar-2-8-0">
+          <path
+             d="m -84.1487,-15.8513 a 22.4171,22.4171 0 1 0 0,31.7026 H 84.1487 a 22.4171,22.4171 0 1 0 0,-31.7026 z"
+             id="svgbar-1-3-9"
+             inkscape:connector-curvature="0"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3057-2-6-0"
+             transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+             xlink:href="#svgbar-1-3-9"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3059-1-6-5"
+             transform="matrix(0,1,-1,0,0,0)"
+             xlink:href="#svgbar-1-3-9"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <use
+             id="use3061-4-4-6"
+             transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
+             xlink:href="#svgbar-1-3-9"
+             x="0"
+             y="0"
+             width="744.09448"
+             height="1052.3622"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g9285"
+       transform="translate(270.78104,-279.95768)">
+      <g
+         transform="matrix(4.8995098,0,0,4.8995098,105.77839,547.92293)"
+         id="g7054">
+        <path
+           style="fill:url(#linearGradient11093);fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 38.34577,36.10961 c 0.403266,1.175586 -0.499578,1.850974 -1.274415,1.850974 -0.774837,0 -1.402968,-0.617574 -1.402968,-1.379388 0,-0.761816 0.628131,-1.379389 1.402968,-1.379389 0.560999,0 1.068065,0.328579 1.289284,0.835456"
+           id="path4545-8-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csssc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/net_document.png"
+           inkscape:export-xdpi="593.03113"
+           inkscape:export-ydpi="593.03113" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 37.21875,35.940309 c 0.135417,0.171875 0.270833,0.34375 0.40625,0.515625 0.0052,-0.614583 0.555396,-1.336972 0.904354,-1.264055 l 0.213068,0.480584 1.320083,-1.404029 -2.09375,0.234375 0.34375,0.34375 c -0.432293,0.296875 -0.942712,0.734375 -1.093755,1.09375 z"
+           id="path7032"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/net_document.png"
+           inkscape:export-xdpi="593.03113"
+           inkscape:export-ydpi="593.03113" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 38.371592,36.431536 c -0.307572,0.902189 -2.235489,1.057329 -2.684796,0.208815"
+           id="path7034-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/net_document.png"
+           inkscape:export-xdpi="593"
+           inkscape:export-ydpi="593" />
+      </g>
+    </g>
+    <g
+       id="g8846"
+       transform="translate(21.56246,-122.78502)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         id="g7164">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 21.838887,10.288203 -0.499942,0.171875 0.794779,1.6875 2.704813,0 0.538399,-1.8125 -0.461485,-0.09375 -0.294837,1.328125 -2.26495,0.109375 z"
+           id="path4833-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
+           inkscape:export-xdpi="792.00775"
+           inkscape:export-ydpi="792.00775" />
+        <path
+           style="fill:#ffffff;fill-opacity:0.19230772;stroke:none"
+           d="m 22.202458,12.075515 -0.101334,-0.21584 2.509036,0.03315 0.138107,-0.198873 0.370126,-1.281631 0.143631,0.03315 -0.408796,1.414213 -0.23202,0.187825 z"
+           id="path4837-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
+           inkscape:export-xdpi="792.00775"
+           inkscape:export-ydpi="792.00775" />
+        <g
+           id="g7095"
+           transform="matrix(0,0.67597278,0.67597278,0,1.943951,-14.831195)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
+           inkscape:export-xdpi="792.00775"
+           inkscape:export-ydpi="792.00775">
+          <path
+             sodipodi:nodetypes="ccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4835-6"
+             d="M 36.360477,33.78131 36.039373,33.030184 35.70837,32.851203 c 0.324216,-0.327712 1.166496,-0.899766 1.630276,-1.180042 l -0.687118,-0.49564 2.125624,-0.144687 -0.988438,1.753563 -0.168809,-0.855607 c -0.565092,0.300317 -1.104596,1.337138 -1.259428,1.85252 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4839-1"
+             d="m 37.19878,31.306509 0.546875,0.296875 0.125,0.65625 0.46875,-0.96875 z"
+             style="fill:#ffffff;fill-opacity:0.19230772;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8854"
+       transform="translate(21.885518,-124.40887)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         id="g7157">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 26.74444,10.376591 -0.499942,0.171875 0.794779,1.6875 2.704813,0 0.538399,-1.8125 -0.461485,-0.09375 -0.294837,1.328125 -2.26495,0.109375 z"
+           id="path4833-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
+           inkscape:export-xdpi="853.867"
+           inkscape:export-ydpi="853.867" />
+        <path
+           style="fill:#ffffff;fill-opacity:0.19230772;stroke:none"
+           d="m 27.108011,12.163903 -0.101334,-0.21584 2.509036,0.03315 0.138107,-0.198873 0.370126,-1.281631 0.143631,0.03315 -0.408796,1.414213 -0.23202,0.187825 z"
+           id="path4837-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
+           inkscape:export-xdpi="853.867"
+           inkscape:export-ydpi="853.867" />
+        <g
+           id="g7095-2"
+           transform="matrix(0.67597278,0,0,0.67597278,3.3535662,-11.375126)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
+           inkscape:export-xdpi="853.867"
+           inkscape:export-ydpi="853.867">
+          <path
+             sodipodi:nodetypes="ccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4835-6-1"
+             d="M 36.360477,33.78131 36.039373,33.030184 35.70837,32.851203 c 0.324216,-0.327712 1.166496,-0.899766 1.630276,-1.180042 l -0.687118,-0.49564 2.125624,-0.144687 -0.988438,1.753563 -0.168809,-0.855607 c -0.565092,0.300317 -1.104596,1.337138 -1.259428,1.85252 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4839-1-1"
+             d="m 37.19878,31.306509 0.546875,0.296875 0.125,0.65625 0.46875,-0.96875 z"
+             style="fill:#ffffff;fill-opacity:0.19230772;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g9305"
+       transform="translate(327.76828,-278.08543)">
+      <g
+         id="g9300">
+        <g
+           id="g5137-4-5-1"
+           transform="matrix(1.0920374,0.13504932,-0.13504932,1.0920374,518.61527,1059.2793)"
+           inkscape:transform-center-x="3.9172575"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/about.png"
+           inkscape:export-xdpi="875.88953"
+           inkscape:export-ydpi="875.88953"
+           inkscape:transform-center-y="0.59878385">
+          <path
+             sodipodi:nodetypes="cccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path3941-2-6-3-93-7-6"
+             d="m -214.2584,-274.42577 c 0.46516,-5.00053 1.51237,-9.53653 3.25674,-13.25785 0.50393,2.09324 0.54211,3.83825 1.04604,5.93149 0.93033,-2.79099 3.37245,-5.93086 5.93086,-8.37298 -1.04662,2.55841 -3.25616,5.81457 -4.88423,8.72186 2.2483,-1.89943 4.49208,-3.42692 9.41508,-4.97747 -1.74437,1.39549 -3.01906,2.76793 -4.76343,4.16343 1.74437,0.89157 3.48874,1.78313 5.23311,2.6747 -4.0702,-0.50393 -6.27973,-0.65898 -9.76847,0.58146 1.86066,0.81404 3.72132,1.62808 5.58198,2.44212 -4.22525,0.46516 -9.14825,-2.55841 -9.88476,2.79099 -0.38764,-0.23258 -0.77528,-0.46517 -1.16292,-0.69775 z"
+             style="fill:#23a0ff;fill-opacity:1;stroke:#0064be;stroke-width:0.6943742;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4100-9-2-8-75-0-4"
+             d="m -213.67694,-274.13504 c 0.54269,-2.61656 1.43425,-4.53536 3.72132,-6.62861"
+             style="fill:none;stroke:#0064be;stroke-width:0.69439036;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g9449"
+       transform="translate(158.55713,-248.44308)">
+      <g
+         inkscape:export-ydpi="825"
+         inkscape:export-xdpi="825"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/crash_6.png"
+         transform="matrix(8.4891828,0,0,8.4891828,18.307329,442.37605)"
+         id="g4459">
+        <g
+           id="g4442">
+          <g
+             id="g4426">
+            <path
+               style="fill:#00a600;fill-opacity:0.3125;stroke:none"
+               d="m 3.4748922,40.642057 0.351046,1.466134 -1.6313313,-0.185848 1.0118384,1.177036 -0.8259905,2.044327 1.8378289,-1.135737 0.6401427,0.784691 1.0118384,-0.88794 0.8053407,1.094437 0.7640413,-0.887939 1.6106815,0.764041 -0.8259905,-1.73458 1.300935,-1.073788 -1.6726308,0.309747 0.2477972,-1.858479 -1.218336,1.383534 -0.8879399,-1.073788 -0.7020919,1.197687 -1.3835341,-1.259636 z"
+               id="path3075-4"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cccccccccccccccccccc" />
+            <path
+               style="fill:none;stroke:#43981a;stroke-width:0.13215849;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="M 5.8716901,41.029291 5.2757452,41.927074 3.7277622,40.635871"
+               id="path4324-3"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccc" />
+            <path
+               style="fill:none;stroke:#43981a;stroke-width:0.1651981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 3.4962543,40.626093 0.321235,1.460158 -1.5769715,-0.146016 1.0221111,1.226534 -0.8760951,1.956613 1.7813936,-1.138924 0.6424699,0.876095 1.0221111,-0.876095 0.8760951,1.080517 0.7300795,-0.963705 1.5769715,0.73008 -0.7008764,-1.606175 1.2265335,-1.28494 c 0,0 -1.6061746,0.408845 -1.6061746,0.292032 0,-0.116813 0.175219,-1.693784 0.175219,-1.693784 L 6.76701,41.852626 6.0077274,40.888921"
+               id="path4322-0-5"
+               inkscape:connector-curvature="0" />
+            <text
+               xml:space="preserve"
+               style="font-size:3.30396199px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               x="-10.869791"
+               y="42.892876"
+               id="text4243-1"
+               sodipodi:linespacing="125%"
+               transform="matrix(0.95240857,-0.30482441,0.30482441,0.95240857,0,0)"><tspan
+                 sodipodi:role="line"
+                 id="tspan4245-7"
+                 x="-10.869791"
+                 y="42.892876">B</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:3.30396199px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008800;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               x="3.785182"
+               y="43.372581"
+               id="text4243-4-4"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan4245-3-3"
+                 x="3.785182"
+                 y="43.372581">0</tspan></text>
+            <g
+               transform="matrix(0.32049554,0.08027616,-0.08027616,0.32049554,-14.056757,47.150968)"
+               style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               id="text4243-2-1">
+              <path
+                 d="m 57.427763,-26.726684 c 0.878907,-2.22656 1.186062,-3.627987 1.648302,-5.932679 l 2.333984,-0.380859 -0.332031,3.583984 0.908203,-3.310547 2.246094,-0.390625 c -0.266933,2.122401 -0.400396,4.036462 -0.400391,5.742188 -5e-6,0.338543 0.0033,0.673829 0.0098,1.005859 l -2.001953,0.351563 0.351562,-4.277344 -0.722389,2.703554 -1.074219,0.146484 0.08762,-3.982851 -1.023302,4.467836 -2.03125,0.273437"
+                 id="path4320-4"
+                 inkscape:connector-curvature="0"
+                 sodipodi:nodetypes="ccccccccccccccc"
+                 style="fill:#008700;fill-opacity:1" />
+            </g>
+            <text
+               xml:space="preserve"
+               style="font-size:3.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               x="21.634735"
+               y="37.95356"
+               id="text4243-4-1-6"
+               sodipodi:linespacing="125%"
+               transform="matrix(0.91529523,0.40278361,-0.40278361,0.91529523,0,0)"><tspan
+                 sodipodi:role="line"
+                 id="tspan4245-3-7-9"
+                 x="21.634735"
+                 y="37.95356">0</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:3.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               x="6.5840259"
+               y="44.456589"
+               id="text4243-2-8-4"
+               sodipodi:linespacing="125%"
+               transform="matrix(0.9986833,-0.05129977,0.05129977,0.9986833,0,0)"><tspan
+                 sodipodi:role="line"
+                 id="tspan4245-34-8-2"
+                 x="6.5840259"
+                 y="44.456589">!</tspan></text>
+            <path
+               style="fill:#008700;fill-opacity:1;stroke:none"
+               d="M 1.9319816,44.949602 C 1.6788875,45.124821 1.1775664,45.343845 1.742161,44.818188 4.3217747,43.075732 7.7482808,43.698733 9.3057834,44.321734 8.9909587,44.430221 8.4435877,44.033224 6.5168805,43.810678 c -0.6097716,-0.06356 -1.2758328,0.0053 -1.4658662,0.04747 0.7521579,-0.06962 1.3591631,-0.02391 1.5814263,0.02013 0.3566118,0.07907 0.090937,0.158828 -0.1010844,0.196084 -1.1676975,-0.323276 -3.416646,-0.283157 -4.5993746,0.875235 z"
+               id="path4353-2"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cccccccc" />
+          </g>
+        </g>
+        <text
+           xml:space="preserve"
+           style="font-size:2.44724345px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:Blambot Pro;-inkscape-font-specification:Blambot Pro"
+           x="3.8231013"
+           y="47.372433"
+           id="text3640"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3642"
+             x="3.8231013"
+             y="47.372433">#6</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g9428"
+       transform="translate(-18.442875,-201.44308)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,26.796512,409.74576)"
+         inkscape:export-ydpi="825"
+         inkscape:export-xdpi="825"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/crash_11.png"
+         id="g4569">
+        <g
+           id="g4442-1"
+           transform="translate(9.1874999,-1.2006931)">
+          <g
+             id="g4426-6">
+            <path
+               style="fill:#00a600;fill-opacity:0.3125;stroke:none"
+               d="m 3.4748922,40.642057 0.351046,1.466134 -1.6313313,-0.185848 1.0118384,1.177036 -0.8259905,2.044327 1.8378289,-1.135737 0.6401427,0.784691 1.0118384,-0.88794 0.8053407,1.094437 0.7640413,-0.887939 1.6106815,0.764041 -0.8259905,-1.73458 1.300935,-1.073788 -1.6726308,0.309747 0.2477972,-1.858479 -1.218336,1.383534 -0.8879399,-1.073788 -0.7020919,1.197687 -1.3835341,-1.259636 z"
+               id="path3075-4-4"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cccccccccccccccccccc" />
+            <path
+               style="fill:none;stroke:#43981a;stroke-width:0.13215849;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="M 5.8716901,41.029291 5.2757452,41.927074 3.7277622,40.635871"
+               id="path4324-3-5"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccc" />
+            <path
+               style="fill:none;stroke:#43981a;stroke-width:0.1651981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 3.4962543,40.626093 0.321235,1.460158 -1.5769715,-0.146016 1.0221111,1.226534 -0.8760951,1.956613 1.7813936,-1.138924 0.6424699,0.876095 1.0221111,-0.876095 0.8760951,1.080517 0.7300795,-0.963705 1.5769715,0.73008 -0.7008764,-1.606175 1.2265335,-1.28494 c 0,0 -1.6061746,0.408845 -1.6061746,0.292032 0,-0.116813 0.175219,-1.693784 0.175219,-1.693784 L 6.76701,41.852626 6.0077274,40.888921"
+               id="path4322-0-5-8"
+               inkscape:connector-curvature="0" />
+            <text
+               xml:space="preserve"
+               style="font-size:3.30396199px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               x="-10.869791"
+               y="42.892876"
+               id="text4243-1-3"
+               sodipodi:linespacing="125%"
+               transform="matrix(0.95240857,-0.30482441,0.30482441,0.95240857,0,0)"><tspan
+                 sodipodi:role="line"
+                 id="tspan4245-7-1"
+                 x="-10.869791"
+                 y="42.892876">B</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:3.30396199px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008800;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               x="3.785182"
+               y="43.372581"
+               id="text4243-4-4-2"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan4245-3-3-2"
+                 x="3.785182"
+                 y="43.372581">0</tspan></text>
+            <g
+               transform="matrix(0.32049554,0.08027616,-0.08027616,0.32049554,-14.056757,47.150968)"
+               style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               id="text4243-2-1-9">
+              <path
+                 d="m 57.427763,-26.726684 c 0.878907,-2.22656 1.186062,-3.627987 1.648302,-5.932679 l 2.333984,-0.380859 -0.332031,3.583984 0.908203,-3.310547 2.246094,-0.390625 c -0.266933,2.122401 -0.400396,4.036462 -0.400391,5.742188 -5e-6,0.338543 0.0033,0.673829 0.0098,1.005859 l -2.001953,0.351563 0.351562,-4.277344 -0.722389,2.703554 -1.074219,0.146484 0.08762,-3.982851 -1.023302,4.467836 -2.03125,0.273437"
+                 id="path4320-4-5"
+                 inkscape:connector-curvature="0"
+                 sodipodi:nodetypes="ccccccccccccccc"
+                 style="fill:#008700;fill-opacity:1" />
+            </g>
+            <text
+               xml:space="preserve"
+               style="font-size:3.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               x="21.634735"
+               y="37.95356"
+               id="text4243-4-1-6-5"
+               sodipodi:linespacing="125%"
+               transform="matrix(0.91529523,0.40278361,-0.40278361,0.91529523,0,0)"><tspan
+                 sodipodi:role="line"
+                 id="tspan4245-3-7-9-4"
+                 x="21.634735"
+                 y="37.95356">0</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:3.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
+               x="6.5840259"
+               y="44.456589"
+               id="text4243-2-8-4-6"
+               sodipodi:linespacing="125%"
+               transform="matrix(0.9986833,-0.05129977,0.05129977,0.9986833,0,0)"><tspan
+                 sodipodi:role="line"
+                 id="tspan4245-34-8-2-3"
+                 x="6.5840259"
+                 y="44.456589">!</tspan></text>
+            <path
+               style="fill:#008700;fill-opacity:1;stroke:none"
+               d="M 1.9319816,44.949602 C 1.6788875,45.124821 1.1775664,45.343845 1.742161,44.818188 4.3217747,43.075732 7.7482808,43.698733 9.3057834,44.321734 8.9909587,44.430221 8.4435877,44.033224 6.5168805,43.810678 c -0.6097716,-0.06356 -1.2758328,0.0053 -1.4658662,0.04747 0.7521579,-0.06962 1.3591631,-0.02391 1.5814263,0.02013 0.3566118,0.07907 0.090937,0.158828 -0.1010844,0.196084 -1.1676975,-0.323276 -3.416646,-0.283157 -4.5993746,0.875235 z"
+               id="path4353-2-1"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cccccccc" />
+          </g>
+        </g>
+        <text
+           xml:space="preserve"
+           style="font-size:2.44724345px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:Blambot Pro;-inkscape-font-specification:Blambot Pro"
+           x="12.93771"
+           y="46.171741"
+           id="text3640-2"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3642-0"
+             x="12.93771"
+             y="46.171741">#11</tspan></text>
+      </g>
+    </g>
     <g
-       id="g4827"
-       transform="matrix(0,1,-1,0,42.824382,-29.031256)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette_big.png"
-       inkscape:export-xdpi="994.16998"
-       inkscape:export-ydpi="994.16998">
+       id="g9470"
+       transform="translate(148.05713,-261.44308)">
+      <g
+         transform="matrix(5.7877629,0,0,5.7877629,64.783519,565.97661)"
+         id="g4574">
+        <path
+           style="fill:#008c00;fill-opacity:0.40526315;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 17.411881,46.276666 0.8125,-0.6875 -0.09375,-2.203125 -0.875,-0.690831 -3.71875,-0.32479 -1.18907,1.026808 0.282583,2.556869 0.873047,0.654029 3.095972,-0.08145 1.211168,0.8431 z"
+           id="path3618"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/chat.png"
+           inkscape:export-xdpi="423.23508"
+           inkscape:export-ydpi="423.23508" />
+      </g>
+    </g>
+    <g
+       id="g9378"
+       transform="translate(182.89801,-255.17725)">
+      <path
+         inkscape:export-ydpi="434.10669"
+         inkscape:export-xdpi="434.10669"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/drawing_object.png"
+         sodipodi:nodetypes="ccccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4394"
+         d="m 214.73609,749.8629 -6.00277,0.93791 6.37794,3.65793 -9.72829,4.71597 -1.31308,6.8469 19.39241,-6.47448 2.90759,1.4069 -23.72965,8.72275 -1.64472,6.07006 25.67184,-8.27833 2.39977,2.2993 -15.84322,4.73404 4.58809,1.36253 18.38346,-5.90897 -8.53518,-5.72138 -22.16264,7.94868 0.5192,-1.56799 26.07448,-10.12965 -6.19035,-4.87725 -17.42276,6.3807 0.37513,-1.87587 10.38485,-4.80977 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9371"
+       transform="translate(-39.843745,-252.9677)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,452.19167)"
+         inkscape:export-ydpi="469.5"
+         inkscape:export-xdpi="469.5"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/new_item.png"
+         id="g4570">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 42.796875,33.828125 42.125,33.875 l -0.21875,1.34375 -1.5,-0.515625 -0.3125,0.40625 1.251896,1.278244 -1.15468,2.113951 0.75,0.28125 1.621534,-1.18907 1.3125,1.25 0.932138,-0.296415 -1.200444,-2.109835 1.279355,-1.541973 -0.28125,-0.28125 -1.651674,0.541973 z m 0.0625,1.890625 1.110161,-0.39252 -0.91841,1.063285 0.772097,1.621534 -1.231369,-1.024318 -1.459597,0.775888 0.744639,-1.375 -1.141736,-1.177562 1.415403,0.462603 0.292624,-1.270852 z"
+           id="path4390"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_object.png"
+           inkscape:export-xdpi="469.50342"
+           inkscape:export-ydpi="469.50342" />
+        <path
+           style="fill:url(#linearGradient11095);fill-opacity:1;stroke:none"
+           d="m 40.484375,34.987182 1.53125,0.4375 0.40625,-1.359375 0.5,1.359375 1.53125,-0.40625 -1.21875,1.40625 0.828125,1.609375 -0.296875,0.28125 -1.171875,-1 -1.28125,0.859375 -0.453125,-0.296875 0.703125,-1.609375 z"
+           id="path4411"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_object.png"
+           inkscape:export-xdpi="469.50342"
+           inkscape:export-ydpi="469.50342" />
+      </g>
+    </g>
+    <g
+       id="g8503"
+       transform="translate(11.359843,-176.91147)">
+      <path
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         sodipodi:nodetypes="csssssssssc"
+         id="path2816"
+         d="m 242.94224,283.89527 c 0,3.33794 -1.8674,5.18058 -4.8506,6.18874 -0.74577,0.25205 -2.17543,0.9125 -3.04896,1.94053 -0.87352,1.02802 -1.19096,2.42362 -2.16873,2.50834 -1.95555,0.16942 -4.09609,0.21284 -6.32767,0.21284 -2.23159,0 -4.34295,-0.0435 -6.25473,-0.21284 -0.95589,-0.0847 -1.24779,-1.48032 -2.09397,-2.50834 -0.84617,-1.02803 -2.24664,-1.68849 -2.96326,-1.94053 -2.8665,-1.00816 -4.61721,-2.8508 -4.61721,-6.18874 0,-6.67587 7.23623,-12.08773 16.16256,-12.08773 8.92634,0 16.16257,5.41186 16.16257,12.08773 z"
+         style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:1.37716246;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         transform="matrix(0.12076083,0.06557291,-0.06721183,0.12377908,207.18535,238.85026)"
+         d="m 271.42857,224.50504 c 0,25.64179 -16.30963,46.42857 -36.42857,46.42857 -20.11894,0 -36.42857,-20.78678 -36.42857,-46.42857 0,-25.6418 16.30963,-46.42857 36.42857,-46.42857 20.11894,0 36.42857,20.78677 36.42857,46.42857 z"
+         sodipodi:ry="46.42857"
+         sodipodi:rx="36.42857"
+         sodipodi:cy="224.50504"
+         sodipodi:cx="235"
+         id="path3591"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         transform="matrix(-0.13916266,0.07556519,0.07745386,0.14264094,248.22968,232.48052)"
+         d="m 271.42857,224.50504 c 0,25.64179 -16.30963,46.42857 -36.42857,46.42857 -20.11894,0 -36.42857,-20.78678 -36.42857,-46.42857 0,-25.6418 16.30963,-46.42857 36.42857,-46.42857 20.11894,0 36.42857,20.78677 36.42857,46.42857 z"
+         sodipodi:ry="46.42857"
+         sodipodi:rx="36.42857"
+         sodipodi:cy="224.50504"
+         sodipodi:cx="235"
+         id="path3591-8"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <rect
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         y="296.65213"
+         x="222.37177"
+         height="3.3310764"
+         width="3.1361356"
+         id="rect3615"
+         style="fill:#008700;fill-opacity:1;stroke:#008707;stroke-width:1.26236498;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <rect
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         inkscape:transform-center-y="-0.33253582"
+         inkscape:transform-center-x="-0.052775473"
+         y="296.6239"
+         x="227.45998"
+         height="3.3310764"
+         width="3.1361356"
+         id="rect3615-9"
+         style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:1.26236498;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <rect
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         transform="matrix(0.89030651,-0.45536175,0.54925699,0.83565349,0,0)"
+         inkscape:transform-center-y="-0.24751196"
+         inkscape:transform-center-x="0.10964832"
+         y="372.39023"
+         x="30.832918"
+         height="2.723634"
+         width="2.6492579"
+         id="rect3615-9-4-9"
+         style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:1.0491358;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <rect
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         transform="matrix(-0.89030651,-0.45536175,-0.54925699,0.83565349,0,0)"
+         inkscape:transform-center-y="-0.24751063"
+         inkscape:transform-center-x="-0.1096487"
+         y="164.92877"
+         x="-349.73035"
+         height="2.723634"
+         width="2.6492579"
+         id="rect3615-9-4-9-0"
+         style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:1.0491358;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         transform="matrix(0.03475157,0.01887001,-0.01934167,0.0356201,221.187,278.04586)"
+         d="m 271.42857,224.50504 c 0,25.64179 -16.30963,46.42857 -36.42857,46.42857 -20.11894,0 -36.42857,-20.78678 -36.42857,-46.42857 0,-25.6418 16.30963,-46.42857 36.42857,-46.42857 20.11894,0 36.42857,20.78677 36.42857,46.42857 z"
+         sodipodi:ry="46.42857"
+         sodipodi:rx="36.42857"
+         sodipodi:cy="224.50504"
+         sodipodi:cx="235"
+         id="path3591-9"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         transform="matrix(-0.03475157,0.01887001,0.01934167,0.0356201,232.59303,277.92964)"
+         d="m 271.42857,224.50504 c 0,25.64179 -16.30963,46.42857 -36.42857,46.42857 -20.11894,0 -36.42857,-20.78678 -36.42857,-46.42857 0,-25.6418 16.30963,-46.42857 36.42857,-46.42857 20.11894,0 36.42857,20.78677 36.42857,46.42857 z"
+         sodipodi:ry="46.42857"
+         sodipodi:rx="36.42857"
+         sodipodi:cy="224.50504"
+         sodipodi:cx="235"
+         id="path3591-9-9"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="566.92914"
+         inkscape:export-xdpi="566.92914"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
+         sodipodi:nodetypes="czzcc"
+         inkscape:connector-curvature="0"
+         id="path4103-2-7"
+         d="m 230.19434,272.79172 c -0.7389,-0.61357 -4.55325,-1.14985 -5.86174,-0.29885 -1.30849,0.851 0.0238,2.8392 2.1804,2.98276 2.15639,0.14356 0.8734,-1.27046 1.50907,-1.60724 0.63567,-0.33678 2.06719,-0.54092 2.17227,-1.07667 z"
+         style="fill:#ffffff;fill-opacity:0.21634617;stroke:none" />
+    </g>
+    <g
+       id="g9360"
+       transform="translate(-41.309773,-256.26907)">
+      <path
+         inkscape:export-ydpi="354.93695"
+         inkscape:export-xdpi="354.93695"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
+         transform="matrix(8.4891828,0,0,8.4891828,20.869167,451.34753)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 29.43332,35.498436 c 0,0.43934 -0.356155,0.795495 -0.795495,0.795495 -0.43934,0 -0.795495,-0.356155 -0.795495,-0.795495 0,-0.43934 0.356155,-0.795495 0.795495,-0.795495 0.436669,0 0.791708,0.351997 0.795466,0.78865"
+         sodipodi:ry="0.79549515"
+         sodipodi:rx="0.79549515"
+         sodipodi:cy="35.498436"
+         sodipodi:cx="28.637825"
+         id="path4400"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="354.93695"
+         inkscape:export-xdpi="354.93695"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
+         sodipodi:nodetypes="cccccccsccccccc"
+         inkscape:connector-curvature="0"
+         id="path4402"
+         d="m 259.15057,761.84508 -1.4538,-1.54759 -1.78206,0.84417 0.37514,3.93931 4.59585,0.28142 0.18761,11.44276 -4.40828,-0.56275 c 0,0 -3.18896,5.62758 -2.72,5.62758 0.46894,0 21.47863,0.0938 21.47863,0.0938 l -2.25103,-6.09655 -4.97103,1.3131 -1.12552,-11.72414 3.93931,0.56275 2.6731,-4.2676 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="354.93695"
+         inkscape:export-xdpi="354.93695"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
+         transform="matrix(8.4891828,0,0,8.4891828,17.378825,450.06937)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 29.21875,35.38562 c 0,0.194163 -0.1574,0.351563 -0.351563,0.351563 -0.194162,0 -0.351562,-0.1574 -0.351562,-0.351563 0,-0.194162 0.1574,-0.351562 0.351562,-0.351562 0.192983,0 0.349889,0.155562 0.35155,0.348537"
+         sodipodi:ry="0.3515625"
+         sodipodi:rx="0.3515625"
+         sodipodi:cy="35.38562"
+         sodipodi:cx="28.867188"
+         id="path3619"
+         style="fill:#ffffff;fill-opacity:0.10576926;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="354"
+         inkscape:export-xdpi="354"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4439"
+         d="m 274.20435,781.21335 -18.99311,-0.18761 0.66267,-1.34528 17.52517,-0.23209 z"
+         style="fill:#006000;fill-opacity:0.21634617;stroke:none" />
+    </g>
+    <g
+       id="g9366"
+       transform="translate(-32.751036,-255.17361)">
+      <path
+         inkscape:export-ydpi="390.52463"
+         inkscape:export-xdpi="390.52463"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/warning_message.png"
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4441-5"
+         d="m 303.46777,755.95571 -0.61606,-5.69701 -12.66388,22.90524 2.65287,6.89747 30.37374,-0.0458 6.1016,-7.42803 -13.84272,-19.34709 -0.88414,4.66804 8.89054,13.6179 -2.65287,4.50988 -23.21098,1.10667 -2.65287,-5.04046 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="390.52463"
+         inkscape:export-xdpi="390.52463"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/warning_message.png"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 35.200658,37.619759 c 0,0.244077 -0.197864,0.441941 -0.441941,0.441941 -0.244078,0 -0.441942,-0.197864 -0.441942,-0.441941 0,-0.244078 0.197864,-0.441942 0.441942,-0.441942 0.242593,0 0.439837,0.195554 0.441925,0.438139"
+         sodipodi:ry="0.44194174"
+         sodipodi:rx="0.44194174"
+         sodipodi:cy="37.619759"
+         sodipodi:cx="34.758717"
+         id="path4447-7"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc"
+         transform="matrix(8.4891828,0,0,8.4891828,12.962926,451.47967)" />
       <path
-         inkscape:export-ydpi="1017.6678"
-         inkscape:export-xdpi="1017.6678"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
+         inkscape:export-ydpi="390.52463"
+         inkscape:export-xdpi="390.52463"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/warning_message.png"
          sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="rect4291"
-         d="m 34.260023,5.0859996 1.440663,0.1038316 -0.05192,1.6353479 -1.349809,-0.090852 z"
-         style="fill:#009aff;fill-opacity:1;stroke:none" />
+         id="path4449-1"
+         d="m 306.54868,764.89284 4.55311,0.50782 4.21793,-18.33632 -11.25517,-1.40575 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9843"
+       transform="translate(19.057123,11.056941)">
+      <g
+         transform="matrix(2.9172006,0,0,2.9172006,143.68558,630.06286)"
+         id="g4810">
+        <rect
+           style="fill:#edeceb;fill-opacity:1;stroke:none"
+           id="rect4641-5"
+           width="140.18391"
+           height="12.551146"
+           x="5.1417742"
+           y="71.693466"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style02.png"
+           inkscape:export-xdpi="93.218567"
+           inkscape:export-ydpi="93.218567" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022;stroke-dashoffset:0"
+           d="m 5.3215779,78.057428 139.9705821,0"
+           id="path4639-2"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style02.png"
+           inkscape:export-xdpi="93.218567"
+           inkscape:export-ydpi="93.218567" />
+      </g>
+    </g>
+    <g
+       id="g9848"
+       transform="translate(19.057123,11.056956)">
+      <g
+         transform="matrix(2.9172006,0,0,2.9172006,135.43448,628.96693)"
+         id="g4806">
+        <rect
+           style="fill:#edeceb;fill-opacity:1;stroke:none"
+           id="rect4641-5-7"
+           width="140.18391"
+           height="12.551146"
+           x="7.9702067"
+           y="88.310478"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style03.png"
+           inkscape:export-xdpi="93.218567"
+           inkscape:export-ydpi="93.218567" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.95900011, 9.91800022;stroke-dashoffset:14.87700033"
+           d="m 8.1500096,94.674439 139.9705804,0"
+           id="path4639-2-5"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style03.png"
+           inkscape:export-xdpi="93.218567"
+           inkscape:export-ydpi="93.218567" />
+      </g>
+    </g>
+    <g
+       id="g9853"
+       transform="translate(19.057128,11.056986)">
+      <g
+         transform="matrix(2.9172006,0,0,2.9172006,135.43449,636.12209)"
+         id="g4802">
+        <rect
+           style="fill:#edeceb;fill-opacity:1;stroke:none"
+           id="rect4641-5-7-1"
+           width="140.18391"
+           height="12.551146"
+           x="7.9702072"
+           y="102.09906"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
+           inkscape:export-xdpi="93.218567"
+           inkscape:export-ydpi="93.218567" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:14.87700033"
+           d="m 8.1500094,108.46302 139.9705706,0"
+           id="path4639-2-5-4"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
+           inkscape:export-xdpi="93.218567"
+           inkscape:export-ydpi="93.218567" />
+      </g>
+    </g>
+    <g
+       id="g9858"
+       transform="translate(19.05712,11.056917)">
+      <g
+         transform="matrix(2.9172006,0,0,2.9172006,115.10083,639.1518)"
+         id="g4794">
+        <g
+           id="g4787"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style05.png"
+           inkscape:export-xdpi="93"
+           inkscape:export-ydpi="93">
+          <rect
+             inkscape:export-ydpi="93.218567"
+             inkscape:export-xdpi="93.218567"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
+             y="117.30186"
+             x="9.0308695"
+             height="12.551146"
+             width="140.18391"
+             id="rect4641-5-7-1-6"
+             style="fill:#edeceb;fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:export-ydpi="93.218567"
+             inkscape:export-xdpi="93.218567"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
+             inkscape:connector-curvature="0"
+             id="path4639-2-5-4-5"
+             d="m 9.210674,123.57743 45.970566,0"
+             style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:41.65560093" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:export-ydpi="93.218567"
+             inkscape:export-xdpi="93.218567"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
+             inkscape:connector-curvature="0"
+             id="path4639-2-5-4-5-2"
+             d="m 55.452217,123.57743 45.970563,0"
+             style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:28.26630063" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:export-ydpi="93.218567"
+             inkscape:export-xdpi="93.218567"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
+             inkscape:connector-curvature="0"
+             id="path4639-2-5-4-5-2-0"
+             d="m 115.02989,123.57743 45.97056,0"
+             style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:28.26630063" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:export-ydpi="93.218567"
+             inkscape:export-xdpi="93.218567"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
+             inkscape:connector-curvature="0"
+             id="path4639-2-5-4-5-2-0-8"
+             d="m 100.10847,123.57743 9.97056,0"
+             style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:28.26630063" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g9474"
+       transform="translate(140.05713,-253.94308)">
+      <path
+         inkscape:export-ydpi="1432.9553"
+         inkscape:export-xdpi="1432.9553"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_general_preferences.png"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccscsss"
+         inkscape:connector-curvature="0"
+         id="path4820"
+         d="m 229.52127,794.22427 c -3.01992,-0.66191 -8.10328,-1.32383 -12.99906,0.26528 l 2.65287,11.40734 -5.61655,2.30988 -6.1016,-10.87676 c -4.29141,2.71952 -8.16573,7.54235 -8.75447,10.87676 l 10.74413,4.37724 -1.1938,5.43838 -10.0809,-1.85701 c -1.63593,4.24459 -0.61903,7.29539 0.66326,11.2747 l 10.47879,-2.78551 4.50988,7.29539 -9.01976,6.1016 c 1.45908,2.52022 6.89746,6.49953 11.2747,7.29539 l 3.0508,-11.00941 8.2239,-0.26529 4.24459,11.2747 c 4.99624,-2.56444 8.79868,-7.25118 11.40734,-10.87677 l -9.81562,-4.50988 3.71402,-6.1016 10.61147,3.71402 c 1.32644,-3.80245 1.32644,-8.53339 0,-12.2032 l -9.81561,1.59172 -2.38759,-5.83631 10.08091,-3.71402 c -0.75165,-3.58137 -4.2888,-9.81561 -9.01976,-11.93791 l -5.30574,12.73377 -5.79079,-1.7793 z m -6.94298,17.96181 c 4.13416,0 7.65774,3.4704 7.69332,7.69332 0,4.2489 -3.53387,7.69332 -7.69332,7.69332 -4.15945,0 -7.42803,-3.44442 -7.42803,-7.69332 0,-4.2489 3.26858,-7.69332 7.42803,-7.69332 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="1017.6678"
-         inkscape:export-xdpi="1017.6678"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
-         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="1432.9553"
+         inkscape:export-xdpi="1432.9553"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_general_preferences.png"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4820-4"
+         d="m 226.83646,795.62639 -7.90758,0.40256 2.14975,11.11977 -7.92792,3.3725 -5.88235,-10.50225 -5.59349,7.31329 8.70649,3.5471 1.84642,9.37802 -12.48354,-1.22344 1.28779,6.32265 9.8046,-3.38276 5.53044,9.85112 -8.43467,6.06996 6.32265,4.59871 4.72324,-11.17251 8.91526,0.3478 4.37754,10.07438 7.74324,-6.93813 -9.07959,-4.21734 3.85378,-9.07132 11.69418,4.13518 0.56275,-8.57576 -9.45476,1.85262 -5.5927,-7.26187 12.01456,-5.72966 -7.12157,-7.61044 -5.23744,11.63191 -7.69394,-1.06668 z m -5.06348,17.9319 6.23429,6.23427 -6.23429,6.23429 -6.01931,-6.23429 z"
+         style="fill:none;stroke:#ffffff;stroke-width:0.42445916;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9478"
+       transform="translate(137.05713,-252.94308)">
+      <path
+         inkscape:export-ydpi="1432.9553"
+         inkscape:export-xdpi="1432.9553"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_font_properties.png"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccscsss"
          inkscape:connector-curvature="0"
-         id="rect4291-8"
-         d="m 37.225713,5.1768518 -1.245978,-0.038936 -0.02597,1.7521584 1.427683,-0.2076624 z"
-         style="fill:#009a00;fill-opacity:1;stroke:none" />
+         id="path4820-8"
+         d="m 300.59862,792.49646 c -3.01992,-0.6619 -8.10328,-1.32383 -12.99906,0.26529 l 2.65287,11.40734 -5.61655,2.30988 -6.1016,-10.87677 c -4.29141,2.71952 -8.16574,7.54236 -8.75447,10.87677 l 10.74412,4.37724 -1.19379,5.43838 -10.0809,-1.85701 c -1.63594,4.24459 -0.61903,7.29539 0.66326,11.2747 l 10.47879,-2.78552 4.50988,7.29539 -9.01976,6.1016 c 1.45908,2.52023 6.89746,6.49953 11.2747,7.2954 l 3.0508,-11.00941 8.22389,-0.26529 4.24459,11.2747 c 4.99624,-2.56444 8.79869,-7.25118 11.40734,-10.87677 l -9.81561,-4.50988 3.71401,-6.1016 10.61148,3.71402 c 1.32644,-3.80245 1.32644,-8.5334 0,-12.2032 l -9.81562,1.59172 -2.38758,-5.83631 10.08091,-3.71402 c -0.75164,-3.58137 -4.28881,-9.81562 -9.01976,-11.93791 l -5.30574,12.73377 -5.79079,-1.77931 z m -8.91264,16.17974 c 5.77836,-1.25861 12.15981,1.78213 12.47677,9.28781 0,5.6558 -6.34766,8.81884 -10.50711,8.81884 -4.15946,0 -9.49149,-4.38235 -9.49149,-8.63125 0,-4.24891 2.48755,-8.37885 7.52183,-9.4754 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="1017.6678"
-         inkscape:export-xdpi="1017.6678"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
-         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="1432.9553"
+         inkscape:export-xdpi="1432.9553"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_font_properties.png"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
          inkscape:connector-curvature="0"
-         id="rect4291-8-9"
-         d="m 35.759092,7.0198629 -1.440663,0.1038316 -0.194685,1.5834321 1.59641,-0.038936 z"
-         style="fill:#ff5900;fill-opacity:1;stroke:none" />
+         id="path4820-4-9"
+         d="m 297.9138,793.89859 -7.90757,0.40255 2.14975,11.11978 -7.92792,3.3725 -5.88235,-10.50225 -5.59349,7.31329 8.70649,3.5471 0.51996,7.91894 -11.1571,0.23566 1.28779,6.32265 9.8046,-3.38276 5.53044,9.85113 -8.43467,6.06995 6.32265,4.59871 5.17611,-11.57986 8.46239,0.75511 4.37754,10.07438 7.74324,-6.93813 -9.07959,-4.21734 3.85378,-9.07132 11.69418,4.13518 0.56275,-8.57577 -10.01752,2.04021 -4.09201,-7.73084 11.07663,-5.44827 -7.12157,-7.61044 -5.23744,11.63191 -7.69394,-1.06668 z m -5.06347,17.93189 6.23428,6.23428 -6.23428,6.23429 -6.01931,-6.23429 z"
+         style="fill:none;stroke:#ffffff;stroke-width:0.42445916;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="1017.6678"
-         inkscape:export-xdpi="1017.6678"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
-         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="1432"
+         inkscape:export-xdpi="1432"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_font_properties.png"
+         sodipodi:nodetypes="ccccccccccccc"
          inkscape:connector-curvature="0"
-         id="rect4291-1"
-         d="m 35.966757,7.0717787 1.466621,-0.012975 0.298516,1.6223689 -1.700241,-0.077874 z"
-         style="fill:#e89aff;fill-opacity:1;stroke:none" />
+         id="path4884"
+         d="m 287.4743,811.63304 -0.034,3.76432 5.25003,-0.98476 0.15102,6.94183 -1.37143,0 0,2.39999 4.84086,0.16232 0.4939,-2.4 -1.90615,-0.16231 0.69289,-6.82754 5.25003,1.3418 -0.11426,-4.11429 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
     </g>
     <g
-       id="g5236">
+       id="g9483"
+       transform="translate(148.05713,-258.94308)">
       <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="ccccccccc"
+         inkscape:export-ydpi="1432.9553"
+         inkscape:export-xdpi="1432.9553"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccscsss"
          inkscape:connector-curvature="0"
-         id="path4350"
-         d="M 42.140214,6.7965104 41.096336,6.5417208 41.229606,7.7484091 42.484654,7.5995063 42.266616,7.301418 41.502271,7.4346763 41.402792,7.017865 42.238932,7.109192 z"
+         id="path4820-8-9"
+         d="m 362.35628,793.24175 c -3.01992,-0.66191 -8.10329,-1.32383 -12.99907,0.26528 l 2.65287,11.40734 -5.61654,2.30988 -6.1016,-10.87676 c -4.29141,2.71952 -8.16574,7.54235 -8.75447,10.87676 l 10.74412,4.37724 -1.19379,5.43838 -10.0809,-1.85701 c -1.63594,4.24459 -0.61904,7.29539 0.66326,11.2747 l 10.47879,-2.78552 4.50988,7.2954 -9.01976,6.1016 c 1.45908,2.52022 6.89746,6.49953 11.2747,7.29539 l 3.0508,-11.00941 8.22389,-0.26529 4.24459,11.2747 c 4.99624,-2.56444 8.79868,-7.25118 11.40734,-10.87677 l -9.81562,-4.50988 3.71402,-6.1016 10.61148,3.71402 c 1.32644,-3.80245 1.32644,-8.53339 0,-12.2032 l -9.81562,1.59172 -2.38758,-5.83631 10.0809,-3.71402 c -0.75163,-3.58137 -4.2888,-9.81562 -9.01975,-11.93791 l -5.30574,12.73377 -5.7908,-1.7793 z m -8.91264,16.17973 c 5.77836,-1.25861 12.15981,1.78214 12.47677,9.28781 0,5.6558 -6.34766,8.81884 -10.50711,8.81884 -4.15946,0 -9.49149,-4.38235 -9.49149,-8.63125 0,-4.2489 2.48755,-8.37885 7.52183,-9.4754 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="ccccczc"
+         inkscape:export-ydpi="1432.9553"
+         inkscape:export-xdpi="1432.9553"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
          inkscape:connector-curvature="0"
-         id="path4352"
-         d="m 41.218515,7.7809647 c 0.05954,-0.1151733 0.04532,-0.5732844 -0.0103,-0.9705059 C 41.064512,5.919346 40.386246,6.3888145 40.04495,6.4021871 c -0.431697,-0.028427 0.0081,-1.1549823 -0.0615,-1.5055589 -0.148936,0.2997617 -0.639902,0.7059498 -0.657937,1.0325403 -0.252944,0.7792545 -0.03399,1.7892681 0.372616,2.0762826 0.406616,0.2870147 1.202493,0.3349163 1.520354,-0.2244814 z"
+         id="path4820-4-9-5"
+         d="m 359.67146,794.64387 -7.90757,0.40256 2.14975,11.11977 -7.92792,3.3725 -5.88235,-10.50225 -5.59349,7.31329 8.70649,3.5471 0.51996,7.91894 -11.1571,0.23566 1.28779,6.32265 9.8046,-3.38276 5.53044,9.85113 -8.43468,6.06995 6.32266,4.59871 5.17611,-11.57986 8.46239,0.75512 4.37754,10.07437 7.74324,-6.93813 -9.0796,-4.21733 3.85379,-9.07133 11.69418,4.13518 0.56275,-8.57576 -10.01752,2.0402 -4.09201,-7.73083 11.07663,-5.44828 -7.12158,-7.61044 -5.23743,11.63191 -7.69394,-1.06668 z m -5.06347,17.9319 6.23428,6.23427 -6.23428,6.23429 -6.01931,-6.23429 z"
+         style="fill:none;stroke:#ffffff;stroke-width:0.42445916;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="1432"
+         inkscape:export-xdpi="1432"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4910"
+         d="m 360.75124,811.8733 0.22879,0.74366 -11.36603,0.67361 0,-1.03171 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="cccscsc"
+         inkscape:export-ydpi="1432"
+         inkscape:export-xdpi="1432"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
+         sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="path4354"
-         d="m 39.636532,6.7186813 c 0.0462,0.7665583 0.590039,0.4550748 0.883299,0.1166901 0.388395,-0.1370162 0.687126,1.0741156 0.03376,1.1784466 -0.159485,0.081196 -0.539285,-0.1136201 -0.742394,-0.3328225 -0.05079,-0.054806 0.39559,0.3442611 0.723802,-0.056815 -0.42545,0.1313461 -0.881874,-0.056526 -0.944807,-0.3554733 -0.03442,-0.1634874 -0.03034,-0.3485938 0.04633,-0.5500258 z"
-         style="fill:#ffffff;fill-opacity:0.47058824;stroke:none" />
+         id="path4910-3"
+         d="m 360.49402,812.44648 1.29034,-0.127 -0.74467,12.64028 -0.89907,0.0331 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="1432"
+         inkscape:export-xdpi="1432"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
+         sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="path4364"
-         d="m 41.808079,6.854845 c -0.0091,0.2233194 0.09177,0.5475912 0.238617,0.6974905"
-         style="fill:none;stroke:#008700;stroke-width:0.16613059;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="M 3.2911255,1.461894 C 3.279685,1.4754385 2.7814371,1.7301511 2.7814371,1.7301511 2.8708561,1.8106281 2.9602752,1.9447567 2.9692171,2.011821 3.0765198,1.828512 3.110052,1.692148 3.2911255,1.461894 z"
-       id="path3759"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-       inkscape:export-xdpi="597.56848"
-       inkscape:export-ydpi="597.56848"
-       inkscape:transform-center-x="-0.11381181"
-       inkscape:transform-center-y="-0.08535887" />
-    <g
-       id="g4224"
-       transform="translate(0.37623558,-4.9892767)">
+         id="path4910-3-1"
+         d="m 350.29133,811.97416 -1.05821,-0.0603 0.94365,12.77293 1.03171,0 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="583.88239"
-         inkscape:export-xdpi="583.88239"
-         inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
+         inkscape:export-ydpi="1432"
+         inkscape:export-xdpi="1432"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
          sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="rect3928"
-         d="m 45.002411,6.7387535 4.09375,-0.03125 -0.01563,2.328125 -4.109375,0.0625 z"
-         style="fill:url(#linearGradient4231);fill-opacity:1;stroke:none" />
+         id="path4910-3-1-6"
+         d="m 362.13537,824.73334 0.0603,-1.09137 -12.5408,0.44627 0.0995,0.83279 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="583.88239"
-         inkscape:export-xdpi="583.88239"
-         sodipodi:nodetypes="cccc"
+         inkscape:export-ydpi="1432"
+         inkscape:export-xdpi="1432"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
+         sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="path3906-4"
-         d="m 45.53477,6.6649749 -0.210939,-0.6976682 3.456535,-0.051776 -0.05658,0.6968828"
-         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path4910-9"
+         d="m 362.05296,816.52126 0.0881,0.97815 -11.835,-0.0764 0,-1.03171 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="583.88239"
-         inkscape:export-xdpi="583.88239"
-         inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
+         inkscape:export-ydpi="1432"
+         inkscape:export-xdpi="1432"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
+         sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="path3132"
-         d="m 44.879183,6.573351 -0.0221,2.7400384 4.441515,-0.0221 -0.08839,-2.7621355 -3.999572,-0.022097 0,0.3756505 3.71231,-0.1546796 0.04419,2.298097 -3.756504,0 -0.0442,-2.4748737 z"
+         id="path4910-9-7"
+         d="m 355.42716,816.93431 0.83746,-0.22879 0.25187,8.69294 -1.03172,0 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="583.88239"
-         inkscape:export-xdpi="583.88239"
-         inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
-         sodipodi:nodetypes="ccccccccc"
+         inkscape:export-ydpi="1432"
+         inkscape:export-xdpi="1432"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
+         sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="path3902"
-         d="m 46.608118,7.9674974 -0.02187,0.725183 1.126721,0.004 0,-0.773398 -0.375651,-0.0221 0.0221,0.441942 -0.419844,-0.04419 -0.0221,-0.331457 z"
+         id="path4910-9-9"
+         d="m 355.95924,819.05683 0.0881,0.74365 -6.77016,0.20502 0.23447,-0.70342 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="1432"
+         inkscape:export-xdpi="1432"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
+         sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="path3985"
-         d="m 46.58602,7.9564484 1.115902,-0.03315"
-         style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path4910-9-9-5"
+         d="m 362.22929,821.14037 0.0323,0.74366 -6.62947,0.20501 0.25637,-0.70341 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
     </g>
     <g
-       id="g4371"
-       transform="matrix(0,1,-1,0,53.759228,-39.229286)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library.png"
-       inkscape:export-xdpi="799"
-       inkscape:export-ydpi="799">
+       id="g9495"
+       transform="translate(148.05713,-260.94308)">
+      <path
+         inkscape:export-ydpi="1432.9558"
+         inkscape:export-xdpi="1432.9558"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_workspace_properties.png"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccscsss"
+         inkscape:connector-curvature="0"
+         id="path4820-8-9-7"
+         d="m 430.53503,792.97646 c -3.01992,-0.6619 -8.10329,-1.32383 -12.99907,0.26529 l 2.65287,11.40733 -5.61654,2.30989 -6.1016,-10.87677 c -4.29141,2.71952 -8.16574,7.54235 -8.75447,10.87677 l 10.74412,4.37723 -1.19379,5.43838 -10.08091,-1.85701 c -1.63593,4.2446 -0.61903,7.2954 0.66326,11.2747 l 10.4788,-2.78551 4.50988,7.29539 -9.01976,6.1016 c 1.45908,2.52023 6.89746,6.49953 11.27469,7.29539 l 3.0508,-11.00941 8.2239,-0.26529 4.24459,11.2747 c 4.99624,-2.56444 8.79868,-7.25118 11.40734,-10.87677 l -9.81562,-4.50987 3.71402,-6.1016 10.61148,3.71401 c 1.32643,-3.80245 1.32643,-8.53339 0,-12.2032 l -9.81562,1.59173 -2.38758,-5.83632 10.0809,-3.71402 c -0.75163,-3.58137 -4.2888,-9.81561 -9.01975,-11.93791 l -5.30574,12.73378 -5.7908,-1.77931 z m -8.91264,16.17974 c 5.77836,-1.25862 12.15981,1.78213 12.47677,9.28781 0,5.6558 -6.34766,8.81883 -10.50711,8.81883 -4.15946,0 -9.49149,-4.38234 -9.49149,-8.63125 0,-4.2489 2.48755,-8.37885 7.52183,-9.47539 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="1432.9558"
+         inkscape:export-xdpi="1432.9558"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_workspace_properties.png"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4820-4-9-5-2"
+         d="m 427.85021,794.37858 -7.90757,0.40256 2.14975,11.11978 -7.92792,3.37249 -5.88235,-10.50224 -5.59349,7.31328 8.70649,3.54711 0.51996,7.91893 -11.1571,0.23566 1.28779,6.32265 9.8046,-3.38276 5.53044,9.85113 -8.43468,6.06995 6.32266,4.59871 5.17611,-11.57985 8.46239,0.75511 4.37753,10.07438 7.74325,-6.93814 -9.0796,-4.21733 3.85379,-9.07133 11.69418,4.13518 0.56275,-8.57576 -10.01752,2.04021 -4.09202,-7.73084 11.07664,-5.44827 -7.12158,-7.61044 -5.23743,11.63191 -7.69394,-1.06669 z m -5.06347,17.9319 6.23428,6.23428 -6.23428,6.23428 -6.01931,-6.23428 z"
+         style="fill:none;stroke:#ffffff;stroke-width:0.42445916;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#008700;fill-opacity:0.43269234;stroke:none"
-         d="m 46.726563,8.6434331 c -0.664468,0 -1.820313,0.1232635 -2.007814,-0.1484375 -0.01031,-0.3455895 1.163658,-0.3671875 1.828126,-0.3671875 0.558752,0 1.497092,0.038055 1.624768,0.1533009 0.437732,0.3918372 -0.780612,0.3623241 -1.44508,0.3623241 z"
-         id="path4204"
+         inkscape:export-ydpi="1432.9558"
+         inkscape:export-xdpi="1432.9558"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_workspace_properties.png"
+         sodipodi:nodetypes="cccccccccccccccccc"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="scscs" />
+         id="path4653-8-8"
+         d="m 417.25129,813.75791 1.02036,5.04853 3.34062,1.30224 1.81158,-1.81175 4.25714,4.86207 c 2.72041,1.34558 4.13821,-1.68855 3.1764,-2.89548 l -6.71167,-2.91604 0.85078,-3.59028 -2.59159,-2.07844 -3.94889,0.5147 2.18156,1.74426 0.99211,-0.72693 1.56027,0.52981 -0.13039,2.30765 -2.28283,1.52544 -1.35548,-0.65375 0.0552,-1.39817 z"
+         style="fill:url(#linearGradient11097);fill-opacity:1;stroke:#008600;stroke-width:0.44512028;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9396"
+       transform="translate(120.96543,-251.39987)">
       <g
-         transform="matrix(0.95243881,0,0,1.2224944,-5.2816729,3.4051066)"
-         id="g4144">
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,452.19167)"
+         id="g5123">
         <path
-           style="fill:url(#linearGradient4383);fill-opacity:1;stroke:none"
-           d="m 53.071592,2.4983545 2.315893,-0.017679 -0.0088,1.3170537 -2.324732,0.035357 z"
-           id="rect3928-0"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 53.550285,34.689671 0.09937,2.500824 2.003972,0.01656 0.198741,-2.765812 -2.186151,-0.01656 0.04968,0.215303 1.954287,-0.04969 -0.165618,2.484262 -1.681017,-0.06625 -0.09109,-2.310364 z"
+           id="path5117"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc"
-           inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
-           inkscape:export-xdpi="583.88239"
-           inkscape:export-ydpi="583.88239" />
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/recent_files.png"
+           inkscape:export-xdpi="338.82352"
+           inkscape:export-ydpi="338.82352" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 53.001881,2.4047839 -0.0125,1.550079 2.512629,-0.012502 -0.05,-1.5625796 -2.262616,-0.012501 0,0.2125109 2.100107,-0.087505 0.025,1.3000664 -2.125108,0 -0.02501,-1.4000715 z"
-           id="path3132-2"
+           d="m 52.970624,36.635677 0.496852,-0.04141 -0.03312,0.695593 2.434577,0 0.04969,-0.861211 0.538257,0.107652 -0.01656,1.33322 -3.50281,0.0083 z"
+           id="path5119"
            inkscape:connector-curvature="0"
-           inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
-           inkscape:export-xdpi="583.88239"
-           inkscape:export-ydpi="583.88239" />
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/recent_files.png"
+           inkscape:export-xdpi="338.82352"
+           inkscape:export-ydpi="338.82352" />
+        <path
+           style="fill:#008700;fill-opacity:0.45263157;stroke:none"
+           d="m 55.471351,34.785077 c -0.03513,0 -1.598542,-0.01757 -1.598542,-0.01757 l 0.19323,2.031845 1.200371,0.04099 0.07612,-0.7495 -0.819765,0.06441 -0.134676,-0.09369 0.95444,-0.05856 0.04685,-0.567979 -0.767067,0.117109 -0.03513,-0.122964 0.819765,-0.06441 z"
+           id="path5121"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/recent_files.png"
+           inkscape:export-xdpi="338"
+           inkscape:export-ydpi="338" />
       </g>
+    </g>
+    <g
+       id="g9505"
+       transform="translate(144.05713,-257.94308)">
       <path
-         transform="matrix(0.6656206,0,0,0.6656206,11.046434,5.8557945)"
-         d="m 55.949822,2.8499913 c 0,0.5369709 -0.435301,0.9722718 -0.972271,0.9722718 -0.536971,0 -0.972272,-0.4353009 -0.972272,-0.9722718 0,-0.5369709 0.435301,-0.9722718 0.972272,-0.9722718 0.53697,0 0.972271,0.4353009 0.972271,0.9722718 z"
-         sodipodi:ry="0.9722718"
-         sodipodi:rx="0.9722718"
-         sodipodi:cy="2.8499913"
-         sodipodi:cx="54.977551"
-         id="path4140-2"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+         inkscape:export-ydpi="300.9415"
+         inkscape:export-xdpi="300.9415"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_forward.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path5233-9"
+         d="m 540.59287,809.6764 -18.17237,-13.22843 0.80172,11.0905 -13.09481,-0.13362 0.72345,6.09513 12.49548,-1.16067 -0.39136,11.50085 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9502"
+       transform="translate(136.05713,-255.94308)">
+      <path
+         inkscape:export-ydpi="300.9415"
+         inkscape:export-xdpi="300.9415"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_backward.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path5233-7-8"
+         d="m 472.0917,810.5295 18.17237,-13.22841 -0.80172,11.09049 13.09479,-0.13362 -0.72345,6.09513 -12.49547,-1.16066 0.39135,11.50084 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9406"
+       transform="translate(174.5571,-246.8181)">
+      <path
+         inkscape:export-ydpi="715.30231"
+         inkscape:export-xdpi="715.30231"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_mode.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4304-2-4"
+         d="m 518.93152,763.9586 -0.12131,-18.55575 26.5384,-0.35247 0.12131,1.96299 -24.82931,0.32964 0,14.63173 23.36471,-0.16486 -0.64984,-13.70323 2.13725,0.32964 0.36376,15.41231 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         transform="matrix(0.6656206,0,0,0.6656206,11.01578,5.8612866)"
-         d="m 55.949822,2.8499913 c 0,0.5369709 -0.435301,0.9722718 -0.972271,0.9722718 -0.536971,0 -0.972272,-0.4353009 -0.972272,-0.9722718 0,-0.5369709 0.435301,-0.9722718 0.972272,-0.9722718 0.53697,0 0.972271,0.4353009 0.972271,0.9722718 z"
-         sodipodi:ry="0.9722718"
-         sodipodi:rx="0.9722718"
-         sodipodi:cy="2.8499913"
-         sodipodi:cx="54.977551"
-         id="path4140"
-         style="fill:url(#linearGradient4385);fill-opacity:1;stroke:#008700;stroke-width:0.30047148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         inkscape:export-ydpi="715"
+         inkscape:export-xdpi="715"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_mode.png"
+         transform="matrix(10.960717,0,0,10.960717,397.43794,407.19601)"
+         d="m 12.765625,31.397337 c 0,0.170432 -0.138162,0.308594 -0.308594,0.308594 -0.170431,0 -0.308593,-0.138162 -0.308593,-0.308594 0,-0.170432 0.138162,-0.308594 0.308593,-0.308594 0.170432,0 0.308594,0.138162 0.308594,0.308594 z"
+         sodipodi:ry="0.30859375"
+         sodipodi:rx="0.30859375"
+         sodipodi:cy="31.397337"
+         sodipodi:cx="12.457031"
+         id="path4306-8-9"
+         style="fill:#008700;fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
-      <g
-         transform="matrix(-1.4043648,0.03338636,0.03338636,1.4043648,121.08734,-0.1589198)"
-         id="g4150">
-        <path
-           sodipodi:nodetypes="cccc"
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           d="M 53.804739,3.5818324 53.34375,4.6824949 54.4273,4.7256384 z"
-           id="path4148"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccc"
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 53.733355,3.5196701 -0.591586,1.3059784 1.413838,-0.03288 -0.612329,-1.2068077 -0.110476,0.1375425 0.504143,0.9226537 -0.940554,0.014349 0.502693,-1.162932 z"
-           id="path4142"
-           inkscape:connector-curvature="0" />
-      </g>
       <path
-         sodipodi:nodetypes="cccc"
+         inkscape:export-ydpi="715"
+         inkscape:export-xdpi="715"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_mode.png"
+         sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="path4206"
-         d="m 46.988951,6.3880713 -0.0046,-0.4165133 0.95234,-0.012944 -0.03582,1.1821384"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <path
-       style="fill:url(#linearGradient4301);fill-opacity:1;stroke:none"
-       d="m 52.029288,6.5873337 0.261088,-0.3724144 c 1.105357,0.054686 2.211094,0.072242 3.317457,0.083814 l 0.482059,0.3236463 -0.03773,2.1292512 -4.109375,0.0625 z"
-       id="rect3928-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 52.46038,6.6880871 -0.05792,1.7931954 3.326397,-0.040403 -0.116961,-1.6838203 z"
-       id="path4327"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 51.835192,6.9612237 -0.0065,2.0681635 4.441515,-0.0221 -0.07734,-2.5522132 -0.576527,-0.3110924 -3.371808,-0.034879 -0.465855,0.7304485 0.359375,-0.030925 0.314412,-0.4200748 3.124211,-0.00541 0.32893,0.2708044 0.03314,2.0881747 -3.756504,0 -0.05982,-1.8029987 z"
-       id="path3132-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862"
-       sodipodi:nodetypes="ccccccccccccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.22586207;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       d="m 55.025166,7.5984118 c 0,0.4823691 -0.418969,0.8734065 -0.935793,0.8734065 -0.516824,0 -0.935792,-0.3910374 -0.935792,-0.8734065 0,-0.482369 0.358726,-0.8762857 0.873406,-0.9233153 0.409644,-0.037432 1.049067,0.2043973 1.048376,0.8738293"
-       id="path4303"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#linearGradient4339);fill-opacity:1;stroke:#008700;stroke-width:0.20000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path4325"
-       sodipodi:cx="53.806408"
-       sodipodi:cy="7.3577971"
-       sodipodi:rx="0.68500972"
-       sodipodi:ry="0.66291261"
-       d="m 54.491418,7.3577971 a 0.68500972,0.66291261 0 1 1 -8.2e-4,-0.032422"
-       sodipodi:start="0"
-       sodipodi:end="6.2342569"
-       sodipodi:open="true"
-       transform="matrix(0.81142293,0,0,0.81142293,10.454575,1.5961469)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 54.822873,6.2308456 -0.143631,-0.7623495 0.850737,0.011048 c 0,0 -0.110485,0.8065437 -0.165728,0.8065437 -0.05524,0 -0.243068,-0.066291 -0.243068,-0.066291 l 0.110486,-0.4640388 -0.232019,-0.011049 0.06629,0.4971844 z"
-       id="path4329"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccsccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 55.210937,6.5965576 0.531251,0.00781 0.0078,0.296875 -0.429688,0.03125 z"
-       id="rect4341"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/camera.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <g
-       id="g4488"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/play_small.png"
-       inkscape:export-xdpi="900"
-       inkscape:export-ydpi="900"
-       transform="translate(6.4965435,0.26516504)">
-      <g
-         transform="translate(0.01562501,0.03906137)"
-         inkscape:export-ydpi="900"
-         inkscape:export-xdpi="900"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
-         id="g4436">
-        <g
-           id="g4401"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
-           inkscape:export-xdpi="799"
-           inkscape:export-ydpi="799"
-           transform="matrix(0.86458333,0,0,1,0.54589844,0)">
-          <path
-             sodipodi:nodetypes="ccccccccccc"
-             inkscape:connector-curvature="0"
-             id="path4387"
-             d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
-             style="fill:#008700;fill-opacity:1;stroke:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4389"
-             d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
-             style="fill:#008700;fill-opacity:0.3942308;stroke:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path4399"
-             d="m 1.1269514,11.335273 2.662699,-0.806544"
-             style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
-        </g>
-      </g>
-      <rect
-         y="8.9715576"
-         x="1.234375"
-         height="2.546875"
-         width="2.8125"
-         id="rect4472"
-         style="fill:#ffffff;fill-opacity:0;stroke:none" />
+         id="path4367-5"
+         d="m 519.59065,759.77284 6.56081,-8.82484 6.82707,8.61815 5.9314,-4.61769 5.65863,4.69253"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="rect4472-8"
-       d="m 7.453125,9.127808 -3.078125,0 -0.00781,2.5 3.0859375,-0.04687 z"
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
-       inkscape:export-xdpi="1008"
-       inkscape:export-ydpi="1008" />
     <g
-       id="g4714"
-       transform="translate(1.7235728,0.13258252)">
-      <rect
-         inkscape:export-ydpi="900"
-         inkscape:export-xdpi="900"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
-         transform="scale(-1,1)"
-         y="9.1746817"
-         x="-11.546796"
-         height="2.546875"
-         width="2.8125"
-         id="rect4472-8-7"
-         style="fill:#ffffff;fill-opacity:0;stroke:none" />
-      <g
-         inkscape:export-ydpi="900"
-         inkscape:export-xdpi="900"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
-         id="g4586">
-        <path
-           style="fill:url(#linearGradient4584);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.56088,0.0073 0.07364,0.9981615 -1.0868434,0.04956 0.017018,-1.0805781 1.5655594,-0.051051 z"
-           id="path4574"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
-      </g>
+       id="g9534"
+       transform="translate(-25.105826,-234.22914)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="715"
+         inkscape:export-xdpi="715"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frames_mode.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0"
+         d="m 45.259709,865.67363 21.591453,0.0357 0.01868,13.36124 -21.619467,-0.084 z"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="715"
+         inkscape:export-xdpi="715"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frames_mode.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-7-2-9"
+         d="m 50.695516,865.65259 -0.0382,-4.87087 22.201116,-0.011 -0.0747,12.93917 -5.815345,-0.0373"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="715"
+         inkscape:export-xdpi="715"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frames_mode.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-7-4-0-0"
+         d="m 56.37,861.15051 0.0085,-4.5895 22.248017,-0.0119 -0.121565,14.34606 -5.346377,-0.0365"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path4598"
-       sodipodi:cx="19.378906"
-       sodipodi:cy="6.2254639"
-       sodipodi:rx="0.39453125"
-       sodipodi:ry="0.39453125"
-       d="m 19.773437,6.2254639 a 0.39453125,0.39453125 0 1 1 -4.72e-4,-0.019296"
-       sodipodi:start="0"
-       sodipodi:end="6.2342569"
-       sodipodi:open="true"
-       transform="matrix(0.94059406,0,0,0.94059406,1.1355972,0.39326704)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
-       inkscape:export-xdpi="818.79968"
-       inkscape:export-ydpi="818.79968" />
     <g
-       id="g4720">
+       id="g9539"
+       transform="translate(-30.266729,-233.2798)">
+      <path
+         inkscape:export-ydpi="689.76874"
+         inkscape:export-xdpi="689.76874"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_properties.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path5233-2"
+         d="m 109.80324,857.15282 -10.227168,14.04945 8.574288,-0.6198 -0.10331,10.12387 4.71228,-0.55935 -0.89734,-9.66052 8.89155,0.30255 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <g
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4586-3"
-         transform="matrix(0.33765768,0,0,1,10.445758,-0.00244945)">
-        <path
-           style="fill:url(#linearGradient4584-5);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576-9"
-           inkscape:connector-curvature="0" />
+         inkscape:export-ydpi="689.76874"
+         inkscape:export-xdpi="689.76874"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_properties.png"
+         transform="matrix(6.1759731,0,0,3.7669528,-24.724613,667.84962)"
+         id="g3745">
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.769116,0.0073 0.07364,0.9981615 -0.6935087,0.03393 0.017018,-1.0805781 1.3804607,-0.035426 z"
-           id="path4574-3"
+           d="m 20.013468,49.15513 -0.273673,0.981718 4.02756,-0.314772 -0.07144,-0.628717 z"
+           id="path4558-1"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
-      </g>
-      <g
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4586-3-5"
-         transform="matrix(0.30793803,0,0,1,11.526216,-0.05122005)">
-        <path
-           style="fill:url(#linearGradient4584-5-8);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576-9-9"
-           inkscape:connector-curvature="0" />
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
+           inkscape:export-xdpi="712.18268"
+           inkscape:export-ydpi="712.18268" />
         <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.814584,0.030738 0.07364,0.998162 -0.6555468,0.0105 0.017018,-1.0805781 1.3879668,-0.035426 z"
-           id="path4574-3-5"
+           style="fill:#ffffff;fill-opacity:0.17307691;stroke:none"
+           d="m 19.940889,49.446095 -0.143591,0.436465 3.979427,-0.06226 -0.06705,-0.240841 z"
+           id="path4558-0-1"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
+           inkscape:export-xdpi="712.18268"
+           inkscape:export-ydpi="712.18268" />
       </g>
+    </g>
+    <g
+       id="g9545"
+       transform="translate(-34.499922,-230.48737)">
       <g
-         transform="matrix(0.81929493,0,0,0.81929493,13.891593,1.9839848)"
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4436-4">
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,452.19167)"
+         inkscape:export-ydpi="1014"
+         inkscape:export-xdpi="1014"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/motion.png"
+         id="g5292">
         <g
-           id="g4401-52"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
-           inkscape:export-xdpi="799"
-           inkscape:export-ydpi="799"
-           transform="matrix(0.86458333,0,0,1,0.54589844,0)">
-          <path
-             sodipodi:nodetypes="ccccccccccc"
-             inkscape:connector-curvature="0"
-             id="path4387-2"
-             d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
-             style="fill:#008700;fill-opacity:1;stroke:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4389-0"
-             d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
-             style="fill:#008700;fill-opacity:0.3942308;stroke:none" />
+           id="g5288">
           <path
-             sodipodi:nodetypes="cc"
+             inkscape:export-ydpi="1014.0845"
+             inkscape:export-xdpi="1014.0845"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/motion.png"
+             sodipodi:nodetypes="czsc"
+             inkscape:connector-curvature="0"
+             id="path4630-2"
+             d="m 14.180979,47.736309 c 1.095491,-0.625056 2.272274,0.171547 1.971296,1.272693 -0.300978,1.101145 -2.005831,0.227555 -1.268244,-0.808604 0.501813,-0.704945 1.841323,-1.160797 2.144354,0.159666"
+             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0" />
+          <path
+             inkscape:export-ydpi="1014.0845"
+             inkscape:export-xdpi="1014.0845"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/motion.png"
+             sodipodi:nodetypes="csssc"
              inkscape:connector-curvature="0"
-             id="path4399-0"
-             d="m 1.1269514,11.335273 2.662699,-0.806544"
-             style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
+             id="path4545-6-8"
+             d="m 17.550406,49.013252 c 0.09239,0.328894 -0.09458,0.482553 -0.285033,0.513658 -0.190455,0.03111 -0.369642,-0.09548 -0.400224,-0.282733 -0.03058,-0.187255 0.09902,-0.364271 0.289476,-0.395376 0.137894,-0.02252 0.275721,0.03789 0.350446,0.153598"
+             style="fill:#30aa00;fill-opacity:1;stroke:#008700;stroke-width:0.13084352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
     </g>
     <g
-       transform="matrix(-1,0,0,1,17.77243,0.19583413)"
-       id="g4720-8"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/rw.png"
-       inkscape:export-xdpi="1018"
-       inkscape:export-ydpi="1018">
+       id="g9551"
+       transform="translate(-33.178233,-229.15212)">
       <g
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4586-3-8"
-         transform="matrix(0.33765768,0,0,1,10.445758,-0.00244945)">
+         inkscape:export-ydpi="744.45654"
+         inkscape:export-xdpi="744.45654"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+         transform="matrix(7.3039597,5.1759257,-5.1759257,7.3039597,285.85955,400.63386)"
+         id="g4641-1">
         <path
-           style="fill:url(#linearGradient4584-5-9);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576-9-7"
-           inkscape:connector-curvature="0" />
+           style="fill:url(#linearGradient11099);fill-opacity:1;stroke:#008700;stroke-width:0.16502121;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 20.970314,47.978259 c 0.40547,0.145726 0.426521,0.450225 0.319125,0.668636 -0.107395,0.218411 -0.368538,0.30987 -0.583278,0.204279 -0.214741,-0.10559 -0.301761,-0.368246 -0.194364,-0.586657 0.07776,-0.158135 0.240657,-0.255524 0.414197,-0.247626"
+           id="path4545-6-3-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csssc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="865.95496"
+           inkscape:export-ydpi="865.95496" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           id="path4556-7-3-7"
+           sodipodi:cx="41.859375"
+           sodipodi:cy="15.221559"
+           sodipodi:rx="0.0625"
+           sodipodi:ry="0.078125"
+           d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
+           sodipodi:start="0"
+           sodipodi:end="5.8778476"
+           sodipodi:open="true"
+           transform="matrix(0.08195568,-0.16667399,0.17587696,0.08648089,14.657957,53.691299)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="865.95496"
+           inkscape:export-ydpi="865.95496" />
+      </g>
+      <path
+         inkscape:export-ydpi="744.45654"
+         inkscape:export-xdpi="744.45654"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path7032-6-3-6"
+         d="m 195.24687,869.95675 c -0.0877,-0.40451 -0.23769,-1.01656 -0.43583,-1.62794 -1.8449,2.61843 -5.49564,4.31905 -8.74724,2.83279 l 1.49918,-1.69614 -7.21398,-0.11086 6.13222,6.2068 -0.65816,-2.93753 c 3.33833,0.72532 7.75964,-0.48532 9.42377,-2.66715 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="744.45654"
+         inkscape:export-xdpi="744.45654"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path7032-6-3-6-0"
+         d="m 180.34896,855.5089 c 0.0877,0.40451 0.2377,1.01656 0.43584,1.62794 1.84491,-2.61843 5.49564,-4.31905 8.74724,-2.83279 l -1.49919,1.69614 7.21399,0.11086 -6.13222,-6.2068 0.65817,2.93753 c -3.33833,-0.72532 -7.75964,0.48532 -9.42379,2.66714 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9560"
+       transform="translate(-32.986019,-228.7302)">
+      <g
+         inkscape:export-ydpi="744.45654"
+         inkscape:export-xdpi="744.45654"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+         transform="matrix(7.3039597,5.1759257,-5.1759257,7.3039597,316.69073,400.21198)"
+         id="g4641-1-8">
+        <path
+           style="fill:url(#linearGradient11101);fill-opacity:1;stroke:#008700;stroke-width:0.16502121;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 20.970314,47.978259 c 0.40547,0.145726 0.426521,0.450225 0.319125,0.668636 -0.107395,0.218411 -0.368538,0.30987 -0.583278,0.204279 -0.214741,-0.10559 -0.301761,-0.368246 -0.194364,-0.586657 0.07776,-0.158135 0.240657,-0.255524 0.414197,-0.247626"
+           id="path4545-6-3-9-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csssc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="865.95496"
+           inkscape:export-ydpi="865.95496" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           id="path4556-7-3-7-6"
+           sodipodi:cx="41.859375"
+           sodipodi:cy="15.221559"
+           sodipodi:rx="0.0625"
+           sodipodi:ry="0.078125"
+           d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
+           sodipodi:start="0"
+           sodipodi:end="5.8778476"
+           sodipodi:open="true"
+           transform="matrix(0.08195568,-0.16667399,0.17587696,0.08648089,14.657957,53.691299)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="865.95496"
+           inkscape:export-ydpi="865.95496" />
+      </g>
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,452.12803)"
+         id="g4816">
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.769116,0.0073 0.07364,0.9981615 -0.6935087,0.03393 0.017018,-1.0805781 1.3804607,-0.035426 z"
-           id="path4574-3-2"
+           d="m 23.057112,48.976131 -0.156403,-0.125149 -0.30701,0.341911 -0.132985,-0.255419 -0.286887,0.799999 0.797117,-0.314543 -0.255253,-0.135216 z"
+           id="path7032-6-3-6-0-9-4"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="744.45654"
+           inkscape:export-ydpi="744.45654" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 23.021949,47.735147 -0.166797,0.11092 -0.275774,-0.367569 -0.154917,0.242744 -0.215471,-0.822118 0.76639,0.383379 -0.266148,0.112261 z"
+           id="path7032-6-3-6-0-9-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="744.45654"
+           inkscape:export-ydpi="744.45654" />
       </g>
       <g
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4586-3-5-2"
-         transform="matrix(0.30793803,0,0,1,11.526216,-0.05122005)">
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,452.19167)"
+         id="g4820">
         <path
-           style="fill:url(#linearGradient4584-5-8-7);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576-9-9-4"
-           inkscape:connector-curvature="0" />
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 23.922645,47.735147 0.166797,0.11092 0.275774,-0.367569 0.154917,0.242744 0.215471,-0.822118 -0.76639,0.383379 0.266148,0.112261 z"
+           id="path7032-6-3-6-0-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="744.45654"
+           inkscape:export-ydpi="744.45654" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.814584,0.030738 0.07364,0.9981625 -0.6555468,0.0105 0.017018,-1.0805786 1.3879668,-0.035426 z"
-           id="path4574-3-5-9"
+           d="m 23.872511,48.997322 0.151238,-0.131346 0.320529,0.329271 0.122591,-0.260567 0.31887,0.787799 -0.809137,-0.282189 0.2496,-0.145385 z"
+           id="path7032-6-3-6-0-9-4-0"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="744.45654"
+           inkscape:export-ydpi="744.45654" />
       </g>
+    </g>
+    <g
+       id="g9573"
+       transform="translate(-28.044849,-228.20471)">
       <g
-         transform="matrix(0.81929493,0,0,0.81929493,13.891593,1.9839848)"
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4436-4-7">
+         inkscape:export-ydpi="865"
+         inkscape:export-xdpi="865"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/opacity_tween.png"
+         transform="matrix(7.3039597,5.1759257,-5.1759257,7.3039597,353.80079,393.22012)"
+         id="g4641-1-8-4">
+        <path
+           style="fill:url(#linearGradient11103);fill-opacity:1;stroke:#008700;stroke-width:0.16502121;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 20.970314,47.978259 c 0.40547,0.145726 0.426521,0.450225 0.319125,0.668636 -0.107395,0.218411 -0.368538,0.30987 -0.583278,0.204279 -0.214741,-0.10559 -0.301761,-0.368246 -0.194364,-0.586657 0.07776,-0.158135 0.240657,-0.255524 0.414197,-0.247626"
+           id="path4545-6-3-9-2-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csssc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="865.95496"
+           inkscape:export-ydpi="865.95496" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           id="path4556-7-3-7-6-0"
+           sodipodi:cx="41.859375"
+           sodipodi:cy="15.221559"
+           sodipodi:rx="0.0625"
+           sodipodi:ry="0.078125"
+           d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
+           sodipodi:start="0"
+           sodipodi:end="5.8778476"
+           sodipodi:open="true"
+           transform="matrix(0.08195568,-0.16667399,0.17587696,0.08648089,14.657957,53.691299)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="865.95496"
+           inkscape:export-ydpi="865.95496" />
+      </g>
+      <path
+         inkscape:export-ydpi="865.95496"
+         inkscape:export-xdpi="865.95496"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/opacity_tween.png"
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0"
+         id="path4545-6-3-9-2-9-6"
+         d="m 248.99029,855.85125 c 2.20726,3.16306 0.78499,5.49607 -1.12994,6.53546 -1.91488,1.0394 -4.29565,0.35578 -5.31757,-1.52696 -1.02193,-1.88271 -0.29806,-4.25154 1.61686,-5.29093 1.38646,-0.75257 3.08032,-0.62073 4.30697,0.33523"
+         style="fill:url(#linearGradient11105);fill-opacity:1;stroke:#008700;stroke-width:1.47726738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.5098038;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="865.95496"
+         inkscape:export-xdpi="865.95496"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/opacity_tween.png"
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0"
+         id="path4545-6-3-9-2-9-6-3"
+         d="m 245.03926,865.12492 c 2.20726,3.16306 0.78499,5.49607 -1.12994,6.53546 -1.91488,1.03939 -4.29565,0.35578 -5.31757,-1.52696 -1.02194,-1.88271 -0.29806,-4.25155 1.61687,-5.29094 1.38645,-0.75256 3.08031,-0.62072 4.30697,0.33524"
+         style="fill:url(#linearGradient11107);fill-opacity:1;stroke:#008700;stroke-width:1.47726738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.31372549;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9586"
+       transform="translate(-22.433716,-228.50315)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,452.19167)"
+         inkscape:export-ydpi="1061.2621"
+         inkscape:export-xdpi="1061.2621"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/colouring_tween.png"
+         id="g4853">
         <g
-           id="g4401-52-7"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
-           inkscape:export-xdpi="799"
-           inkscape:export-ydpi="799"
-           transform="matrix(0.86458333,0,0,1,0.54589844,0)">
-          <path
-             sodipodi:nodetypes="ccccccccccc"
-             inkscape:connector-curvature="0"
-             id="path4387-2-9"
-             d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
-             style="fill:#008700;fill-opacity:1;stroke:none" />
+           id="g4839">
           <path
+             inkscape:export-ydpi="865.95496"
+             inkscape:export-xdpi="865.95496"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+             sodipodi:nodetypes="csssc"
              inkscape:connector-curvature="0"
-             id="path4389-0-2"
-             d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
-             style="fill:#008700;fill-opacity:0.3942308;stroke:none" />
+             id="path4545-6-3-9-2-9-8"
+             d="m 30.75521,47.400097 c 0.260009,0.372599 0.09247,0.64742 -0.133103,0.769857 -0.225568,0.122438 -0.506015,0.04191 -0.626394,-0.179871 -0.120381,-0.221777 -0.03511,-0.500819 0.190462,-0.623256 0.16332,-0.08865 0.362852,-0.07312 0.507348,0.03949"
+             style="fill:url(#linearGradient11109);fill-opacity:1;stroke:#e78700;stroke-width:0.17401762;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path4399-0-0"
-             d="m 1.1269514,11.335273 2.662699,-0.806544"
-             style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
+             inkscape:export-ydpi="865.95496"
+             inkscape:export-xdpi="865.95496"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+             transform="matrix(0.17213591,-0.09343462,0.09859366,0.18164045,21.840868,48.46681)"
+             sodipodi:open="true"
+             sodipodi:end="5.8778476"
+             sodipodi:start="0"
+             d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
+             sodipodi:ry="0.078125"
+             sodipodi:rx="0.0625"
+             sodipodi:cy="15.221559"
+             sodipodi:cx="41.859375"
+             id="path4556-7-3-7-6-0-9"
+             style="fill:none;stroke:#e78700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g4843">
+          <g
+             inkscape:export-ydpi="744.45654"
+             inkscape:export-xdpi="744.45654"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+             transform="matrix(0.86038431,0.60970836,-0.60970836,0.86038431,41.332613,-5.6341707)"
+             id="g4641-1-8-4-5-6">
+            <path
+               style="fill:url(#linearGradient11111);fill-opacity:1;stroke:#008700;stroke-width:0.16502121;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 20.970314,47.978259 c 0.40547,0.145726 0.426521,0.450225 0.319125,0.668636 -0.107395,0.218411 -0.368538,0.30987 -0.583278,0.204279 -0.214741,-0.10559 -0.301761,-0.368246 -0.194364,-0.586657 0.07776,-0.158135 0.240657,-0.255524 0.414197,-0.247626"
+               id="path4545-6-3-9-2-9-8-5"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="csssc"
+               inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+               inkscape:export-xdpi="865.95496"
+               inkscape:export-ydpi="865.95496" />
+            <path
+               sodipodi:type="arc"
+               style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+               id="path4556-7-3-7-6-0-9-7"
+               sodipodi:cx="41.859375"
+               sodipodi:cy="15.221559"
+               sodipodi:rx="0.0625"
+               sodipodi:ry="0.078125"
+               d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
+               sodipodi:start="0"
+               sodipodi:end="5.8778476"
+               sodipodi:open="true"
+               transform="matrix(0.08195568,-0.16667399,0.17587696,0.08648089,14.657957,53.691299)"
+               inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+               inkscape:export-xdpi="865.95496"
+               inkscape:export-ydpi="865.95496" />
+          </g>
+          <g
+             id="g4835">
+            <path
+               style="fill:url(#linearGradient11113);fill-opacity:1;stroke:#00a3d2;stroke-width:0.17401762;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 31.388022,48.431347 c 0.260009,0.372599 0.09247,0.64742 -0.133103,0.769857 -0.225568,0.122438 -0.506015,0.04191 -0.626394,-0.179871 -0.120381,-0.221777 -0.03511,-0.500819 0.190462,-0.623256 0.16332,-0.08865 0.362852,-0.07312 0.507348,0.03949"
+               id="path4545-6-3-9-2-9-8-5-5"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="csssc"
+               inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+               inkscape:export-xdpi="865.95496"
+               inkscape:export-ydpi="865.95496" />
+            <path
+               sodipodi:type="arc"
+               style="fill:none;stroke:#00a3d2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+               id="path4556-7-3-7-6-0-9-7-1"
+               sodipodi:cx="41.859375"
+               sodipodi:cy="15.221559"
+               sodipodi:rx="0.0625"
+               sodipodi:ry="0.078125"
+               d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
+               sodipodi:start="0"
+               sodipodi:end="5.8778476"
+               sodipodi:open="true"
+               transform="matrix(0.17213591,-0.09343462,0.09859366,0.18164045,22.47368,49.49806)"
+               inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+               inkscape:export-xdpi="865.95496"
+               inkscape:export-ydpi="865.95496" />
+          </g>
         </g>
       </g>
     </g>
     <g
-       id="g4823"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/loop.png"
-       inkscape:export-xdpi="1084"
-       inkscape:export-ydpi="1084"
-       transform="translate(-0.44194174,0.04419417)">
+       id="g9605"
+       transform="translate(-18.262996,-226.40848)">
       <path
-         inkscape:export-ydpi="1084.8734"
-         inkscape:export-xdpi="1084.8734"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/loop.png"
-         sodipodi:nodetypes="cczzccccczzc"
+         inkscape:export-ydpi="1058.8235"
+         inkscape:export-xdpi="1058.8235"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/compound_tween.png"
+         sodipodi:nodetypes="cssc"
+         inkscape:connector-curvature="0"
+         id="path4630-2-2"
+         d="m 317.35739,864.09851 c -13.42239,10.27631 -16.24927,0.1079 -12.99072,-5.78439 1.54348,-2.79102 6.28491,-2.62096 5.63302,1.74762 -0.87257,5.84749 -18.10945,3.5613 -11.63335,-8.58114"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.69783656, 1.69783656;stroke-dashoffset:0" />
+      <path
+         inkscape:export-ydpi="1014.0845"
+         inkscape:export-xdpi="1014.0845"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/motion.png"
+         sodipodi:nodetypes="csssc"
          inkscape:connector-curvature="0"
-         id="path4819"
-         d="m 19.553223,9.2036448 c 0.01027,0.0026 0.36352,0.1295764 0.36352,0.1295764 0.736883,-0.1478626 0.868423,0.5197788 0.541513,1.1704668 -0.32691,0.650688 -0.923244,0.460998 -1.123593,0.272327 -0.200348,-0.188671 -0.110361,-0.44965 -0.04548,-0.619313 l 0.325838,0.2601 -0.08642,-0.9565095 -0.883939,0.5596905 0.441407,0.0625 c -0.170922,0.385494 -0.239344,0.64453 0.135931,0.980144 0.375275,0.335614 1.507425,0.185638 1.703125,-0.640625 0.1957,-0.8262635 -0.203608,-1.4235592 -1.371902,-1.2183572 z"
+         id="path4545-6-8-6"
+         d="m 323.72202,859.047 c 0.78432,2.79204 -0.8029,4.09648 -2.4197,4.36053 -1.6168,0.2641 -3.13795,-0.81055 -3.39757,-2.40017 -0.2596,-1.58964 0.8406,-3.09236 2.45741,-3.35642 1.17061,-0.19118 2.34065,0.32166 2.975,1.30392"
+         style="fill:#30aa00;fill-opacity:1;stroke:#008700;stroke-width:1.11075461;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9707"
+       transform="translate(-21.942875,-202.94308)">
+      <path
+         inkscape:export-ydpi="1501.7224"
+         inkscape:export-xdpi="1501.7224"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/onion.png"
+         sodipodi:nodetypes="ssssssssssccscscsss"
+         inkscape:connector-curvature="0"
+         id="path16134"
+         d="m 58.822684,901.98894 c 0,1.80696 -0.711818,3.44285 -1.862684,4.627 -0.575397,0.59204 -1.260619,1.07122 -2.02147,1.40234 -0.380485,0.16562 -0.779732,0.29415 -1.193758,0.38125 -0.413932,0.0872 -0.806387,0.43694 -1.245405,0.43694 -0.439061,0 -0.903954,-0.3501 -1.317946,-0.43694 -0.413932,-0.0872 -0.813348,-0.21579 -1.193766,-0.38125 -0.7608,-0.33116 -1.44603,-0.81029 -2.021461,-1.40234 -1.150861,-1.18415 -1.862679,-2.82004 -1.862679,-4.627 0,-1.80696 0.48244,-3.72051 1.862679,-4.627 1.044365,-0.68593 2.340918,-1.3349 2.679704,-2.36947 0.08506,-2.57605 -1.787593,-2.88474 -3.951842,-2.53379 2.549769,-2.06205 4.748662,1.24636 5.002158,2.54196 0.149155,0.76224 0.09134,-5.2966 3.007598,-5.67785 -3.039908,1.7589 -2.108067,6.02954 -1.798611,5.58967 0.618861,-0.87973 3.552383,-3.79987 5.323317,-2.12912 -3.057198,-0.78763 -3.917313,1.99373 -3.741188,2.36924 0.573189,1.2221 1.662742,1.57038 2.472653,2.20936 1.296388,1.02277 1.862701,2.82004 1.862701,4.627 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="cszc"
-         inkscape:connector-curvature="0"
-         id="path4821"
-         d="m 19.119505,10.125456 c -0.150997,0.369206 -0.128635,0.570741 0.01838,0.749076 0.506889,0.614879 1.366431,0.14378 1.589182,-0.185599 0.222752,-0.329379 0.30936,-1.1214277 -0.226495,-1.3755444"
-         style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.19711537;stroke-dasharray:none" />
     </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 31.956369,11.063502 -0.150753,0.0698 c 0.0063,-0.491077 -0.544743,-0.546434 -0.806066,-0.307042 -0.261322,0.239392 -0.125165,0.914159 0.465132,0.819067 0.14021,0.313565 0.573043,0.558484 0.804647,0.663237 l 1.407472,-0.0054 c 0.303564,-0.172309 0.513378,-0.172742 0.535692,-0.438801 l 0.17456,-2.215071 -0.68658,0.83969 C 33.549304,10.35103 33.054386,10.25996 32.825092,10.356391 l -0.558899,-0.6258409 0.09898,0.8026179 c -0.331458,0.025 -0.5338,0.316724 -0.408801,0.530334 z"
-       id="path4847"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccscccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import.png"
-       inkscape:export-xdpi="846.08673"
-       inkscape:export-ydpi="846.08673" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.06171429;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path4359-4"
-       sodipodi:cx="31.421875"
-       sodipodi:cy="10.92469"
-       sodipodi:rx="0.359375"
-       sodipodi:ry="0.359375"
-       d="m 31.78125,10.92469 a 0.359375,0.359375 0 1 1 -0.71875,0 0.359375,0.359375 0 1 1 0.71875,0 z"
-       transform="matrix(1.2962963,0,0,1.2962963,-8.347313,-3.2517856)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import.png"
-       inkscape:export-xdpi="846.08673"
-       inkscape:export-ydpi="846.08673" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.06171429;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path4359-4-2"
-       sodipodi:cx="31.421875"
-       sodipodi:cy="10.92469"
-       sodipodi:rx="0.359375"
-       sodipodi:ry="0.359375"
-       d="m 31.78125,10.92469 a 0.359375,0.359375 0 1 1 -0.71875,0 0.359375,0.359375 0 1 1 0.71875,0 z"
-       transform="matrix(1.2962963,0,0,1.2962963,-7.4129058,-3.2517856)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import.png"
-       inkscape:export-xdpi="846.08673"
-       inkscape:export-ydpi="846.08673" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 36.204302,12.192605 c 0.03125,-0.302083 0.0078,-0.252605 0.03907,-0.554688 -0.302083,-0.04687 -0.705575,-0.214673 -0.7129,-0.722704 -0.0073,-0.508031 0.523836,-0.774703 0.98627,-0.788507 0.462434,-0.0138 1.18382,0.32918 1.101008,0.830805 -0.08281,0.501625 -0.537876,0.669357 -0.839959,0.700607 0.02083,0.333333 0.03386,0.190105 0.05469,0.523438 l 0.159716,-0.01468 -0.01792,-0.301059 c 0.396466,-0.122942 0.809822,-0.304227 0.918707,-0.899156 0.108885,-0.594929 -0.769996,-1.1544091 -1.394551,-1.174556 -0.624555,-0.020147 -1.321342,0.607048 -1.268631,1.113952 0.05271,0.506904 0.291341,0.739277 0.762944,0.910041 l -0.07868,0.413278 z"
-       id="path5165"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczzzcccczzzccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/today_tip.png"
-       inkscape:export-xdpi="705.26117"
-       inkscape:export-ydpi="705.26117" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 37.124999,12.101409 -1.268872,-0.01266 -0.03581,0.360715 0.939079,-0.03892 -0.02877,0.05791 -0.813718,-0.01266 -0.05621,0.18985 0.80134,-0.01265 -0.04155,0.05126 -0.721142,-0.05128 0.402597,0.291103 0.360085,0.01266 0.240057,-0.139223 z"
-       id="path5167"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/today_tip.png"
-       inkscape:export-xdpi="705.26117"
-       inkscape:export-ydpi="705.26117" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.08;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 36.404951,11.501008 -0.309359,-0.68501 0.872835,-0.01105 -0.508234,0.883884"
-       id="path4614"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/today_tip.png"
-       inkscape:export-xdpi="705.26117"
-       inkscape:export-ydpi="705.26117" />
-    <path
-       style="fill:none;stroke:#008600;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 35.852523,12.152872 1.237436,0.0221"
-       id="path4651"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/today_tip.png"
-       inkscape:export-xdpi="705"
-       inkscape:export-ydpi="705" />
-    <path
-       style="fill:url(#linearGradient4679);fill-opacity:1;stroke:#008600;stroke-width:0.15000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 39.712025,10.225073 0.37546,1.480045 1.125745,0.438837 0.578871,-0.389287 1.434606,1.638459 c 0.916742,0.453443 1.394525,-0.569022 1.070409,-0.975741 l -2.261754,-0.98267 0.286706,-1.209882 -0.873335,-0.7004049 -1.330727,0.1734529 0.735161,0.587794 0.334329,-0.244966 0.525791,0.178537 -0.04396,0.777649 -0.769282,0.514055 -0.456781,-0.220319 0.0185,-0.471162 z"
-       id="path4653-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/properties.png"
-       inkscape:export-xdpi="541.99011"
-       inkscape:export-ydpi="541.99011" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 47.347799,11.797089 0.983321,-1.160097 2.430679,-0.9722714 -0.287263,2.3864854 -0.893821,1.159312 -0.365712,-0.07655 0.917029,-1.126952 0.358129,-1.927023 -1.861516,0.693377 -1.137215,1.366228 z"
-       id="path3266"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil_big.png"
-       inkscape:export-xdpi="1054.48"
-       inkscape:export-ydpi="1054.48" />
-    <path
-       style="fill:url(#linearGradient6208);fill-opacity:1;stroke:none"
-       d="m 48.353216,10.968449 0.740253,0.154679 0,0.574525 0.751301,-0.15468 0.06629,0.441942 0.464039,0.04419 -0.872835,1.104854 -0.751798,-0.106173 0.002,-0.38636 -0.51414,0.07493 -0.769007,-0.753545 z"
-       id="path4036"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil_big.png"
-       inkscape:export-xdpi="1054.48"
-       inkscape:export-ydpi="1054.48" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 48.253779,10.924255 0.850738,0.198873 0,0.552428 0.707107,-0.132583 0.07734,0.508233 0.364602,0"
-       id="path4046"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil_big.png"
-       inkscape:export-xdpi="1054.48"
-       inkscape:export-ydpi="1054.48" />
-    <path
-       style="fill:#006000;fill-opacity:1;stroke:none"
-       d="m 49.851563,10.198119 c -0.03906,0.223958 0.414062,0.541667 0.632812,0.4375 0.04427,-0.255208 0.08854,-0.510417 0.132813,-0.7656252 -0.255208,0.1093749 -0.510417,0.2187502 -0.765625,0.3281252 z"
-       id="path4050"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil_big.png"
-       inkscape:export-xdpi="1054.48"
-       inkscape:export-ydpi="1054.48" />
-    <path
-       style="fill:url(#linearGradient4062);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="m 54.414077,10.153077 -2.563263,1.347923 0.03315,0.309359 0.596621,0.342505 -0.972271,0.486136 0.596621,0.320407 0.187825,0.508233 0.441942,-1.115902 0.596621,0.552427 0.276214,-0.06629 z"
-       id="path4054"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
-       inkscape:export-xdpi="1152.0601"
-       inkscape:export-ydpi="1152.0601" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 54.535611,9.9763013 -2.778221,1.4537367 0.03314,0.397748 0.509019,0.288372 -0.888785,0.590244 0.506337,0.407686 0.48424,0.429323 0.37251,-0.964325 0.479894,0.457012 0.433898,-0.04008 0.777095,-2.641386 -0.243068,0.06629 -0.674419,2.357035 -0.227212,-0.03693 -0.584855,-0.471296 -0.398235,0.976944 -0.215446,-0.375651 -0.381176,-0.165724 0.847712,-0.565467 -0.399759,-0.289942 -0.165729,-0.287263 2.40257,-1.321154 z"
-       id="path4052"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
-       inkscape:export-xdpi="1152.0601"
-       inkscape:export-ydpi="1152.0601" />
     <g
-       id="g4124"
-       transform="translate(-6.7175144,-0.1767767)">
-      <rect
-         inkscape:export-ydpi="603.55609"
-         inkscape:export-xdpi="603.55609"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/fillcolor.png"
-         ry="0.19695681"
-         y="1.1410999"
-         x="58.436684"
-         height="1.1280254"
-         width="3.3303607"
-         id="rect4085"
-         style="fill:url(#linearGradient4122);fill-opacity:1;stroke:#008700;stroke-width:0.2291861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <path
-         inkscape:export-ydpi="603.55609"
-         inkscape:export-xdpi="603.55609"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/fillcolor.png"
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4091"
-         d="M 62.698115,1.5171084 62.545921,3.048 60.15672,3.1325854 60.138815,3.6800413 59.888143,3.6621366 59.861286,2.855056 62.29525,2.779423 62.390106,1.8361682 61.892384,1.8125439 61.758099,1.5260613 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+       id="g9710"
+       transform="translate(-13.81815,-204.54846)">
+      <path
+         inkscape:export-ydpi="1929.9399"
+         inkscape:export-xdpi="1929.9399"
+         inkscape:export-filename="/home/user/tupi/src/themes/default/icons/onion_big.png"
+         transform="matrix(9.3838484,0,0,9.3927952,-328.28383,450.97857)"
+         d="m 43.359375,47.877808 c 0,0.431472 -0.353275,0.78125 -0.789063,0.78125 -0.435787,0 -0.789062,-0.349778 -0.789062,-0.78125 0,-0.431473 0.353275,-0.78125 0.789062,-0.78125 0.435788,0 0.789063,0.349777 0.789063,0.78125 z"
+         sodipodi:ry="0.78125"
+         sodipodi:rx="0.7890625"
+         sodipodi:cy="47.877808"
+         sodipodi:cx="42.570312"
+         id="path16171"
+         style="fill:url(#radialGradient11115);fill-opacity:1;stroke:#009100;stroke-width:0.0904228;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g9609"
+       transform="translate(-15.726495,-228.01477)">
       <g
-         inkscape:export-ydpi="603.55609"
-         inkscape:export-xdpi="603.55609"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/fillcolor.png"
-         transform="translate(-0.04419417,0.4308932)"
-         id="g4110">
+         transform="matrix(8.4891828,0,0,8.4891828,16.929856,452.94201)"
+         id="g5639">
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.1856636;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 38.177915,48.524548 0.367436,-0.775241 -0.659531,-0.0017 -0.384297,0.781034 z"
+           id="path4441-5-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/warning_message.png"
+           inkscape:export-xdpi="390.52463"
+           inkscape:export-ydpi="390.52463" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 59.618426,4.3103141 -0.161146,-1.1817408 1.342887,-0.053715 -0.429724,1.2533615 -0.286483,-0.017905 0.340199,-0.9668789 -0.662491,0 0.125332,0.9310685 z"
-           id="path4087"
+           d="m 37.443552,47.063228 0.01604,0.199667 0.459394,-0.01072 -0.09488,0.271885 0.779216,-0.339303 -0.77533,-0.364961 0.07645,0.278555 z"
+           id="path7032-6-3-6-0-9-9"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccc" />
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="744.45654"
+           inkscape:export-ydpi="744.45654" />
         <path
-           style="fill:url(#linearGradient4114);fill-opacity:1;stroke:none"
-           d="m 59.6875,4.2684313 c 0.03906,0 0.523438,-0.023437 0.523438,-0.023437 l 0.375,-1.0234375 -0.875,0.085937 z"
-           id="path4096"
-           inkscape:connector-curvature="0" />
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 38.603322,48.99565 -0.01604,0.199667 -0.459394,-0.01072 0.09488,0.271885 -0.779216,-0.339303 0.77533,-0.364961 -0.07645,0.278555 z"
+           id="path7032-6-3-6-0-9-9-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+           inkscape:export-xdpi="744.45654"
+           inkscape:export-ydpi="744.45654" />
       </g>
     </g>
     <g
-       id="g4162"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/contour.png"
-       inkscape:export-xdpi="658.9682"
-       inkscape:export-ydpi="658.9682"
-       transform="translate(-1.2374369,-4.331029)">
-      <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4350-9"
-         d="m 58.669474,8.6452196 2.493949,-2.0797213 -0.581828,-0.4571348 -2.380856,2.2886704 0.238099,0.021231 2.162844,-2.0573612 0.223788,0.1346521 -2.279981,1.998131 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="ccccczc"
-         inkscape:connector-curvature="0"
-         id="path4352-2"
-         d="m 60.572168,6.0896414 c 0.02468,0.075067 0.230045,0.2644386 0.426589,0.4098084 0.448998,0.3178823 0.534306,-0.1775847 0.674181,-0.3317646 0.19665,-0.1756624 0.498986,0.4965611 0.681205,0.615937 C 62.287318,6.5908705 62.320201,6.2038953 62.185824,6.0566354 61.954807,5.6139515 61.421961,5.278048 61.123531,5.3324103 60.825098,5.3867762 60.464517,5.7125538 60.572179,6.0896256 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="cccscsc"
-         inkscape:connector-curvature="0"
-         id="path4354-3"
-         d="M 61.709601,5.8549091 C 61.356408,5.5477799 61.259757,5.9173276 61.281776,6.1893518 61.175583,6.416802 60.521191,6.0297499 60.754713,5.700984 c 0.03276,-0.1040419 0.279637,-0.1860986 0.461698,-0.1808832 0.04552,0.00128 -0.318631,0.025135 -0.284258,0.3391259 0.124477,-0.2411496 0.401046,-0.359504 0.557957,-0.2592689 0.08581,0.054817 0.164598,0.1356089 0.219497,0.2549489 z"
-         style="fill:#ffffff;fill-opacity:0.47058824;stroke:none" />
-      <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4364-6"
-         d="M 60.723378,6.7414563 C 60.630114,6.6421671 60.445989,6.5476234 60.318094,6.5475161"
-         style="fill:none;stroke:#008700;stroke-width:0.1012539;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="g9615"
+       transform="translate(-15.46974,-221.90667)">
       <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
-         id="path4160"
-         d="m 58.203125,8.4012433 0.03516,0.3398437 0.445313,-0.1054687 -0.0078,-0.125 -0.3125,-0.1484375 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path4598-9"
-       sodipodi:cx="19.378906"
-       sodipodi:cy="6.2254639"
-       sodipodi:rx="0.39453125"
-       sodipodi:ry="0.39453125"
-       d="m 19.773437,6.2254639 a 0.39453125,0.39453125 0 1 1 -4.72e-4,-0.019296"
-       sodipodi:start="0"
-       sodipodi:end="6.2342569"
-       sodipodi:open="true"
-       transform="matrix(-0.17282174,0.32128184,-0.39072758,-0.18864554,26.351594,1.3211527)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
-       inkscape:export-xdpi="818.79968"
-       inkscape:export-ydpi="818.79968" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path4598-9-2"
-       sodipodi:cx="19.378906"
-       sodipodi:cy="6.2254639"
-       sodipodi:rx="0.39453125"
-       sodipodi:ry="0.39453125"
-       d="m 19.773437,6.2254639 a 0.39453125,0.39453125 0 1 1 -4.72e-4,-0.019296"
-       sodipodi:start="0"
-       sodipodi:end="6.2342569"
-       sodipodi:open="true"
-       transform="matrix(0.17282175,0.32731815,0.39072758,-0.19218986,13.409764,2.3078735)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/animation_mode.png"
-       inkscape:export-xdpi="818.79968"
-       inkscape:export-ydpi="818.79968" />
-    <g
-       id="g4210"
-       transform="translate(1.8119612,-4.3752232)">
-      <path
-         inkscape:export-ydpi="470.28806"
-         inkscape:export-xdpi="470.28806"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path4073"
-         d="m 56.421875,13.596557 0.514055,-0.747319 -0.56093,-2.424556 2.65625,-0.01563 0.03125,2.34375 0.25,0.78125 z"
-         style="fill:url(#linearGradient4217);fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="470.28806"
-         inkscape:export-xdpi="470.28806"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
-         sodipodi:nodetypes="ccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4064"
-         d="m 59.598652,10.304258 -3.504902,-0.0046 -0.125,1.234375 0.59375,0.09375 -0.08728,-0.410176 0.4375,0.04687 -0.0625,0.140625 0.491632,-0.100547 -0.04955,-0.51327 0.613951,0.102115 0.03773,1.307329 0.4375,-0.234375 -0.0221,-1.244829 0.183384,0.07355 0.17031,0.651998 0.490387,0.08002 -0.01563,-0.515625 0.109375,0 0.21875,0.3125 0.25,0 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="470.28806"
-         inkscape:export-xdpi="470.28806"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
-         sodipodi:nodetypes="cccccccccccccc"
+         inkscape:export-ydpi="1023.34"
+         inkscape:export-xdpi="1023.34"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/horizontal_flip.png"
+         sodipodi:nodetypes="ccccccccccc"
          inkscape:connector-curvature="0"
-         id="path4066"
-         d="m 56.234375,10.737182 0.491172,2.051126 -0.491172,0.933249 3.40625,0.0625 -0.277229,-0.93999 -0.144646,-2.31001 -0.179688,0.02343 -0.179687,0.02344 0.183709,2.12251 0.183708,0.75249 -2.601792,0 0.390625,-0.609375 -0.421875,-2.265625 z"
+         id="path7032-6-3-6-0-9-9-97"
+         d="m 362.83127,854.76905 0.91514,-2.26796 -6.51523,2.94397 6.48383,2.94399 -0.89923,-2.22344 7.27091,0.003 -0.80546,2.30808 6.61491,-2.88041 -6.58192,-3.09822 0.88113,2.33155 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="470.28806"
-         inkscape:export-xdpi="470.28806"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4131"
-         d="M 56.679028,10.528729 C 56.736999,8.62825 58.65689,8.6473144 58.778251,10.418245"
-         style="fill:none;stroke:#004b00;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:export-ydpi="470"
-         inkscape:export-xdpi="470"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/inside.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4208"
-         d="m 56.890625,12.799682 c 0.117188,-0.03906 0.234375,-0.140625 0.375,-0.171875"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g4330">
-      <path
-         inkscape:export-ydpi="478.02069"
-         inkscape:export-xdpi="478.02069"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-         transform="matrix(-0.40843576,0.79784217,-0.67078462,-0.34339177,12.174183,18.302799)"
-         sodipodi:open="true"
-         sodipodi:end="6.2756908"
-         sodipodi:start="0"
-         d="m 2.453125,12.471557 a 1.515625,1.890625 0 1 1 -4.26e-5,-0.01417"
-         sodipodi:ry="1.890625"
-         sodipodi:rx="1.515625"
-         sodipodi:cy="12.471557"
-         sodipodi:cx="0.9375"
-         id="path4227"
-         style="fill:url(#linearGradient4239);fill-opacity:1;stroke:#008700;stroke-width:0.48670816;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
+       id="g9618"
+       transform="translate(-10.882469,-223.51128)">
       <path
-         inkscape:export-ydpi="478.02069"
-         inkscape:export-xdpi="478.02069"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4229"
-         d="m 2.6128964,15.72286 -0.4241288,0.65382 0.4384136,0.223158 0.3660673,-0.673829 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="478.02069"
-         inkscape:export-xdpi="478.02069"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-         sodipodi:nodetypes="ccccccccccccccccccc"
+         inkscape:export-ydpi="1023.34"
+         inkscape:export-xdpi="1023.34"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/vertical_flip.png"
+         sodipodi:nodetypes="ccccccccccc"
          inkscape:connector-curvature="0"
-         id="path4231"
-         d="m 1.9404663,16.101159 1.2267026,0.861431 -0.204936,0.314437 -0.2783296,-0.219831 -0.4622049,0.997603 -1.1096529,-0.679111 0.6536897,-0.796767 -0.3761518,-0.223419 0.2920539,-0.308125 0.2057024,0.158526 -0.086507,0.130351 0.4477842,0.325187 -0.6992561,0.645753 0.3939934,0.243915 0.3881413,-0.80822 0.3222082,0.150978 0.051865,-0.08732 -0.8083818,-0.49483 z"
+         id="path7032-6-3-6-0-9-9-97-7"
+         d="m 387.56799,853.35959 2.26796,0.91514 -2.94397,-6.51523 -2.94399,6.48383 2.22343,-0.89923 -0.003,7.27091 -2.30808,-0.80546 2.8804,6.61491 3.09822,-6.58192 -2.33154,0.88113 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="478"
-         inkscape:export-xdpi="478"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-         inkscape:connector-curvature="0"
-         id="path4241"
-         d="m 1.9997864,16.251873 c -0.066291,-0.01105 -0.3756505,0.0442 -0.3756505,0.0442 l 0.3425048,0.287262 -0.5524271,0.718155 0.6187184,0.45299 0.4087961,-0.850738 0.3314563,0.07734 0.055243,-0.110485 z"
-         style="fill:#008700;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50480771" />
-      <path
-         inkscape:export-ydpi="478"
-         inkscape:export-xdpi="478"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-         transform="matrix(0.71794871,0,0,0.71794871,1.0685925,4.2756359)"
-         sodipodi:open="true"
-         sodipodi:end="5.8778476"
-         sodipodi:start="0"
-         d="m 3.7786019,14.218942 a 0.8175922,0.86178637 0 1 1 -0.06625,-0.339828"
-         sodipodi:ry="0.86178637"
-         sodipodi:rx="0.8175922"
-         sodipodi:cy="14.218942"
-         sodipodi:cx="2.9610097"
-         id="path4243"
-         style="fill:#ffffff;fill-opacity:0.50480772;stroke:none"
-         sodipodi:type="arc" />
     </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 7.0625,15.190307 c -0.4960648,-0.204542 -0.4452265,-0.51957 -0.6650777,-0.65782 -0.4864426,-0.294691 -0.9949822,0.338695 -0.53125,0.640625 0.2110955,0.11995 0.444288,0.165322 0.6381202,0.226576 0.1655185,0.05231 0.293061,0.204682 0.4019575,0.321869 0.059895,0.10938 0.165388,0.274716 0.1875,0.296875 0.2760799,0.409544 0.6891515,0.156211 0.8828125,0.08594 0.3229216,0.333335 0.6648517,0.01011 0.6875,-0.25 0.022648,-0.26016 0.03125,-0.411457 -0.2578125,-0.773437 0.3645833,-0.25 0.7760417,-0.453125 1.140625,-0.703125 C 9.7246088,14.009589 9.1952358,13.442494 8.953125,13.737185 8.7291667,14.06531 8.5052083,14.393435 8.28125,14.72156 8.213542,14.69031 8.1458333,14.65906 8.078125,14.62781 c 0.1875,-0.5 0.375,-1 0.5625,-1.5 0.095664,-0.391429 -0.8914288,-1.092217 -0.90625,-0.3125 0.00521,0.546875 -0.00616,1.148993 -9.478e-4,1.695868 l -0.220483,-0.04135 C 7.5233612,14.532325 7.3020833,13.502808 7.15625,12.877808 7.115387,12.169437 5.8370874,12.34495 6.171875,12.940308 6.5625,13.6226 7.21875,14.643433 7.21875,14.643433 7.3619795,14.864786 7.255208,15.211138 7.0625,15.190307 z"
-       id="path4245"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccsccczccccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/hand_big.png"
-       inkscape:export-xdpi="923.27002"
-       inkscape:export-ydpi="923.27002" />
-    <path
-       style="fill:#ffffff;fill-opacity:0.09134617;stroke:none"
-       d="m 7.1482075,15.328155 c 0.067785,-0.06678 0.1902575,-0.157004 0.242418,-0.239412 0.1232048,-0.01453 0.8547067,0.09672 0.9380269,0.158173 0.08332,0.06145 -0.4815413,0.0731 -0.431995,0.168722 0.099093,0.191235 0.1367478,0.408977 0.1374087,0.485931 -0.059756,0.03375 -0.041386,0.05968 -0.1011421,0.09342 -0.013698,-0.342396 -0.4940196,-0.75723 -0.7847165,-0.666834 z"
-       id="path4247"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/hand_big.png"
-       inkscape:export-xdpi="923.27002"
-       inkscape:export-ydpi="923.27002" />
-    <g
-       id="g4322"
-       transform="matrix(0.47328262,0,0,0.47328262,5.960721,6.7236501)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes_big.png"
-       inkscape:export-xdpi="1100.9"
-       inkscape:export-ydpi="1100.9">
-      <path
-         inkscape:export-ydpi="812.59094"
-         inkscape:export-xdpi="812.59094"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes.png"
+    <g
+       id="g9621"
+       transform="translate(-7.1718685,-223.49115)">
+      <path
+         inkscape:export-ydpi="979.73792"
+         inkscape:export-xdpi="979.73792"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/crossed_flip.png"
          sodipodi:nodetypes="ccccccccccc"
          inkscape:connector-curvature="0"
-         id="path4249"
-         d="m 13.101792,13.380488 0.195083,2.153569 2.90625,-0.21875 -0.242188,-2.445312 -2.704561,-0.1048 -0.132812,0.515625 2.501436,-0.02801 c 0,0 0.15625,1.703125 0.04687,1.65625 -0.109375,-0.04687 -1.96875,0.09375 -1.96875,0.09375 l -0.08081,-1.50615 z"
+         id="path7032-6-3-6-0-9-9-97-7-2"
+         d="m 407.83805,854.736 1.11996,2.17412 2.02516,-6.85667 -6.46375,2.98782 2.2711,0.77099 -4.75032,5.50461 -1.22197,-2.11727 -2.1384,6.89065 6.64461,-2.96138 -2.34114,-0.8553 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="812.59094"
-         inkscape:export-xdpi="812.59094"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4292"
-         d="M 11.516735,14.664665 C 13.567097,15.57523 10.946641,13.581272 13.5,14.440307"
-         style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:export-ydpi="812.59094"
-         inkscape:export-xdpi="812.59094"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4292-9"
-         d="m 15.96875,14.049548 c 1.222237,-0.901935 0.585886,1.736206 2.049881,-0.682004"
-         style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:export-ydpi="812.59094"
-         inkscape:export-xdpi="812.59094"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/nodes.png"
-         inkscape:connector-curvature="0"
-         id="path4312"
-         d="m 13.359375,13.018431 2.421875,0.05469 0.15625,1.992187 -2.40625,0.234375 z"
-         style="fill:url(#linearGradient4328);fill-opacity:1;stroke:none" />
     </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 19.159727,13.665795 c -0.224743,0.228228 -0.522383,0.546946 -0.574793,0.26484 -0.05241,-0.282105 -0.01148,-0.509243 -0.08904,-0.940641 -0.101084,-0.512022 -0.754903,-0.533443 -0.968424,-0.142754 -0.213521,0.390693 -0.09722,1.485219 -0.399739,1.794234 -0.329062,0.201335 -0.642654,0.0555 -0.495002,-0.278798 0.194953,-0.441395 1.400255,-2.048784 -0.505362,-1.582281 -0.06097,0.10312 -0.183108,0.624093 -0.212833,0.805338 1.710705,-0.784044 -0.187067,0.940264 0.134938,1.342259 0.322004,0.401995 1.075647,0.554565 1.476697,0.369732 0.40105,-0.184833 0.244735,-1.238626 0.367102,-1.857939 0.275997,-0.253612 0.07874,1.017329 0.386048,1.150563 0.307306,0.133234 0.727041,-0.01863 1.088388,-0.22097 z"
-       id="path4337"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czczcscczzczcc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/polyline_big.png"
-       inkscape:export-xdpi="1042.52"
-       inkscape:export-ydpi="1042.52" />
-    <path
-       style="fill:#ffffff;fill-opacity:0.19230772;stroke:none"
-       d="m 19.015335,13.803508 c -0.365368,0.446978 -0.616133,0.523508 -0.668543,0.194522 -0.05241,-0.328981 0.05104,-0.545624 -0.02654,-0.977022 -0.101084,-0.512022 -0.598653,-0.486568 -0.812174,-0.09588 -0.213521,0.390693 -0.144095,1.610219 -0.446614,1.919234 -0.505839,0.400209 -1.150372,-0.17389 -0.319891,-1.216623 0.222139,-0.278913 0.415881,-0.982723 -0.672105,-0.749255 -0.06097,0.10312 -0.02575,0.170643 -0.05547,0.351888 1.286609,-0.369101 -0.0403,1.232888 -0.03079,1.541133 0.0095,0.308245 0.856897,0.50769 1.304822,0.322857 0.447925,-0.184833 0.04806,-1.786857 0.570227,-2.045439 0.522165,-0.258582 0.274054,1.194336 0.55011,1.429132 0.276056,0.234796 0.562979,-0.01863 0.768076,-0.1741 z"
-       id="path4337-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czczcscczzzzcc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/polyline_big.png"
-       inkscape:export-xdpi="1042.52"
-       inkscape:export-ydpi="1042.52" />
     <g
-       id="g4397"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/eraser.png"
-       inkscape:export-xdpi="544.11847"
-       inkscape:export-ydpi="544.11847">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4382"
-         d="m 23.190893,17.544554 0.0221,-0.939125 1.005417,0.06629 0.01105,0.950175 z"
-         style="fill:url(#linearGradient4390);fill-opacity:1;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4363"
-         d="m 22.634699,13.754198 2.22458,0.115064 -0.409118,1.444699 -1.431914,-0.102279 z"
-         style="fill:url(#linearGradient4395);fill-opacity:1;stroke:none" />
+       id="g9647"
+       transform="translate(-7.0313771,-218.79135)">
       <path
+         inkscape:export-ydpi="634.53595"
+         inkscape:export-xdpi="634.53595"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil.png"
+         sodipodi:nodetypes="ccccccccccc"
          inkscape:connector-curvature="0"
-         id="path4359"
-         d="m 22.826473,15.403456 -0.409118,-1.789892 2.646483,0.127849 -0.485827,1.777108 -1.431914,-0.115065 -0.12785,-0.485828 1.29128,0.281269 c 0,0 0.447473,-1.21457 0.319623,-1.227355 -0.127849,-0.01279 -1.968881,-0.115064 -1.892172,-0.06393 0.07671,0.05114 0.332409,1.598118 0.332409,1.598118 z"
+         id="path3266-6"
+         d="m 458.63376,855.42365 8.34759,-9.84827 20.63448,-8.25379 -2.43863,20.25931 -7.58781,9.84161 -3.10459,-0.64985 7.78482,-9.5669 3.04023,-16.35885 -15.80275,5.8862 -9.65403,11.59816 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="ccccccccccccccccccccc"
+         inkscape:export-ydpi="634.53595"
+         inkscape:export-xdpi="634.53595"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil.png"
+         sodipodi:nodetypes="cccccccccccc"
          inkscape:connector-curvature="0"
-         id="path4361"
-         d="m 22.788123,15.460316 0.02712,0.361612 0.216968,-0.01808 0.01356,0.239568 -0.239569,-0.04972 0.0452,0.253129 0.180806,-0.009 0.009,0.207928 -0.171766,-0.03616 0.0452,0.262169 1.595616,-0.0045 0,-0.226007 -0.257648,0.02712 0.05424,-0.248609 0.235048,0.01808 0.02712,-0.316411 -0.226008,0.07232 0.03617,-0.216968 0.27121,0.02712 -0.02712,-0.221489 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
+         id="path4036-9"
+         d="m 467.16893,848.38917 6.28414,1.3131 0,4.87725 6.37794,-1.31311 0.56274,3.75173 3.93932,0.37514 -7.40966,9.3793 -6.38215,-0.90132 0.017,-3.27988 -4.36463,0.6361 -6.52824,-6.39698 z"
+         style="fill:url(#linearGradient11117);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="634.53595"
+         inkscape:export-xdpi="634.53595"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil.png"
+         inkscape:connector-curvature="0"
+         id="path4046-0"
+         d="m 466.32479,848.014 7.22207,1.68827 0,4.68967 6.00276,-1.12553 0.65656,4.31449 3.09517,0"
+         style="fill:none;stroke:#008700;stroke-width:0.84891832;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="634.53595"
+         inkscape:export-xdpi="634.53595"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil.png"
+         sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
-         id="path4380"
-         d="m 22.974512,17.527586 0.02114,-0.969535 1.422756,0.03906 -0.01885,1.148437 -0.409698,-0.07868 0.01395,-0.851007 -0.631289,0.0078 0.05424,0.805473 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4050-4"
+         d="m 479.88867,841.8497 c -0.33159,1.90122 3.51505,4.59831 5.37206,3.71402 0.37582,-2.16651 0.75163,-4.33302 1.12747,-6.49953 -2.1665,0.9285 -4.33302,1.85701 -6.49953,2.78551 z"
+         style="fill:#006000;fill-opacity:1;stroke:none" />
     </g>
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 29.853165,14.462012 29.742679,16.98108"
-       id="path4445"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
-       inkscape:export-xdpi="913.15002"
-       inkscape:export-ydpi="913.15002"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 32.935709,13.953779 -0.15468,3.05476"
-       id="path4445-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
-       inkscape:export-xdpi="913.15002"
-       inkscape:export-ydpi="913.15002" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 33.147661,14.062369 29.618274,13.943515"
-       id="path4445-1-2"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
-       inkscape:export-xdpi="913.15002"
-       inkscape:export-ydpi="913.15002"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 32.792078,17.058419 -2.519068,0.06629"
-       id="path4445-1-2-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
-       inkscape:export-xdpi="913.15002"
-       inkscape:export-ydpi="913.15002" />
-    <path
-       style="fill:url(#linearGradient4509);fill-opacity:1;stroke:none"
-       d="m 29.895685,13.988104 2.96875,0.125 -0.125,3.03125 -3.125,0.03125 z"
-       id="path4501"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/square_big.png"
-       inkscape:export-xdpi="913.15002"
-       inkscape:export-ydpi="913.15002" />
-    <path
-       style="fill:url(#linearGradient4554);stroke:#008700;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="m 42.03125,15.737185 c 0.203125,1.80652 -0.910596,2.453125 -1.9375,2.453125 -1.026904,0 -1.859375,-0.81848 -1.859375,-1.828125 0,-1.009646 0.832471,-1.828125 1.859375,-1.828125 0.743501,0 1.415524,0.43547 1.708709,1.107242"
-       id="path4545"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ellipse_big.png"
-       inkscape:export-xdpi="836.16998"
-       inkscape:export-ydpi="836.16998" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path4556"
-       sodipodi:cx="41.859375"
-       sodipodi:cy="15.221559"
-       sodipodi:rx="0.0625"
-       sodipodi:ry="0.078125"
-       d="m 41.921875,15.221559 a 0.0625,0.078125 0 1 1 -0.0051,-0.03081"
-       sodipodi:start="0"
-       sodipodi:end="5.8778476"
-       sodipodi:open="true"
-       transform="matrix(0.78365179,0,0,0.82692143,9.0325198,2.6738325)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ellipse_big.png"
-       inkscape:export-xdpi="836.16998"
-       inkscape:export-ydpi="836.16998" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 44.289952,17.053709 0.381424,0.945083 3.001051,-2.704442 -0.439858,-0.454879 z"
-       id="path4558"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
-       inkscape:export-xdpi="712.18268"
-       inkscape:export-ydpi="712.18268" />
-    <path
-       style="fill:#ffffff;fill-opacity:0.17307691;stroke:none"
-       d="m 44.409764,17.328615 0.152203,0.433537 3.116808,-2.474919 -0.199957,-0.15006 z"
-       id="path4558-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
-       inkscape:export-xdpi="712.18268"
-       inkscape:export-ydpi="712.18268" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 51.43428,14.79922 -0.470166,0.769043 0.214843,0.603314 1.086668,-0.293773 -0.209922,1.857614 -0.202015,0.07031 0.0625,0.804688 1.716854,-0.23281 -0.0191,-0.633042 -0.328125,-0.109375 -0.05145,-1.819892 1.040942,0.240196 0.211196,-0.282725 -0.219698,-0.680473 -0.432924,0.0221 0.298445,0.682273 -1.241711,-0.309493 0.138729,2.359807 0.344678,0.06167 0.0298,0.277121 -1.27176,0.156494 0.0099,-0.357263 0.269512,-0.07553 0.09636,-2.391057 -1.150277,0.234835 0.199984,-0.672563 2.690433,-0.102226 -0.09448,-0.225329 z"
-       id="path4580"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/text.png"
-       inkscape:export-xdpi="583.30957"
-       inkscape:export-ydpi="583.30957" />
-    <path
-       style="fill:url(#linearGradient4609);fill-opacity:1;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 60.023131,11.109264 c 0.982831,0.353231 1.033857,1.091316 0.773538,1.620729 -0.260319,0.529413 -0.893312,0.751104 -1.413827,0.495159 -0.520517,-0.255945 -0.731447,-0.892603 -0.471125,-1.422017 0.188476,-0.383307 0.583337,-0.619372 1.003986,-0.600229"
-       id="path4545-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
-       inkscape:export-xdpi="667.39081"
-       inkscape:export-ydpi="667.39081" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path4556-7"
-       sodipodi:cx="41.859375"
-       sodipodi:cy="15.221559"
-       sodipodi:rx="0.0625"
-       sodipodi:ry="0.078125"
-       d="m 41.921875,15.221559 a 0.0625,0.078125 0 1 1 -0.0051,-0.03081"
-       sodipodi:start="0"
-       sodipodi:end="5.8778476"
-       sodipodi:open="true"
-       transform="matrix(0.19865488,-0.40400622,0.42631358,0.20962369,44.923269,24.809983)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
-       inkscape:export-xdpi="667.39081"
-       inkscape:export-ydpi="667.39081" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
-       d="m 55.795518,10.585366 c 1.139686,0.192536 1.614756,2.82504 1.684034,3.283527 0.02604,-0.609375 0.159563,-1.035961 0.765625,-1.356044"
-       id="path4630"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
-       inkscape:export-xdpi="667.39081"
-       inkscape:export-ydpi="667.39081" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 60.317498,13.60073 c 0.333315,0.07063 0.554465,-0.192161 0.535738,-0.345514"
-       id="path4630-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
-       inkscape:export-xdpi="667.39081"
-       inkscape:export-ydpi="667.39081" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 60.688749,10.81487 c 0.145815,0.02312 0.296653,0.215598 0.301363,0.345514"
-       id="path4630-8-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/tweener.png"
-       inkscape:export-xdpi="667.39081"
-       inkscape:export-ydpi="667.39081" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 15.230779,19.714951 -2.740692,0.02895 -0.05351,3.290764 3.008233,-0.216234 -0.20782,-2.666631 -0.292198,0.0429 0.178968,2.356187 -2.392887,0.242989 0.107017,-2.835943 2.392887,0.02456 z"
-       id="path4758-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
-       inkscape:export-xdpi="426.04535"
-       inkscape:export-ydpi="426.04535" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 13.022658,20.758536 1.63664,-0.05565 c 0,0 0.264853,0.189181 0.227017,0.179722 -0.03783,-0.0095 -1.948788,-0.01053 -1.948788,-0.01053 z"
-       id="path4760-3"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
-       inkscape:export-xdpi="426.04535"
-       inkscape:export-ydpi="426.04535"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 13.061476,21.22012 1.619685,0.02992 c 0,0 0.250706,0.207563 0.213639,0.195435 -0.03706,-0.01213 -1.926323,-0.118212 -1.926323,-0.118212 z"
-       id="path4760-7-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
-       inkscape:export-xdpi="426.04535"
-       inkscape:export-ydpi="426.04535"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 13.081356,21.847918 1.590972,0.129106 c 0,0 0.279606,-0.166604 0.241117,-0.160312 -0.03848,0.0063 -1.907533,-0.08895 -1.907533,-0.08895 z"
-       id="path4760-7-3-8"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
-       inkscape:export-xdpi="426.04535"
-       inkscape:export-ydpi="426.04535"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 13.988357,22.77596 0.01484,0.623105 -3.105774,-0.14899 0.01294,-3.9935 2.976983,-0.02589 0.03694,0.580643 0.40625,0 -0.01484,-0.961493 -1.607364,0.04542 0.32686,-0.519952 -1.131548,0.04352 0.260569,0.441271 -1.558927,-0.01563 0.01089,4.81185 3.734566,-0.0035 -0.02053,-0.867418 z"
-       id="path4836"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
-       inkscape:export-xdpi="426.04535"
-       inkscape:export-ydpi="426.04535" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 6.629116,20.068009 -2.9457325,-0.0027 -0.0625,3.84375 1.6488575,-0.122319 0,-0.312501 -1.3051075,0.153569 0.125,-3.3125 2.2541162,0.0013 -0.00678,0.625336 0.3369666,0.03159 z"
-       id="path4758-1-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
-       inkscape:export-xdpi="484.84848"
-       inkscape:export-ydpi="484.84848" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 4.3054485,21.250459 1.0285285,-0.06763 c 0,0 0.055453,0.220971 0.011259,0.209923 -0.04419,-0.01105 -1.1392242,-0.0097 -1.1392242,-0.0097 z"
-       id="path4760-0-1"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
-       inkscape:export-xdpi="484.84848"
-       inkscape:export-ydpi="484.84848"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 4.3507895,21.789609 0.9202255,0.01023 c 0,0 0.1170537,0.215099 0.073759,0.200932 -0.04329,-0.01417 -1.1026112,-0.08601 -1.1026112,-0.08601 z"
-       id="path4760-7-43-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
-       inkscape:export-xdpi="484.84848"
-       inkscape:export-ydpi="484.84848"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 4.3740095,22.522903 0.9244062,0.107832 c 0,0 0.05706,-0.20632 0.012103,-0.19897 -0.04495,0.0074 -1.02463,-0.04921 -1.02463,-0.04921 z"
-       id="path4760-7-3-5-5"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
-       inkscape:export-xdpi="484.84848"
-       inkscape:export-ydpi="484.84848"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 8.0353665,20.864875 -2.945733,-0.0027 -0.0625,3.84375 3.258233,-0.216069 -0.242743,-3.114737 -0.341299,0.05011 0.209042,2.752126 -2.539483,0.247319 0.125,-3.3125 2.539483,0.06519 z"
-       id="path4758-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
-       inkscape:export-xdpi="484.84848"
-       inkscape:export-ydpi="484.84848" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 5.7116985,22.047325 1.637904,-0.08326 c 0,0 0.309359,0.220971 0.265165,0.209923 -0.04419,-0.01105 -2.002506,0.0059 -2.002506,0.0059 z"
-       id="path4760-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
-       inkscape:export-xdpi="484.84848"
-       inkscape:export-ydpi="484.84848"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 5.7570395,22.586475 1.654601,0.0532 c 0,0 0.292835,0.242443 0.24954,0.228276 -0.04329,-0.01417 -2.012768,-0.156327 -2.012768,-0.156327 z"
-       id="path4760-7-43"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
-       inkscape:export-xdpi="484.84848"
-       inkscape:export-ydpi="484.84848"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 5.7802595,23.319769 1.584563,0.150801 c 0,0 0.326591,-0.194601 0.281634,-0.187251 -0.04495,0.0074 -1.954318,-0.1039 -1.954318,-0.1039 z"
-       id="path4760-7-3-5"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/copy.png"
-       inkscape:export-xdpi="484.84848"
-       inkscape:export-ydpi="484.84848"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 10.867055,19.488542 2.890928,-0.124997"
-       id="path4952"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
-       inkscape:export-xdpi="426.04535"
-       inkscape:export-ydpi="426.04535" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 18.359554,18.541821 1.155986,2.277391 -1.911204,-0.497477 0.250113,0.416604 1.112266,0.98637 0.85035,-0.07651 0.178509,0.392529 c -0.810697,0.435178 -0.361994,1.084403 0.107643,1.194837 0.469639,0.110435 0.909253,-0.40911 1.028543,-0.624371 l -0.997654,-1.010594 0.147677,-0.174097 1.018841,0.881819 c 0.295637,-0.04175 0.573829,-0.218618 0.700246,-0.638698 0.03077,-1.169373 -1.071491,-1.097247 -1.245398,-0.469398 l -0.461447,-0.19651 0.02671,-0.829284 -1.598942,-1.490596 z m 2.623529,2.722273 c 0.03924,-0.03222 0.07521,-0.0472 0.126482,-0.04534 0.14164,0.0052 0.26809,0.146945 0.277452,0.323395 0.0094,0.176449 -0.09373,0.310368 -0.235369,0.305161 -0.141639,-0.0052 -0.268089,-0.146944 -0.277451,-0.323395 l 0.02118,-0.128771 c 0.0171,-0.05795 0.04843,-0.09887 0.08769,-0.131059 z m -0.9956,0.986896 c 0.04384,-0.02981 0.09645,-0.06464 0.156475,-0.06686 l 0.128771,0.02118 c 0.161225,0.05254 0.251606,0.213677 0.206713,0.351432 -0.04489,0.137757 -0.207493,0.203503 -0.368712,0.150969 -0.161224,-0.05254 -0.266597,-0.20292 -0.221709,-0.340674 0.01625,-0.04988 0.05464,-0.08619 0.09845,-0.116065 z"
-       id="path4973"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccscccccccccccccscccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
-       inkscape:export-xdpi="477.82242"
-       inkscape:export-ydpi="477.82242" />
-    <path
-       style="fill:#ffffff;fill-opacity:0.15384617;stroke:none"
-       d="m 19.730768,20.817718 -0.941936,-1.847345 1.153813,1.088105 z"
-       id="path5015"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
-       inkscape:export-xdpi="477.82242"
-       inkscape:export-ydpi="477.82242" />
-    <path
-       style="fill:#ffffff;fill-opacity:0.15294118;stroke:none"
-       d="m 19.569821,20.928323 -1.786806,-0.455114 0.925672,0.81594 z"
-       id="path5015-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
-       inkscape:export-xdpi="477.82242"
-       inkscape:export-ydpi="477.82242" />
-    <path
-       style="fill:#ffffff;fill-opacity:0.25480766;stroke:none"
-       d="m 21.689167,21.833072 c -0.204982,0.01917 -0.03488,-0.334537 -0.193557,-0.487777 -0.189456,-0.182961 -0.232689,-0.324696 -0.06458,-0.388801 0.227737,-0.04548 0.359503,0.125028 0.400719,0.331219 0.04122,0.206191 0.04883,0.49982 -0.142583,0.545358 z"
-       id="path5035"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscsc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
-       inkscape:export-xdpi="477.82242"
-       inkscape:export-ydpi="477.82242" />
-    <path
-       style="fill:#00ad00;fill-opacity:0.85263157;stroke:none"
-       d="m 38.593043,21.385787 -0.508233,0.287262 2.737032,0.933765 1.955592,-1.834059 -0.254116,-0.09944 -1.734622,1.502603 z"
-       id="path5154-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
-       inkscape:export-xdpi="487.24844"
-       inkscape:export-ydpi="487.24844" />
-    <path
-       style="fill:#009e00;fill-opacity:1;stroke:none"
-       d="m 38.634231,22.076483 -0.508233,0.287262 2.977745,1.298042 1.552157,-1.640547 -0.475087,-0.176777 -1.182194,1.237438 z"
-       id="path5154-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
-       inkscape:export-xdpi="487.24844"
-       inkscape:export-ydpi="487.24844" />
-    <path
-       style="fill:none;stroke:#00bc00;stroke-width:0.20000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 38.242187,20.994996 c 2.231387,0.906027 3.639189,-0.188443 4.429688,-0.914063 l 0,0"
-       id="path5248"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
-       inkscape:export-xdpi="487.24844"
-       inkscape:export-ydpi="487.24844" />
-    <path
-       style="fill:none;stroke:#00bc00;stroke-width:0.10000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 38.231383,20.994462 c 1.557426,0.607716 2.048199,0.120916 2.330465,-0.670995"
-       id="path5248-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
-       inkscape:export-xdpi="487.24844"
-       inkscape:export-ydpi="487.24844" />
-    <path
-       style="fill:none;stroke:#00bc00;stroke-width:0.10000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 42.661071,20.090258 c -0.828222,0.850784 -1.694646,0.717537 -2.120543,0.246034"
-       id="path5248-3-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/layer.png"
-       inkscape:export-xdpi="487.24844"
-       inkscape:export-ydpi="487.24844" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 52.942411,20.283346 -2.222445,-0.439491 -0.351145,1.880696 1.276822,0.427969 -0.26371,-1.421869 1.381633,0.5057 z"
-       id="path5288"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ungroup.png"
-       inkscape:export-xdpi="79.964424"
-       inkscape:export-ydpi="79.964424" />
-    <path
-       style="fill:#52bd61;fill-opacity:1;stroke:none"
-       d="m 52.763346,20.405846 -1.83273,-0.327675 -0.361581,1.713728 1.076648,0.360603 -0.251543,-1.416516 1.185248,0.429299 z"
-       id="path5288-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ungroup.png"
-       inkscape:export-xdpi="79.964424"
-       inkscape:export-ydpi="79.964424" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 50.674164,23.306485 2.406751,0.588412 0.196631,-1.988156 -1.26466,-0.461957 0.249524,1.41145 -1.358987,-0.462715 z"
-       id="path5288-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ungroup.png"
-       inkscape:export-xdpi="79.964424"
-       inkscape:export-ydpi="79.964424" />
-    <path
-       style="fill:#52bd61;fill-opacity:0.85263157;stroke:none"
-       d="m 50.895425,23.21614 2.028615,0.439438 0.115959,-1.83611 -1.026109,-0.373702 0.249091,1.410991 -1.158698,-0.394428 z"
-       id="path5288-2-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ungroup.png"
-       inkscape:export-xdpi="79.964424"
-       inkscape:export-ydpi="79.964424" />
     <g
-       id="g5408"
-       transform="translate(-0.70710678,-0.44194174)">
-      <path
-         inkscape:export-ydpi="89.089745"
-         inkscape:export-xdpi="89.089745"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/group.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path5352"
-         d="m 45.706553,20.370929 -0.267969,3.081591 2.313855,0.554506 0.216062,-3.201579 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="89.089745"
-         inkscape:export-xdpi="89.089745"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/group.png"
-         inkscape:connector-curvature="0"
-         id="path5396"
-         d="m 45.947168,20.657134 -0.114052,2.607618 1.646133,0.367605 0.246753,-2.656479 z"
-         style="fill:#52bd61;fill-opacity:0.85098039;stroke:none" />
+       id="g9655"
+       transform="translate(-12.235331,-221.56601)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,452.19167)"
+         inkscape:export-ydpi="810.41998"
+         inkscape:export-xdpi="810.41998"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink_big.png"
+         id="g5220">
+        <path
+           sodipodi:type="arc"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           id="path6058"
+           sodipodi:cx="58.453125"
+           sodipodi:cy="46.221558"
+           sodipodi:rx="0.546875"
+           sodipodi:ry="0.546875"
+           d="m 58.856256,46.591095 c -0.204089,0.222643 -0.550025,0.237683 -0.772668,0.03359 -0.222643,-0.20409 -0.237684,-0.550025 -0.03359,-0.772668 0.204089,-0.222643 0.550025,-0.237684 0.772668,-0.03359 0.222196,0.20368 0.23769,0.548747 0.03464,0.771521 l -0.40418,-0.368389 z"
+           sodipodi:start="0.74194727"
+           sodipodi:end="7.0222889"
+           transform="matrix(-0.93915373,-0.34349714,0.34349714,-0.93915373,98.08148,109.86289)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+           inkscape:export-xdpi="570.75616"
+           inkscape:export-ydpi="570.75616" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           id="path6060"
+           sodipodi:cx="58.90625"
+           sodipodi:cy="48.487183"
+           sodipodi:rx="1.125"
+           sodipodi:ry="1.125"
+           d="m 59.735548,49.247373 c -0.419841,0.458009 -1.131479,0.488949 -1.589488,0.06911 -0.458009,-0.419841 -0.48895,-1.13148 -0.06911,-1.589489 0.419841,-0.458008 1.131479,-0.488949 1.589488,-0.06911 0.22966,0.210522 0.361736,0.506855 0.364757,0.81839"
+           sodipodi:start="0.74194727"
+           sodipodi:end="6.273489"
+           sodipodi:open="true"
+           transform="matrix(-0.43941489,0.89828423,-0.89828423,-0.43941489,127.81451,16.503644)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+           inkscape:export-xdpi="570.75616"
+           inkscape:export-ydpi="570.75616" />
+        <path
+           transform="matrix(-0.86429237,-1.2434029,1.2434029,-0.86429237,53.121774,160.08786)"
+           sodipodi:type="arc"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           id="path6058-1"
+           sodipodi:cx="58.453125"
+           sodipodi:cy="46.221558"
+           sodipodi:rx="0.546875"
+           sodipodi:ry="0.546875"
+           d="m 58.856256,46.591095 c -0.204089,0.222643 -0.550025,0.237683 -0.772668,0.03359 -0.222643,-0.20409 -0.237684,-0.550025 -0.03359,-0.772668 0.204089,-0.222643 0.550025,-0.237684 0.772668,-0.03359 0.219954,0.201625 0.23769,0.542344 0.03986,0.765715"
+           sodipodi:start="0.74194727"
+           sodipodi:end="7.0080184"
+           sodipodi:open="true"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+           inkscape:export-xdpi="570.75616"
+           inkscape:export-ydpi="570.75616" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 60.17061,47.549549 0.937378,-0.433043 -0.815346,0.433835 1.399149,0.830212 -1.428363,-0.644344 0.174246,0.7581 -0.335975,-0.807164 c 0,0 0.09744,0.07384 -0.652327,-0.383439 0.703356,0.261475 0.543154,0.25069 0.49353,0.19035 -0.04963,-0.06034 -0.171656,-0.991042 -0.171656,-0.991042 l 0.286869,0.60424 0.119018,-1.027394 0.02942,1.119839 0.867658,-1.038113 z"
+           id="path6080"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+           inkscape:export-xdpi="570.75616"
+           inkscape:export-ydpi="570.75616" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           id="path6058-5"
+           sodipodi:cx="58.453125"
+           sodipodi:cy="46.221558"
+           sodipodi:rx="0.546875"
+           sodipodi:ry="0.546875"
+           d="m 58.856256,46.591095 c -0.204089,0.222643 -0.550025,0.237683 -0.772668,0.03359 -0.222643,-0.20409 -0.237684,-0.550025 -0.03359,-0.772668 0.204089,-0.222643 0.550025,-0.237684 0.772668,-0.03359 0.222196,0.20368 0.23769,0.548747 0.03464,0.771521 l -0.40418,-0.368389 z"
+           sodipodi:start="0.74194727"
+           sodipodi:end="7.0222889"
+           transform="matrix(-0.68842183,-0.2517915,0.2517915,-0.68842183,88.65498,95.457078)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+           inkscape:export-xdpi="570.75616"
+           inkscape:export-ydpi="570.75616" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           id="path6058-5-1"
+           sodipodi:cx="58.453125"
+           sodipodi:cy="46.221558"
+           sodipodi:rx="0.546875"
+           sodipodi:ry="0.546875"
+           d="m 58.856256,46.591095 c -0.204089,0.222643 -0.550025,0.237683 -0.772668,0.03359 -0.222643,-0.20409 -0.237684,-0.550025 -0.03359,-0.772668 0.204089,-0.222643 0.550025,-0.237684 0.772668,-0.03359 0.222196,0.20368 0.23769,0.548747 0.03464,0.771521 l -0.40418,-0.368389 z"
+           sodipodi:start="0.74194727"
+           sodipodi:end="7.0222889"
+           transform="matrix(-0.30260344,-0.11067774,0.11067774,-0.30260344,73.676207,66.176901)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+           inkscape:export-xdpi="570.75616"
+           inkscape:export-ydpi="570.75616" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 58.898626,46.479307 -1.317068,0.389016 1.378687,-0.318792 -0.03058,1.417171 0.150611,-1.448486 0.847251,1.349038 -0.730459,-1.512743 0.588037,-0.643513 -0.658501,0.568868 -0.0025,-1.159662 -0.09202,1.167312 -0.765348,-1.191071 0.649009,1.23495 -1.028724,-0.350402 z"
+           id="path6080-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+           inkscape:export-xdpi="570.75616"
+           inkscape:export-ydpi="570.75616" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 60.001786,48.926275 -0.500057,-0.190457 0.541362,0.143383 0.03419,-0.535908 0.04627,0.5569 0.612131,-0.329776 -0.533842,0.439512 0.394178,0.431365 -0.441412,-0.381328 -0.0017,0.777355 -0.06168,-0.782483 -0.40255,0.544293 0.324564,-0.573707 -0.689583,0.234885 z"
+           id="path6080-0-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+           inkscape:export-xdpi="570.75616"
+           inkscape:export-ydpi="570.75616" />
+      </g>
+    </g>
+    <g
+       id="g9624"
+       transform="translate(-2.5745599,-226.34772)">
+      <g
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(8.3392092,1.5886519,-1.5886519,8.3392092,154.99068,357.62446)"
+         id="g4789">
+        <g
+           id="g3745-7"
+           transform="matrix(0.49178238,-0.53611773,0.32699789,0.29995613,15.668721,48.446876)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_properties.png"
+           inkscape:export-xdpi="689.76874"
+           inkscape:export-ydpi="689.76874">
+          <path
+             inkscape:export-ydpi="712.18268"
+             inkscape:export-xdpi="712.18268"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path4558-1-8"
+             d="m 19.817332,49.812189 c -0.02585,0.10822 -0.05169,0.216439 -0.07754,0.324659 l 2.26123,-0.972902 1.76633,0.65813 c -0.0037,-0.09366 -0.0074,-0.187322 -0.01112,-0.280983 l -1.722,-0.679968 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:export-ydpi="712.18268"
+             inkscape:export-xdpi="712.18268"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path4558-0-1-5"
+             d="m 19.793278,49.921933 c -0.0052,0.03047 -0.0104,0.06093 -0.0156,0.0914 l 2.257612,-0.949032 1.717102,0.657345 c 0.0022,-0.03253 0.0044,-0.06506 0.0066,-0.09759 L 22.04636,48.969801 z"
+             style="fill:#ffffff;fill-opacity:0.17307691;stroke:none" />
+        </g>
+        <g
+           id="g3745-7-5"
+           transform="matrix(0.39613974,-0.61020114,0.37218408,0.24162017,16.242753,53.650433)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_properties.png"
+           inkscape:export-xdpi="689.76874"
+           inkscape:export-ydpi="689.76874">
+          <path
+             inkscape:export-ydpi="712.18268"
+             inkscape:export-xdpi="712.18268"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path4558-1-8-4"
+             d="m 19.98319,49.261571 -0.08018,0.329995 2.152102,-0.677333 1.682848,0.715063 0.02858,-0.303301 -1.657048,-0.72841 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:export-ydpi="712.18268"
+             inkscape:export-xdpi="712.18268"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path4558-0-1-5-0"
+             d="m 19.96496,49.347319 c -0.01176,0.03966 -0.02351,0.07933 -0.03527,0.118995 l 2.165699,-0.64942 1.653958,0.70627 c 0.0034,-0.03752 0.0069,-0.07505 0.01029,-0.112568 l -1.641468,-0.709483 z"
+             style="fill:#ffffff;fill-opacity:0.17307691;stroke:none" />
+        </g>
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 42.034813,53.203744 c 0.0072,0.01247 0.0144,0.02493 0.0216,0.0374 l 0.808378,-1.553055 1.003243,-0.825365 c -0.01188,-0.01406 -0.02377,-0.02813 -0.03565,-0.04219 l -0.996218,0.82776 z"
+           id="path4558-1-8-4-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
+           inkscape:export-xdpi="712.18268"
+           inkscape:export-ydpi="712.18268" />
+        <path
+           style="fill:none;stroke:#009000;stroke-width:0.03;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.77542372;stroke-dasharray:none"
+           d="m 42.131603,52.209046 -0.03277,0.919794 0.698217,-0.511565 z"
+           id="path3983"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+        <path
+           style="fill:none;stroke:#009000;stroke-width:0.03;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.77542372;stroke-dasharray:none"
+           d="M 42.57023,51.375888 42.48098,52.4217 43.099593,51.905788 z"
+           id="path3983-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+        <path
+           style="fill:none;stroke:#009000;stroke-width:0.03;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.77542372;stroke-dasharray:none"
+           d="m 43.371878,50.83422 -0.500693,0.819293 0.856407,-0.31096 z"
+           id="path3983-8-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+      </g>
       <path
-         inkscape:export-ydpi="89.089745"
-         inkscape:export-xdpi="89.089745"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/group.png"
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path5354"
-         d="m 45.501289,22.405501 1.394494,0.576177 -0.380385,-1.610288 1.543483,0.571546"
-         style="fill:none;stroke:#ffffff;stroke-width:0.08367011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <g
-       id="g4209-3"
-       transform="matrix(0,-1.6613058,1.6613058,0,-5.2002883,53.021021)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help.png"
-       inkscape:export-xdpi="843.49261"
-       inkscape:export-ydpi="843.49261">
-      <path
-         inkscape:export-ydpi="975.18652"
-         inkscape:export-xdpi="975.18652"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
-         sodipodi:nodetypes="cczcccczc"
-         inkscape:connector-curvature="0"
-         id="path4201-5"
-         d="M 15.102452,5.7188282 C 14.922759,5.5516594 14.845744,5.5202054 14.666051,5.3530365 c 0.474363,-0.6572846 1.42799,-0.3962888 1.565973,0.04776 0.137983,0.4440489 -0.0959,0.7831853 -0.520636,0.8179535 l 0.05231,0.2699684 -0.539341,-0.050677 0.198344,-0.3892328 c 0.196424,0.063891 0.658985,0.032173 0.486097,-0.4063204 -0.172889,-0.4384939 -0.69034,-0.2162326 -0.80635,0.07634 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="975.18652"
-         inkscape:export-xdpi="975.18652"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
-         transform="matrix(0.99254032,0.12191684,-0.12191684,0.99254032,0.98031351,-1.5554444)"
-         d="m 15.810465,6.7004056 c 0,0.1586505 -0.178077,0.2872621 -0.397747,0.2872621 -0.21967,0 -0.397748,-0.1286116 -0.397748,-0.2872621 0,-0.1586505 0.178078,-0.2872621 0.397748,-0.2872621 0.21967,0 0.397747,0.1286116 0.397747,0.2872621 z"
-         sodipodi:ry="0.28726214"
-         sodipodi:rx="0.39774758"
-         sodipodi:cy="6.7004056"
-         sodipodi:cx="15.412718"
-         id="path4203-3"
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(11.101239,0,0,11.672626,-104.61571,296.4922)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050"
          style="fill:#008700;fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
-         inkscape:export-ydpi="975.18652"
-         inkscape:export-xdpi="975.18652"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
-         transform="matrix(0.95560751,0.29464264,-0.50334784,1.6324961,4.0042879,-8.9550306)"
-         d="m 15.9375,6.9090548 c 0,0.051777 -0.08569,0.09375 -0.191406,0.09375 -0.105711,0 -0.191406,-0.041973 -0.191406,-0.09375 0,-0.051777 0.08569,-0.09375 0.191406,-0.09375 0.105711,0 0.191406,0.041973 0.191406,0.09375 z"
-         sodipodi:ry="0.09375"
-         sodipodi:rx="0.19140625"
-         sodipodi:cy="6.9090548"
-         sodipodi:cx="15.746094"
-         id="path4205-1"
-         style="fill:#ffffff;fill-opacity:0.17894736;stroke:none"
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(11.101239,0,0,11.672626,-100.63306,291.31584)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050-7"
+         style="fill:#008700;fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
-         inkscape:export-ydpi="975.18652"
-         inkscape:export-xdpi="975.18652"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/help_mode.png"
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path4207-2"
-         d="m 15.697691,6.4444409 c -0.01289,-0.1160097 -0.02349,-0.1528315 -0.03638,-0.2688412 0.101278,-0.011049 0.235702,-0.044194 0.303835,-0.066291"
-         style="fill:none;stroke:#fffeff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.15263157;stroke-dasharray:none" />
-    </g>
-    <g
-       id="g6468"
-       transform="translate(6.9826794,-6.363961)">
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         inkscape:connector-curvature="0"
-         id="path5062-7"
-         d="m 24.7531,26.275701 4.03125,0"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path5062-3-6"
-         d="m 24.686809,27.214713 4.101332,-0.02321"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path5062-3-7-2"
-         d="m 24.731003,28.076498 4.079235,-0.0054"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(11.101239,0,0,11.672626,-96.010366,285.55488)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050-5"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
       <path
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path5062-3-7-0-7"
-         d="m 25.61889,25.446406 0.0054,3.628791"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(11.101239,0,0,11.672626,-89.459222,281.94546)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050-6"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
       <path
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path5062-3-7-0-6-6"
-         d="m 26.656344,25.360699 0.0011,3.769416"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(19.511269,0,0,20.515525,-497.1556,-150.17616)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050-5-8"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
       <path
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path5062-3-7-0-6-3-5"
-         d="m 27.745573,25.27185 0.01941,3.71875"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(19.511269,0,0,20.515525,-493.03963,-143.99167)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050-5-8-4"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         inkscape:connector-curvature="0"
-         id="path5062-7-4"
-         d="m 24.537031,25.396279 4.648858,-0.109375"
-         style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(19.511269,0,0,20.515525,-489.52458,-153.54199)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050-5-8-1"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         inkscape:connector-curvature="0"
-         id="path5062-7-4-2"
-         d="m 24.399547,29.181353 4.634803,-0.1875"
-         style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(19.511269,0,0,20.515525,-486.87171,-147.63936)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050-5-8-1-5"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         inkscape:connector-curvature="0"
-         id="path5062-7-4-5"
-         d="m 24.701862,25.183462 0.04956,4.167624"
-         style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(19.511269,0,0,20.515525,-496.55468,-138.68592)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050-5-8-1-5-6"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="486.3132"
-         inkscape:export-xdpi="486.3132"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-         inkscape:connector-curvature="0"
-         id="path5062-7-4-5-2"
-         d="m 28.878211,25.028782 -0.01674,4.233915"
-         style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         inkscape:export-ydpi="1020.22"
+         inkscape:export-xdpi="1020.22"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
+         transform="matrix(19.511269,0,0,20.515525,-502.19203,-143.92533)"
+         sodipodi:open="true"
+         sodipodi:end="6.2745801"
+         sodipodi:start="0"
+         d="m 47.472656,48.91687 c 0,0.02589 -0.02273,0.04687 -0.05078,0.04687 -0.02805,0 -0.05078,-0.02099 -0.05078,-0.04687 0,-0.02589 0.02273,-0.04687 0.05078,-0.04687 0.02788,0 0.05054,0.02074 0.05078,0.04647"
+         sodipodi:ry="0.046875"
+         sodipodi:rx="0.05078125"
+         sodipodi:cy="48.91687"
+         sodipodi:cx="47.421875"
+         id="path7050-5-8-1-5-6-9"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
     </g>
     <g
-       id="g6568"
-       transform="matrix(0,-0.56884428,0.56884428,0,56.330931,69.182433)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet_big.png"
-       inkscape:export-xdpi="829.91998"
-       inkscape:export-ydpi="829.91998">
-      <g
-         transform="matrix(0,1,-1,0,88.914396,-77.820007)"
-         inkscape:export-ydpi="292.81195"
-         inkscape:export-xdpi="292.81195"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
-         id="g6341">
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:none;stroke:none"
-           d="m 79.798869,9.1907487 4.78125,0.125 0.0404,-5.1146577 -4.84375,0.15625 z"
-           id="path6081-0-6"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g6029-5-6-8"
-           transform="matrix(0,-1,1,0,60.778734,87.1724)"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
-           inkscape:export-xdpi="431"
-           inkscape:export-ydpi="431">
-          <g
-             transform="translate(9.1711719,-0.30610924)"
-             inkscape:export-ydpi="431"
-             inkscape:export-xdpi="431"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
-             id="g5868-1-7-9-9">
-            <g
-               id="g5860-7-9-3-9">
-              <g
-                 inkscape:export-ydpi="431"
-                 inkscape:export-xdpi="431"
-                 inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
-                 id="g5853-1-2-8-4">
-                <path
-                   sodipodi:nodetypes="ccccc"
-                   style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-                   d="m 68.633552,19.301274 5.058472,0.0156 0.154679,4.905553 -5.102665,-0.0156 0.08727,-4.308472"
-                   id="path5783-9-2-8-9"
-                   inkscape:connector-curvature="0" />
-                <path
-                   sodipodi:nodetypes="cc"
-                   style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-                   d="m 69.277048,21.777257 c 0.08839,0 3.875953,-0.08413 3.875953,-0.08413"
-                   id="path5785-7-9-0-0-9"
-                   inkscape:connector-curvature="0" />
-                <path
-                   style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-                   d="m 71.93249,23.808621 c 0,-0.08839 -0.05066,-4.319522 -0.05066,-4.319522"
-                   id="path5785-7-6-8-9-0-4-1"
-                   inkscape:connector-curvature="0"
-                   sodipodi:nodetypes="cc" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="M 83.26418,5.228599 86.960741,4.1010096 84.667016,1.841765 z"
-           id="path6233-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-      </g>
+       id="g9715"
+       transform="translate(-12.605558,-201.63539)">
       <path
-         inkscape:export-ydpi="292"
-         inkscape:export-xdpi="292"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
-         style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 81.26152,6.938665 c 0,-0.08839 -0.05066,-4.319522 -0.05066,-4.319522"
-         id="path5785-7-6-8-9-0-4-1-0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         inkscape:export-ydpi="292"
-         inkscape:export-xdpi="292"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
-         style="fill:none;stroke:#008700;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="M 86.778494,8.8656953 86.020727,8.0596101"
-         id="path5785-7-6-8-9-0-4-1-0-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-    </g>
-    <g
-       id="g4256"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/scenes.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279"
-       transform="matrix(0.77231424,0,0,0.77231424,-2.0131094,0.76336804)">
-      <path
-         inkscape:export-ydpi="372"
-         inkscape:export-xdpi="372"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/scenes.png"
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path6113-6-3-0"
-         d="m 78.066763,18.183357 0.09375,5.375 3,-0.171875 0.01563,-5.140625 z m 0.5625,4.5 0.766735,-0.137944 -0.03125,0.34375 1.209598,-0.165403 -0.113952,-3.840284 -1.094535,0.09028 0.01451,3.231694 -0.753006,0.07734 -0.09185,-3.771312 2.25,0.09375 0.0095,4.497319 -2.10325,0.04956 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="372"
-         inkscape:export-xdpi="372"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/scenes.png"
-         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="1940.0398"
+         inkscape:export-xdpi="1940.0398"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi-manager/data/icons/right.png"
+         sodipodi:nodetypes="cccccccc"
          inkscape:connector-curvature="0"
-         id="path6585-1-3"
-         d="m 75.042607,18.53096 2.191174,5.319485 0.847963,-0.325814 -1.519765,-5.713211 z"
+         id="path7032-6-3-6-0-9-9-7"
+         d="m 90.468507,896.84917 0.136166,1.695 3.89988,-0.091 -0.805454,2.30808 6.614911,-2.8804 -6.581922,-3.09822 0.648998,2.3647 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
     </g>
     <g
-       id="g5121"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
-       inkscape:export-xdpi="170.99156"
-       inkscape:export-ydpi="170.99156"
-       transform="matrix(0.50368244,0,0,0.50368244,4.9043108,13.703586)">
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path5036"
-         d="m 13.03125,27.018433 0.03125,-1.0625 -2.3125,0.03125 -0.15625,4.484375 2.375,-0.140625 0.03125,-0.9375 -1.328125,0 -0.04687,-2.28125 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5036-8"
-         d="m 14.9375,26.619996 0.03125,-1.0625 -2.3125,0.03125 -0.15625,5.28125 2.5,-0.09375 0.03125,-0.9375 -1.53125,-0.03125 0.03125,-3.09375 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+       id="g9718"
+       transform="translate(-7.4736793,-201.19436)">
       <path
-         sodipodi:nodetypes="cccccccccc"
+         inkscape:export-ydpi="1940.04"
+         inkscape:export-xdpi="1940.04"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi-manager/data/icons/left.png"
+         sodipodi:nodetypes="cccccccc"
          inkscape:connector-curvature="0"
-         id="path5074"
-         d="m 18.65625,25.244995 -3.9375,0.34375 -0.3125,5.59375 4.15625,-0.15625 z m -0.828125,1.15625 -0.140625,3.28125 -2.21875,0.09375 0.140625,-3.21875 z"
+         id="path7032-6-3-6-0-9-9-9-7"
+         d="m 117.6903,896.40813 -0.13616,1.69501 -3.89988,-0.091 0.80545,2.30808 -6.61491,-2.8804 6.58192,-3.09822 -0.649,2.3647 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
     </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 14.797685,27.666603 0.908123,0.08265 0.01415,-0.8821 1.242675,1.037263 -1.286075,0.96811 0.0488,-0.809591 -0.913524,-3.26e-4 z"
-       id="path5079"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
-       inkscape:export-xdpi="170.99156"
-       inkscape:export-ydpi="170.99156" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 21.179551,27.727994 -2.612854,0.06296 0,0.550903 -0.456462,0.01574 0,-0.409242 -0.645343,-0.01574 0,1.054584 0.692563,-0.01574 0.01574,-0.299061 0.377762,-0.03148 0.04721,0.865705 2.534152,-0.03148 z"
-       id="path5081"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
-       inkscape:export-xdpi="170"
-       inkscape:export-ydpi="170" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 19.25926,26.327128 c -0.382896,0 -0.692563,0.348591 -0.692563,0.771263 0,0.422672 0.309667,0.755524 0.692563,0.755524 0.382897,0 0.692564,-0.332852 0.692564,-0.755524 0,-0.422672 -0.309667,-0.771263 -0.692564,-0.771263 z m 0.0787,0.409242 c 0.190726,0 0.346282,0.182963 0.346282,0.393501 0,0.21054 -0.155556,0.377762 -0.346282,0.377762 -0.190726,0 -0.346281,-0.167222 -0.346281,-0.377762 0,-0.210538 0.155555,-0.393501 0.346281,-0.393501 z"
-       id="path5083-3-2"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
-       inkscape:export-xdpi="170"
-       inkscape:export-ydpi="170" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 20.549947,26.281322 c 0.382896,0 0.692564,0.348591 0.692564,0.771264 0,0.422672 -0.309668,0.755524 -0.692564,0.755524 -0.382896,0 -0.692564,-0.332852 -0.692564,-0.755524 0,-0.422673 0.309668,-0.771264 0.692564,-0.771264 z m -0.0787,0.409242 c -0.190726,0 -0.346282,0.182963 -0.346282,0.393501 0,0.21054 0.155556,0.377763 0.346282,0.377763 0.190727,0 0.346282,-0.167223 0.346282,-0.377763 0,-0.210538 -0.155555,-0.393501 -0.346282,-0.393501 z"
-       id="path5083-3-2-7"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
-       inkscape:export-xdpi="170"
-       inkscape:export-ydpi="170" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 28.120923,26.131792 -1.558268,2.14065 1.306427,-0.09444 -0.01574,1.542528 0.717988,-0.08522 -0.136724,-1.471929 1.354766,0.0461 z"
-       id="path5233"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_up.png"
-       inkscape:export-xdpi="170"
-       inkscape:export-ydpi="170" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 24.524316,29.90941 -1.558267,-2.14065 1.306427,0.09444 -0.01574,-1.542527 0.717987,0.08522 -0.136722,1.471929 1.354764,-0.0461 z"
-       id="path5233-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_down.png"
-       inkscape:export-xdpi="170"
-       inkscape:export-ydpi="170" />
-    <g
-       id="g5306"
-       transform="matrix(0.50368244,0,0,0.50368244,10.157631,10.052974)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279">
-      <path
-         inkscape:export-ydpi="170"
-         inkscape:export-xdpi="170"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path5253-3"
-         d="m 45.409894,35.302305 -4.568466,0.02053 -0.0723,4.432362 6.408155,0.08839 -0.0944,-4.624303 -1.421145,-0.0404 0.454886,3.64824 -4.154253,0 -0.32544,-2.708788 4.762248,-0.08839 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="170"
-         inkscape:export-xdpi="170"
+    <g
+       id="g9721"
+       transform="translate(-15.432512,-198.97555)">
+      <g
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
          inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path5255-6"
-         d="m 42.330898,35.320145 c -0.0028,-2.135681 3.051859,-2.329526 3.147097,0.0221"
-         style="fill:none;stroke:#008700;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="170"
-         inkscape:export-xdpi="170"
+         transform="matrix(4.2758523,0,0,4.2758523,-36.010974,739.16872)"
+         id="g5306-9">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 45.409894,35.302305 -4.568466,0.02053 -0.0723,4.432362 6.408155,0.08839 -0.0944,-4.624303 -1.421145,-0.0404 0.454886,3.64824 -4.154253,0 -0.32544,-2.708788 4.762248,-0.08839 z"
+           id="path5253-3-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
+           inkscape:export-xdpi="170"
+           inkscape:export-ydpi="170" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 42.330898,35.320145 c -0.0028,-2.135681 3.051859,-2.329526 3.147097,0.0221"
+           id="path5255-6-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
+           inkscape:export-xdpi="170"
+           inkscape:export-ydpi="170" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 43.637495,36.877209 -0.0065,1.686311 0.707106,-0.0221 -0.104015,-1.730505 z"
+           id="path5259-7-2"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
+           inkscape:export-xdpi="170"
+           inkscape:export-ydpi="170"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <rect
+         inkscape:export-ydpi="279"
+         inkscape:export-xdpi="279"
          inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-         inkscape:connector-curvature="0"
-         id="path5259-7"
-         d="m 43.637495,36.877209 -0.0065,1.686311 0.707106,-0.0221 -0.104015,-1.730505 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         y="891.13843"
+         x="140.22906"
+         height="16.814381"
+         width="23.950237"
+         id="rect3484-8"
+         style="fill:#008700;fill-opacity:0.25480766;stroke:none" />
     </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 38.761215,26.79933 -3.478557,0.04722 0.04722,3.148014 c 0,0 3.809099,0.06296 3.714657,0.0787 -0.09444,0.01574 -0.283321,-3.273937 -0.283322,-3.273942 z m -1.93603,0.377762 0.550903,0 -0.01855,1.021162 1.240049,-7.41e-4 -0.05673,0.553583 -1.133286,-0.04722 0.125921,0.849964 -0.598124,0 -0.06296,-0.881444 -1.117545,0 -0.07188,-0.479771 1.12096,0.0015 0.02123,-1.017009 z"
-       id="path5311"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_layer.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279"
-       sodipodi:nodetypes="ccccccccccccccccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 43.603871,26.766076 -0.04721,3.148015 c 0,0 -3.809099,0.06296 -3.714658,0.0787 0.09444,0.01574 0.283321,-3.273935 0.283321,-3.273935 z"
-       id="path5311-5"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_layer.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 43.156081,28.127815 -0.0136,0.522547 -2.455915,-0.01269 -0.06462,-0.509554 z"
-       id="path5313-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_layer.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <rect
-       style="fill:#008700;fill-opacity:0.25480766;stroke:none"
-       id="rect3484"
-       width="2.8212655"
-       height="1.9806831"
-       x="30.918173"
-       y="27.95455"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <rect
-       style="fill:#008700;fill-opacity:0.25480766;stroke:none"
-       id="rect3484-5"
-       width="2.0329318"
-       height="3.8559418"
-       x="58.446793"
-       y="14.876337"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/scenes.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 47.055695,26.656659 -2.096273,0.06464 0.110817,3.416831 2.317904,-0.120051 -0.02771,-0.470968 -0.443265,-0.01847 0.120051,0.193928 -1.542193,0.120051 -0.129285,-2.881221 1.429067,-0.03463 0.07157,1.258225 0.348609,0.01154 c -0.06434,-0.541378 -0.151126,-0.994872 -0.159298,-1.539886 z"
-       id="path4318-7-8"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_frame.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path4323-6-9"
-       sodipodi:cx="53.452854"
-       sodipodi:cy="28.71464"
-       sodipodi:rx="0.77339804"
-       sodipodi:ry="0.77339804"
-       d="m 54.226252,28.71464 a 0.77339804,0.77339804 0 1 1 -1.546796,0 0.77339804,0.77339804 0 1 1 1.546796,0 z"
-       transform="matrix(0.41791392,0,0,0.41791392,23.790368,15.435293)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_frame.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.12537417;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 45.125648,28.053608 1.865403,-0.129285"
-       id="path4357-1"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_frame.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 46.607813,28.72061 1.228213,-0.08311 -0.0092,0.452501 -1.246682,0 z"
-       id="path4383"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/remove_frame.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 50.578256,26.529917 -2.096273,0.06464 0.110817,3.416831 2.311376,-0.02863 -0.02771,-0.470969 -0.443264,-0.01847 0.12005,0.193927 -1.535663,0.02863 -0.129285,-2.88122 1.429068,-0.03462 0.03463,1.110471 0.348608,0.01154 z"
-       id="path4318-7-8-2"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path4323-6-9-7"
-       sodipodi:cx="53.452854"
-       sodipodi:cy="28.71464"
-       sodipodi:rx="0.77339804"
-       sodipodi:ry="0.77339804"
-       d="m 54.226252,28.71464 a 0.77339804,0.77339804 0 1 1 -1.546796,0 0.77339804,0.77339804 0 1 1 1.546796,0 z"
-       transform="matrix(0.41791392,0,0,0.41791392,27.31293,15.308551)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.12537417;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 48.648209,27.926866 1.865405,-0.129285"
-       id="path4357-1-5"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 50.029064,28.74624 1.228214,0.08311 0.02771,-0.341684 -1.246681,0 z"
-       id="path4383-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 50.478688,28.177353 0.02137,1.058436 0.467663,0.002 -0.08488,-1.096494 z"
-       id="path4383-1-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/add_frame.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 54.379634,27.110411 c -0.916122,0.372266 -1.357005,1.416712 -0.984739,2.332835 0.372266,0.916122 1.416712,1.357005 2.332834,0.984738 0.916122,-0.372266 1.357005,-1.416711 0.984739,-2.332833 -0.372265,-0.916123 -1.416711,-1.357005 -2.332834,-0.98474 z m 0.205846,0.435584 c 0.663163,-0.269476 1.436626,0.05702 1.706102,0.720182 0.269476,0.663165 -0.06708,1.411869 -0.730243,1.681345 -0.663164,0.269476 -1.401808,-0.04232 -1.671284,-0.705485 -0.269476,-0.663164 0.03226,-1.426565 0.695425,-1.696042 z"
-       id="path4495"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/time_line.png"
-       inkscape:export-xdpi="439.86255"
-       inkscape:export-ydpi="439.86255"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssssssssss" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 54.13538,27.398946 -0.224466,-0.519162 -0.357517,0.166941 -0.03902,-0.385875 0.917432,-0.428035 0.379587,0.363237 -0.459333,0.124665 0.336432,0.647227 z"
-       id="path4518"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/time_line.png"
-       inkscape:export-xdpi="439.86255"
-       inkscape:export-ydpi="439.86255" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.17103344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 54.197148,28.087118 0.857932,0.863969 0.706425,-0.64058"
-       id="path4520"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/time_line.png"
-       inkscape:export-xdpi="439.86255"
-       inkscape:export-ydpi="439.86255" />
-    <g
-       id="g3569"
-       transform="translate(-1.6793786,0)">
-      <path
-         inkscape:export-ydpi="407.36514"
-         inkscape:export-xdpi="407.36514"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
-         sodipodi:nodetypes="ccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4590"
-         d="m 60.520847,28.375656 0.106901,1.617702 2.485559,-0.08662 0.27302,-3.50957 -3.051905,-0.136861 0.04009,0.815081 0.374136,-0.09353 -0.09353,-0.40086 2.383806,0.19031 -0.336225,2.792608 -1.700842,0.02863 -0.213792,-1.163395 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:export-ydpi="407.36514"
-         inkscape:export-xdpi="407.36514"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
+    <g
+       id="g9728"
+       transform="translate(-16.805993,-198.06475)">
+      <path
+         inkscape:export-ydpi="697.09631"
+         inkscape:export-xdpi="697.09631"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/open_padlock.png"
+         sodipodi:nodetypes="ccccccccccc"
          inkscape:connector-curvature="0"
-         id="path4596"
-         d="m 61.799207,27.394037 -0.66607,1.009833 1.324635,0.222224 z"
+         id="path5253-3-8-0"
+         d="m 203.70349,889.65684 -23.64603,0.41937 -0.30918,18.95212 27.40033,0.37794 -0.40366,-19.77283 -6.07661,-0.17276 1.94502,15.59934 -17.76297,0 -1.39154,-11.58238 20.36268,-0.37793 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="407.36514"
-         inkscape:export-xdpi="407.36514"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
+         inkscape:export-ydpi="697.09631"
+         inkscape:export-xdpi="697.09631"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/open_padlock.png"
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4601"
-         d="m 60.055859,27.827886 c 0.440262,-0.665281 1.0036,-0.362209 1.705844,0.41992"
-         style="fill:none;stroke:#008700;stroke-width:0.34206688;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:export-ydpi="407"
-         inkscape:export-xdpi="407"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="rect4659"
-         d="m 60.734085,28.908849 c 0.731602,0.569633 1.950029,0.545166 1.991902,-0.699282 l 0.188943,0.0077 -0.134424,1.444971 c -0.666509,-0.02205 -1.238537,-0.04409 -1.905047,-0.06614 -0.01337,-0.29755 -0.140105,-0.547857 -0.141374,-0.687223 z"
-         style="fill:#008700;fill-opacity:0.39215686;stroke:none" />
-      <path
-         inkscape:export-ydpi="407"
-         inkscape:export-xdpi="407"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_to_ws.png"
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
-         id="rect4659-3"
-         d="m 60.47584,26.958102 c 0.62767,-0.125559 2.222411,-0.203877 2.254834,1.248434 l 0.239559,0.01065 0.156719,-1.596718 c -0.817684,-0.06299 -1.975508,-0.173219 -2.556984,-0.198415 -0.01337,0.29755 -0.09286,0.396683 -0.09413,0.536051 z"
-         style="fill:#008700;fill-opacity:0.39215686;stroke:none" />
-    </g>
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.25;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 3.624989,30.556108 -0.745687,-0.08976 0.112845,0.676564 -0.506395,-0.158713 -0.06571,0.788775 0.666589,-0.07141 -0.161766,0.626223 0.897585,0.05524 -0.185253,-0.680477 0.51943,0.07566 0.04833,-0.807827 -0.604449,0.13691 z"
-       id="path4153-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/plus_sign_medium.png"
-       inkscape:export-xdpi="1309.09"
-       inkscape:export-ydpi="1309.09" />
-    <g
-       id="g4300"
-       transform="matrix(1.0542292,0,0,1,-0.27681948,0)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign_medium.png"
-       inkscape:export-xdpi="1257.0618"
-       inkscape:export-ydpi="1257.0618">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="605"
-         inkscape:export-xdpi="605"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
-         inkscape:connector-curvature="0"
-         id="path4296"
-         d="m 5.1520053,30.938157 -0.047381,0.829166 2.0373806,4e-6 -0.2724404,-0.900238 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="605"
-         inkscape:export-xdpi="605"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
-         inkscape:connector-curvature="0"
-         id="path4298"
-         d="m 5.3770648,31.186907 -0.00592,0.307975 1.3088985,0 -0.071071,-0.379046 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 17.061923,33.110613 -0.0221,-2.474873 3.415205,-0.04152 0.0221,0.30936 -3.127942,0.08571 0,1.723573 2.752292,-0.01942 -0.131238,-1.637635 0.493949,0.06227 -0.113398,1.948336 z"
-       id="path4304-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_big.png"
-       inkscape:export-xdpi="1047.33"
-       inkscape:export-ydpi="1047.33" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path4306-8"
-       sodipodi:cx="12.457031"
-       sodipodi:cy="31.397337"
-       sodipodi:rx="0.30859375"
-       sodipodi:ry="0.30859375"
-       d="m 12.765625,31.397337 a 0.30859375,0.30859375 0 1 1 -0.617187,0 0.30859375,0.30859375 0 1 1 0.617187,0 z"
-       transform="matrix(1.2911392,0,0,1.2911392,3.0303255,-8.8054007)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_big.png"
-       inkscape:export-xdpi="1047.33"
-       inkscape:export-ydpi="1047.33" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 17.639566,32.898793 0.578086,-0.853514 0.694813,0.837008"
-       id="path4367"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_big.png"
-       inkscape:export-xdpi="1047.33"
-       inkscape:export-ydpi="1047.33" />
-    <g
-       id="g6733"
-       transform="translate(2.2097087,-4.2868349)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_big.png"
-       inkscape:export-xdpi="952.07001"
-       inkscape:export-ydpi="952.07001">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="715"
-         inkscape:export-xdpi="715"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8"
-         d="m 12.387089,36.050866 -2.189855,-0.0068 -0.0022,1.573913 2.193155,0.0011 z"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="715"
-         inkscape:export-xdpi="715"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-7"
-         d="m 11.901447,36.037339 0.0045,-0.573774 -2.4163504,-0.0013 0.00879,1.524195 0.6850294,-0.0044"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path5255-6-7-2"
+         d="m 186.79355,885.73896 c 5.43563,-8.92534 14.50867,-2.68422 13.26369,4.89303"
+         style="fill:none;stroke:#008700;stroke-width:4.70343733;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="715"
-         inkscape:export-xdpi="715"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+         inkscape:export-ydpi="697.09631"
+         inkscape:export-xdpi="697.09631"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/open_padlock.png"
          inkscape:connector-curvature="0"
-         id="path4477-1-8-7-4"
-         d="m 11.431883,35.507008 -10e-4,-0.540629 -2.6207482,-0.0014 0.014318,1.689922 0.6297862,-0.0043"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <g
-         inkscape:export-ydpi="715"
-         inkscape:export-xdpi="715"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
-         transform="translate(0.11533046,0.11048543)"
-         id="g4661">
-        <path
-           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 10.467336,37.505134 0.492148,-0.798826 0.504212,0.760453"
-           id="path4367-4"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
-           inkscape:export-xdpi="715"
-           inkscape:export-ydpi="715" />
-        <path
-           sodipodi:type="arc"
-           style="fill:#008700;fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           id="path4637"
-           sodipodi:cx="11.744601"
-           sodipodi:cy="36.338123"
-           sodipodi:rx="0.099436894"
-           sodipodi:ry="0.099436894"
-           d="m 11.844038,36.338123 c 0,0.05492 -0.04452,0.09944 -0.09944,0.09944 -0.05492,0 -0.09944,-0.04452 -0.09944,-0.09944 0,-0.05492 0.04452,-0.09944 0.09944,-0.09944 0.05492,0 0.09944,0.04452 0.09944,0.09944 z"
-           transform="matrix(1.2864983,0,0,1.2864983,-3.3807595,-10.134925)"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
-           inkscape:export-xdpi="715"
-           inkscape:export-ydpi="715" />
-      </g>
+         id="path5259-7-2-8"
+         d="m 192.01303,896.72251 -0.028,7.21042 3.02348,-0.0945 -0.44475,-7.39939 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <rect
+         inkscape:export-ydpi="697.09631"
+         inkscape:export-xdpi="697.09631"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/open_padlock.png"
+         y="891.01074"
+         x="181.66559"
+         height="16.814381"
+         width="23.950237"
+         id="rect3484-8-3"
+         style="fill:#008700;fill-opacity:0.25480766;stroke:none" />
+    </g>
+    <g
+       id="g9734"
+       transform="translate(-17.626162,-207.85199)">
       <path
-         inkscape:export-ydpi="715"
-         inkscape:export-xdpi="715"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+         inkscape:export-ydpi="444.30115"
+         inkscape:export-xdpi="444.30115"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4641"
-         d="m 10.095152,37.763386 2.392918,-0.0016"
-         style="fill:none;stroke:#008700;stroke-width:0.10284942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path5062-3-7-2-4"
+         d="m 247.41654,892.38095 7.80455,-0.23345"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="715"
-         inkscape:export-xdpi="715"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/bitmap_array.png"
+         inkscape:export-ydpi="444.30115"
+         inkscape:export-xdpi="444.30115"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4641-1"
-         d="m 10.095152,37.852577 2.392918,-0.0016"
-         style="fill:none;stroke:#008700;stroke-width:0.10284942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <g
-       id="g6753"
-       transform="matrix(0.07690294,0,0,0.07690294,21.784688,26.145427)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/svg_big.png"
-       inkscape:export-xdpi="1334.74"
-       inkscape:export-ydpi="1334.74">
-      <g
-         id="svgstar"
-         transform="matrix(0.14324862,0,0,0.14324862,35.786798,80.187048)"
-         style="fill:#008700;fill-opacity:1;stroke:none">
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           inkscape:connector-curvature="0"
-           id="svgbar"
-           d="m -84.1487,-15.8513 a 22.4171,22.4171 0 1 0 0,31.7026 H 84.1487 a 22.4171,22.4171 0 1 0 0,-31.7026 z" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar"
-           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
-           id="use3057" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar"
-           transform="matrix(0,1,-1,0,0,0)"
-           id="use3059" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar"
-           transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
-           id="use3061" />
-      </g>
-    </g>
-    <g
-       id="g6753-2"
-       transform="matrix(0.03012437,0,0,0.03012437,26.425852,29.079421)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/svg_array.png"
-       inkscape:export-xdpi="728.57355"
-       inkscape:export-ydpi="728.57355">
-      <g
-         id="svgstar-2"
-         transform="matrix(0.14324862,0,0,0.14324862,35.786798,80.187048)"
-         style="fill:#008700;fill-opacity:1;stroke:none">
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           inkscape:connector-curvature="0"
-           id="svgbar-1"
-           d="m -84.1487,-15.8513 a 22.4171,22.4171 0 1 0 0,31.7026 H 84.1487 a 22.4171,22.4171 0 1 0 0,-31.7026 z" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar-1"
-           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
-           id="use3057-2" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar-1"
-           transform="matrix(0,1,-1,0,0,0)"
-           id="use3059-1" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar-1"
-           transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
-           id="use3061-4" />
-      </g>
-    </g>
-    <g
-       id="g6753-2-8"
-       transform="matrix(0.02388723,0,0,0.02388723,27.785777,30.239715)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/svg_array.png"
-       inkscape:export-xdpi="728.57355"
-       inkscape:export-ydpi="728.57355">
-      <g
-         id="svgstar-2-8"
-         transform="matrix(0.14324862,0,0,0.14324862,35.786798,80.187048)"
-         style="fill:#008700;fill-opacity:1;stroke:none">
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           inkscape:connector-curvature="0"
-           id="svgbar-1-3"
-           d="m -84.1487,-15.8513 a 22.4171,22.4171 0 1 0 0,31.7026 H 84.1487 a 22.4171,22.4171 0 1 0 0,-31.7026 z" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar-1-3"
-           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
-           id="use3057-2-6" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar-1-3"
-           transform="matrix(0,1,-1,0,0,0)"
-           id="use3059-1-6" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar-1-3"
-           transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
-           id="use3061-4-4" />
-      </g>
-    </g>
-    <g
-       id="g6753-2-8-1"
-       transform="matrix(0.03613876,0,0,0.03613876,26.210616,30.022912)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/svg_array.png"
-       inkscape:export-xdpi="728.57355"
-       inkscape:export-ydpi="728.57355">
-      <g
-         id="svgstar-2-8-0"
-         transform="matrix(0.14324862,0,0,0.14324862,35.786798,80.187048)"
-         style="fill:#008700;fill-opacity:1;stroke:none">
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           inkscape:connector-curvature="0"
-           id="svgbar-1-3-9"
-           d="m -84.1487,-15.8513 a 22.4171,22.4171 0 1 0 0,31.7026 H 84.1487 a 22.4171,22.4171 0 1 0 0,-31.7026 z" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar-1-3-9"
-           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
-           id="use3057-2-6-0" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar-1-3-9"
-           transform="matrix(0,1,-1,0,0,0)"
-           id="use3059-1-6-5" />
-        <use
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           height="1052.3622"
-           width="744.09448"
-           y="0"
-           x="0"
-           xlink:href="#svgbar-1-3-9"
-           transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
-           id="use3061-4-4-6" />
-      </g>
-    </g>
-    <g
-       id="g7054"
-       transform="matrix(0.5771474,0,0,0.5771474,10.178826,11.276852)">
-      <path
-         inkscape:export-ydpi="593.03113"
-         inkscape:export-xdpi="593.03113"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/net_document.png"
-         sodipodi:nodetypes="csssc"
+         id="path5062-3-7-0-6-3-5-6"
+         d="m 254.68289,891.9021 -26.21441,25.05195"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="444.30115"
+         inkscape:export-xdpi="444.30115"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
          inkscape:connector-curvature="0"
-         id="path4545-8-2"
-         d="m 38.34577,36.10961 c 0.403266,1.175586 -0.499578,1.850974 -1.274415,1.850974 -0.774837,0 -1.402968,-0.617574 -1.402968,-1.379388 0,-0.761816 0.628131,-1.379389 1.402968,-1.379389 0.560999,0 1.068065,0.328579 1.289284,0.835456"
-         style="fill:url(#linearGradient7059);fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:export-ydpi="593.03113"
-         inkscape:export-xdpi="593.03113"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/net_document.png"
-         sodipodi:nodetypes="cccccccc"
+         id="path5062-7-4-7"
+         d="m 223.07195,888.76188 39.46501,-0.92851"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="444.30115"
+         inkscape:export-xdpi="444.30115"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
          inkscape:connector-curvature="0"
-         id="path7032"
-         d="m 37.21875,35.940309 c 0.135417,0.171875 0.270833,0.34375 0.40625,0.515625 0.0052,-0.614583 0.555396,-1.336972 0.904354,-1.264055 l 0.213068,0.480584 1.320083,-1.404029 -2.09375,0.234375 0.34375,0.34375 c -0.432293,0.296875 -0.942712,0.734375 -1.093755,1.09375 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path5062-7-4-2-5"
+         d="m 221.90483,920.89406 39.34569,-1.59172"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="593"
-         inkscape:export-xdpi="593"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/net_document.png"
          sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="444.30115"
+         inkscape:export-xdpi="444.30115"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
          inkscape:connector-curvature="0"
-         id="path7034-3"
-         d="m 38.371592,36.431536 c -0.307572,0.902189 -2.235489,1.057329 -2.684796,0.208815"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <g
-       id="g7164">
+         id="path5062-7-4-5-6"
+         d="m 224.47123,886.95523 0.42073,35.37973"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="792.00775"
-         inkscape:export-xdpi="792.00775"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-         sodipodi:nodetypes="ccccccccc"
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="444.30115"
+         inkscape:export-xdpi="444.30115"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
          inkscape:connector-curvature="0"
-         id="path4833-1"
-         d="m 21.838887,10.288203 -0.499942,0.171875 0.794779,1.6875 2.704813,0 0.538399,-1.8125 -0.461485,-0.09375 -0.294837,1.328125 -2.26495,0.109375 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path5062-7-4-5-2-9"
+         d="m 259.92502,885.64213 -0.14211,35.94248"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="792.00775"
-         inkscape:export-xdpi="792.00775"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-         sodipodi:nodetypes="ccccccccc"
+         inkscape:export-ydpi="444.30115"
+         inkscape:export-xdpi="444.30115"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4837-8"
-         d="m 22.202458,12.075515 -0.101334,-0.21584 2.509036,0.03315 0.138107,-0.198873 0.370126,-1.281631 0.143631,0.03315 -0.408796,1.414213 -0.23202,0.187825 z"
-         style="fill:#ffffff;fill-opacity:0.19230772;stroke:none" />
-      <g
-         inkscape:export-ydpi="792.00775"
-         inkscape:export-xdpi="792.00775"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-         transform="matrix(0,0.67597278,0.67597278,0,1.943951,-14.831195)"
-         id="g7095">
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="M 36.360477,33.78131 36.039373,33.030184 35.70837,32.851203 c 0.324216,-0.327712 1.166496,-0.899766 1.630276,-1.180042 l -0.687118,-0.49564 2.125624,-0.144687 -0.988438,1.753563 -0.168809,-0.855607 c -0.565092,0.300317 -1.104596,1.337138 -1.259428,1.85252 z"
-           id="path4835-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccc" />
-        <path
-           style="fill:#ffffff;fill-opacity:0.19230772;stroke:none"
-           d="m 37.19878,31.306509 0.546875,0.296875 0.125,0.65625 0.46875,-0.96875 z"
-           id="path4839-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-      </g>
-    </g>
-    <g
-       id="g7157">
+         id="path5062-3-7-2-4-2"
+         d="m 253.04413,898.94663 1.05145,-7.54929"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="853.867"
-         inkscape:export-xdpi="853.867"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
-         sodipodi:nodetypes="ccccccccc"
+         inkscape:export-ydpi="444.30115"
+         inkscape:export-xdpi="444.30115"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4833-2"
-         d="m 26.74444,10.376591 -0.499942,0.171875 0.794779,1.6875 2.704813,0 0.538399,-1.8125 -0.461485,-0.09375 -0.294837,1.328125 -2.26495,0.109375 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path5062-3-7-2-4-8"
+         d="m 236.65007,915.68991 -7.80455,0.9838"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="853.867"
-         inkscape:export-xdpi="853.867"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
-         sodipodi:nodetypes="ccccccccc"
+         inkscape:export-ydpi="444.30115"
+         inkscape:export-xdpi="444.30115"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4837-2"
-         d="m 27.108011,12.163903 -0.101334,-0.21584 2.509036,0.03315 0.138107,-0.198873 0.370126,-1.281631 0.143631,0.03315 -0.408796,1.414213 -0.23202,0.187825 z"
-         style="fill:#ffffff;fill-opacity:0.19230772;stroke:none" />
-      <g
-         inkscape:export-ydpi="853.867"
-         inkscape:export-xdpi="853.867"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
-         transform="matrix(0.67597278,0,0,0.67597278,3.3535662,-11.375126)"
-         id="g7095-2">
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="M 36.360477,33.78131 36.039373,33.030184 35.70837,32.851203 c 0.324216,-0.327712 1.166496,-0.899766 1.630276,-1.180042 l -0.687118,-0.49564 2.125624,-0.144687 -0.988438,1.753563 -0.168809,-0.855607 c -0.565092,0.300317 -1.104596,1.337138 -1.259428,1.85252 z"
-           id="path4835-6-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccc" />
-        <path
-           style="fill:#ffffff;fill-opacity:0.19230772;stroke:none"
-           d="m 37.19878,31.306509 0.546875,0.296875 0.125,0.65625 0.46875,-0.96875 z"
-           id="path4839-1-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-      </g>
+         id="path5062-3-7-2-4-2-2"
+         d="m 229.89696,909.87458 -1.05145,7.54928"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g5137-4-5-1"
-       transform="matrix(0.12863869,0.0159084,-0.0159084,0.12863869,58.809759,71.513081)"
-       inkscape:transform-center-x="3.9172575"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/about.png"
-       inkscape:export-xdpi="875.88953"
-       inkscape:export-ydpi="875.88953"
-       inkscape:transform-center-y="0.59878385">
+       id="g9745"
+       transform="translate(-19.944273,-205.3424)">
       <path
-         sodipodi:nodetypes="cccccccccccc"
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="392.73001"
+         inkscape:export-xdpi="392.73001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
          inkscape:connector-curvature="0"
-         id="path3941-2-6-3-93-7-6"
-         d="m -214.2584,-274.42577 c 0.46516,-5.00053 1.51237,-9.53653 3.25674,-13.25785 0.50393,2.09324 0.54211,3.83825 1.04604,5.93149 0.93033,-2.79099 3.37245,-5.93086 5.93086,-8.37298 -1.04662,2.55841 -3.25616,5.81457 -4.88423,8.72186 2.2483,-1.89943 4.49208,-3.42692 9.41508,-4.97747 -1.74437,1.39549 -3.01906,2.76793 -4.76343,4.16343 1.74437,0.89157 3.48874,1.78313 5.23311,2.6747 -4.0702,-0.50393 -6.27973,-0.65898 -9.76847,0.58146 1.86066,0.81404 3.72132,1.62808 5.58198,2.44212 -4.22525,0.46516 -9.14825,-2.55841 -9.88476,2.79099 -0.38764,-0.23258 -0.77528,-0.46517 -1.16292,-0.69775 z"
-         style="fill:#23a0ff;fill-opacity:1;stroke:#0064be;stroke-width:0.6943742;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path4477-1-8-7-2-9-8"
+         d="m 285.08514,899.32175 -0.0382,-4.87087 22.20112,-0.011 -0.0747,12.93917 -5.81534,-0.0373"
+         style="fill:#46be40;fill-opacity:1;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="cc"
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="392.73001"
+         inkscape:export-xdpi="392.73001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
          inkscape:connector-curvature="0"
-         id="path4100-9-2-8-75-0-4"
-         d="m -213.67694,-274.13504 c 0.54269,-2.61656 1.43425,-4.53536 3.72132,-6.62861"
-         style="fill:none;stroke:#0064be;stroke-width:0.69439036;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="7.71875"
-       y="45.049683"
-       id="text3576"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3578" /></text>
-    <g
-       id="g4459"
-       transform="translate(-0.125,-1.15625)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/crash_6.png"
-       inkscape:export-xdpi="825"
-       inkscape:export-ydpi="825">
-      <g
-         id="g4442">
-        <g
-           id="g4426">
-          <path
-             sodipodi:nodetypes="cccccccccccccccccccc"
-             inkscape:connector-curvature="0"
-             id="path3075-4"
-             d="m 3.4748922,40.642057 0.351046,1.466134 -1.6313313,-0.185848 1.0118384,1.177036 -0.8259905,2.044327 1.8378289,-1.135737 0.6401427,0.784691 1.0118384,-0.88794 0.8053407,1.094437 0.7640413,-0.887939 1.6106815,0.764041 -0.8259905,-1.73458 1.300935,-1.073788 -1.6726308,0.309747 0.2477972,-1.858479 -1.218336,1.383534 -0.8879399,-1.073788 -0.7020919,1.197687 -1.3835341,-1.259636 z"
-             style="fill:#00a600;fill-opacity:0.3125;stroke:none" />
-          <path
-             sodipodi:nodetypes="ccc"
-             inkscape:connector-curvature="0"
-             id="path4324-3"
-             d="M 5.8716901,41.029291 5.2757452,41.927074 3.7277622,40.635871"
-             style="fill:none;stroke:#43981a;stroke-width:0.13215849;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4322-0-5"
-             d="m 3.4962543,40.626093 0.321235,1.460158 -1.5769715,-0.146016 1.0221111,1.226534 -0.8760951,1.956613 1.7813936,-1.138924 0.6424699,0.876095 1.0221111,-0.876095 0.8760951,1.080517 0.7300795,-0.963705 1.5769715,0.73008 -0.7008764,-1.606175 1.2265335,-1.28494 c 0,0 -1.6061746,0.408845 -1.6061746,0.292032 0,-0.116813 0.175219,-1.693784 0.175219,-1.693784 L 6.76701,41.852626 6.0077274,40.888921"
-             style="fill:none;stroke:#43981a;stroke-width:0.1651981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <text
-             transform="matrix(0.95240857,-0.30482441,0.30482441,0.95240857,0,0)"
-             sodipodi:linespacing="125%"
-             id="text4243-1"
-             y="42.892876"
-             x="-10.869791"
-             style="font-size:3.30396199px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             xml:space="preserve"><tspan
-               y="42.892876"
-               x="-10.869791"
-               id="tspan4245-7"
-               sodipodi:role="line">B</tspan></text>
-          <text
-             sodipodi:linespacing="125%"
-             id="text4243-4-4"
-             y="43.372581"
-             x="3.785182"
-             style="font-size:3.30396199px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008800;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             xml:space="preserve"><tspan
-               y="43.372581"
-               x="3.785182"
-               id="tspan4245-3-3"
-               sodipodi:role="line">0</tspan></text>
-          <g
-             id="text4243-2-1"
-             style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             transform="matrix(0.32049554,0.08027616,-0.08027616,0.32049554,-14.056757,47.150968)">
-            <path
-               style="fill:#008700;fill-opacity:1"
-               sodipodi:nodetypes="ccccccccccccccc"
-               inkscape:connector-curvature="0"
-               id="path4320-4"
-               d="m 57.427763,-26.726684 c 0.878907,-2.22656 1.186062,-3.627987 1.648302,-5.932679 l 2.333984,-0.380859 -0.332031,3.583984 0.908203,-3.310547 2.246094,-0.390625 c -0.266933,2.122401 -0.400396,4.036462 -0.400391,5.742188 -5e-6,0.338543 0.0033,0.673829 0.0098,1.005859 l -2.001953,0.351563 0.351562,-4.277344 -0.722389,2.703554 -1.074219,0.146484 0.08762,-3.982851 -1.023302,4.467836 -2.03125,0.273437" />
-          </g>
-          <text
-             transform="matrix(0.91529523,0.40278361,-0.40278361,0.91529523,0,0)"
-             sodipodi:linespacing="125%"
-             id="text4243-4-1-6"
-             y="37.95356"
-             x="21.634735"
-             style="font-size:3.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             xml:space="preserve"><tspan
-               y="37.95356"
-               x="21.634735"
-               id="tspan4245-3-7-9"
-               sodipodi:role="line">0</tspan></text>
-          <text
-             transform="matrix(0.9986833,-0.05129977,0.05129977,0.9986833,0,0)"
-             sodipodi:linespacing="125%"
-             id="text4243-2-8-4"
-             y="44.456589"
-             x="6.5840259"
-             style="font-size:3.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             xml:space="preserve"><tspan
-               y="44.456589"
-               x="6.5840259"
-               id="tspan4245-34-8-2"
-               sodipodi:role="line">!</tspan></text>
-          <path
-             sodipodi:nodetypes="cccccccc"
-             inkscape:connector-curvature="0"
-             id="path4353-2"
-             d="M 1.9319816,44.949602 C 1.6788875,45.124821 1.1775664,45.343845 1.742161,44.818188 4.3217747,43.075732 7.7482808,43.698733 9.3057834,44.321734 8.9909587,44.430221 8.4435877,44.033224 6.5168805,43.810678 c -0.6097716,-0.06356 -1.2758328,0.0053 -1.4658662,0.04747 0.7521579,-0.06962 1.3591631,-0.02391 1.5814263,0.02013 0.3566118,0.07907 0.090937,0.158828 -0.1010844,0.196084 -1.1676975,-0.323276 -3.416646,-0.283157 -4.5993746,0.875235 z"
-             style="fill:#008700;fill-opacity:1;stroke:none" />
-        </g>
-      </g>
-      <text
-         sodipodi:linespacing="125%"
-         id="text3640"
-         y="47.372433"
-         x="3.8231013"
-         style="font-size:2.44724345px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:Blambot Pro;-inkscape-font-specification:Blambot Pro"
-         xml:space="preserve"><tspan
-           y="47.372433"
-           x="3.8231013"
-           id="tspan3642"
-           sodipodi:role="line">#6</tspan></text>
-    </g>
-    <g
-       id="g4569"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/crash_11.png"
-       inkscape:export-xdpi="825"
-       inkscape:export-ydpi="825"
-       transform="translate(0.875,-5)">
-      <g
-         transform="translate(9.1874999,-1.2006931)"
-         id="g4442-1">
-        <g
-           id="g4426-6">
-          <path
-             sodipodi:nodetypes="cccccccccccccccccccc"
-             inkscape:connector-curvature="0"
-             id="path3075-4-4"
-             d="m 3.4748922,40.642057 0.351046,1.466134 -1.6313313,-0.185848 1.0118384,1.177036 -0.8259905,2.044327 1.8378289,-1.135737 0.6401427,0.784691 1.0118384,-0.88794 0.8053407,1.094437 0.7640413,-0.887939 1.6106815,0.764041 -0.8259905,-1.73458 1.300935,-1.073788 -1.6726308,0.309747 0.2477972,-1.858479 -1.218336,1.383534 -0.8879399,-1.073788 -0.7020919,1.197687 -1.3835341,-1.259636 z"
-             style="fill:#00a600;fill-opacity:0.3125;stroke:none" />
-          <path
-             sodipodi:nodetypes="ccc"
-             inkscape:connector-curvature="0"
-             id="path4324-3-5"
-             d="M 5.8716901,41.029291 5.2757452,41.927074 3.7277622,40.635871"
-             style="fill:none;stroke:#43981a;stroke-width:0.13215849;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4322-0-5-8"
-             d="m 3.4962543,40.626093 0.321235,1.460158 -1.5769715,-0.146016 1.0221111,1.226534 -0.8760951,1.956613 1.7813936,-1.138924 0.6424699,0.876095 1.0221111,-0.876095 0.8760951,1.080517 0.7300795,-0.963705 1.5769715,0.73008 -0.7008764,-1.606175 1.2265335,-1.28494 c 0,0 -1.6061746,0.408845 -1.6061746,0.292032 0,-0.116813 0.175219,-1.693784 0.175219,-1.693784 L 6.76701,41.852626 6.0077274,40.888921"
-             style="fill:none;stroke:#43981a;stroke-width:0.1651981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <text
-             transform="matrix(0.95240857,-0.30482441,0.30482441,0.95240857,0,0)"
-             sodipodi:linespacing="125%"
-             id="text4243-1-3"
-             y="42.892876"
-             x="-10.869791"
-             style="font-size:3.30396199px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             xml:space="preserve"><tspan
-               y="42.892876"
-               x="-10.869791"
-               id="tspan4245-7-1"
-               sodipodi:role="line">B</tspan></text>
-          <text
-             sodipodi:linespacing="125%"
-             id="text4243-4-4-2"
-             y="43.372581"
-             x="3.785182"
-             style="font-size:3.30396199px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008800;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             xml:space="preserve"><tspan
-               y="43.372581"
-               x="3.785182"
-               id="tspan4245-3-3-2"
-               sodipodi:role="line">0</tspan></text>
-          <g
-             id="text4243-2-1-9"
-             style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             transform="matrix(0.32049554,0.08027616,-0.08027616,0.32049554,-14.056757,47.150968)">
-            <path
-               style="fill:#008700;fill-opacity:1"
-               sodipodi:nodetypes="ccccccccccccccc"
-               inkscape:connector-curvature="0"
-               id="path4320-4-5"
-               d="m 57.427763,-26.726684 c 0.878907,-2.22656 1.186062,-3.627987 1.648302,-5.932679 l 2.333984,-0.380859 -0.332031,3.583984 0.908203,-3.310547 2.246094,-0.390625 c -0.266933,2.122401 -0.400396,4.036462 -0.400391,5.742188 -5e-6,0.338543 0.0033,0.673829 0.0098,1.005859 l -2.001953,0.351563 0.351562,-4.277344 -0.722389,2.703554 -1.074219,0.146484 0.08762,-3.982851 -1.023302,4.467836 -2.03125,0.273437" />
-          </g>
-          <text
-             transform="matrix(0.91529523,0.40278361,-0.40278361,0.91529523,0,0)"
-             sodipodi:linespacing="125%"
-             id="text4243-4-1-6-5"
-             y="37.95356"
-             x="21.634735"
-             style="font-size:3.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             xml:space="preserve"><tspan
-               y="37.95356"
-               x="21.634735"
-               id="tspan4245-3-7-9-4"
-               sodipodi:role="line">0</tspan></text>
-          <text
-             transform="matrix(0.9986833,-0.05129977,0.05129977,0.9986833,0,0)"
-             sodipodi:linespacing="125%"
-             id="text4243-2-8-4-6"
-             y="44.456589"
-             x="6.5840259"
-             style="font-size:3.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:BadaBoom BB;-inkscape-font-specification:BadaBoom BB"
-             xml:space="preserve"><tspan
-               y="44.456589"
-               x="6.5840259"
-               id="tspan4245-34-8-2-3"
-               sodipodi:role="line">!</tspan></text>
-          <path
-             sodipodi:nodetypes="cccccccc"
-             inkscape:connector-curvature="0"
-             id="path4353-2-1"
-             d="M 1.9319816,44.949602 C 1.6788875,45.124821 1.1775664,45.343845 1.742161,44.818188 4.3217747,43.075732 7.7482808,43.698733 9.3057834,44.321734 8.9909587,44.430221 8.4435877,44.033224 6.5168805,43.810678 c -0.6097716,-0.06356 -1.2758328,0.0053 -1.4658662,0.04747 0.7521579,-0.06962 1.3591631,-0.02391 1.5814263,0.02013 0.3566118,0.07907 0.090937,0.158828 -0.1010844,0.196084 -1.1676975,-0.323276 -3.416646,-0.283157 -4.5993746,0.875235 z"
-             style="fill:#008700;fill-opacity:1;stroke:none" />
-        </g>
-      </g>
-      <text
-         sodipodi:linespacing="125%"
-         id="text3640-2"
-         y="46.171741"
-         x="12.93771"
-         style="font-size:2.44724345px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008700;fill-opacity:1;stroke:none;font-family:Blambot Pro;-inkscape-font-specification:Blambot Pro"
-         xml:space="preserve"><tspan
-           y="46.171741"
-           x="12.93771"
-           id="tspan3642-0"
-           sodipodi:role="line">#11</tspan></text>
+         id="path4477-1-8-7-4-0-0-7"
+         d="m 290.75963,894.81967 0.008,-4.5895 22.24802,-0.0119 -0.12157,14.34606 -5.34638,-0.0365"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="392.73001"
+         inkscape:export-xdpi="392.73001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9"
+         d="m 279.64933,899.34279 21.59146,0.0356 0.0187,13.36124 -21.61947,-0.0841 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g4574"
-       transform="matrix(0.68178092,0,0,0.68178092,5.3497543,13.403521)">
+       id="g9750"
+       transform="translate(-24.833907,-201.09784)">
       <path
-         inkscape:export-ydpi="423.23508"
-         inkscape:export-xdpi="423.23508"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/chat.png"
-         sodipodi:nodetypes="ccccccccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
+         sodipodi:nodetypes="cccccccc"
          inkscape:connector-curvature="0"
-         id="path3618"
-         d="m 17.411881,46.276666 0.8125,-0.6875 -0.09375,-2.203125 -0.875,-0.690831 -3.71875,-0.32479 -1.18907,1.026808 0.282583,2.556869 0.873047,0.654029 3.095972,-0.08145 1.211168,0.8431 z"
-         style="fill:#008c00;fill-opacity:0.40526315;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 23.013712,35.064769 -0.707107,0.110482 0.751301,0.430893 -1.145963,0.555528 -0.154676,0.806544 2.284367,-0.762674 0.342505,0.165728 -2.795281,1.027514 -0.193743,0.715034 3.024065,-0.975162 0.282686,0.270851 -1.866284,0.557655 0.540464,0.160502 2.165515,-0.696059 -1.005418,-0.673961 -2.610692,0.936331 0.06116,-0.184705 3.071495,-1.193242 -0.729204,-0.574525 -2.052349,0.751627 0.04419,-0.220972 1.223303,-0.566576 z"
-       id="path4394"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/drawing_object.png"
-       inkscape:export-xdpi="434.10669"
-       inkscape:export-ydpi="434.10669" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path4400"
-       sodipodi:cx="28.637825"
-       sodipodi:cy="35.498436"
-       sodipodi:rx="0.79549515"
-       sodipodi:ry="0.79549515"
-       d="m 29.43332,35.498436 a 0.79549515,0.79549515 0 1 1 -2.9e-5,-0.0068"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="translate(0.17677669,-0.09943686)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
-       inkscape:export-xdpi="354.93695"
-       inkscape:export-ydpi="354.93695" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 28.245604,36.476233 -0.171253,-0.182301 -0.209922,0.09944 0.04419,0.464039 0.541378,0.03315 0.0221,1.347923 -0.519282,-0.06629 c 0,0 -0.37565,0.662912 -0.320408,0.662912 0.05524,0 2.530117,0.01105 2.530117,0.01105 l -0.265164,-0.718155 -0.585573,0.154679 -0.132582,-1.381068 0.464038,0.06629 0.314884,-0.50271 z"
-       id="path4402"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccsccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
-       inkscape:export-xdpi="354.93695"
-       inkscape:export-ydpi="354.93695" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:0.10576926;stroke:none"
-       id="path3619"
-       sodipodi:cx="28.867188"
-       sodipodi:cy="35.38562"
-       sodipodi:rx="0.3515625"
-       sodipodi:ry="0.3515625"
-       d="m 29.21875,35.38562 a 0.3515625,0.3515625 0 1 1 -1.3e-5,-0.003"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="translate(-0.234375,-0.25)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
-       inkscape:export-xdpi="354.93695"
-       inkscape:export-ydpi="354.93695" />
-    <g
-       id="g4570"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/new_item.png"
-       inkscape:export-xdpi="469.5"
-       inkscape:export-ydpi="469.5">
-      <path
-         inkscape:export-ydpi="469.50342"
-         inkscape:export-xdpi="469.50342"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_object.png"
-         sodipodi:nodetypes="ccccccccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4390"
-         d="M 42.796875,33.828125 42.125,33.875 l -0.21875,1.34375 -1.5,-0.515625 -0.3125,0.40625 1.251896,1.278244 -1.15468,2.113951 0.75,0.28125 1.621534,-1.18907 1.3125,1.25 0.932138,-0.296415 -1.200444,-2.109835 1.279355,-1.541973 -0.28125,-0.28125 -1.651674,0.541973 z m 0.0625,1.890625 1.110161,-0.39252 -0.91841,1.063285 0.772097,1.621534 -1.231369,-1.024318 -1.459597,0.775888 0.744639,-1.375 -1.141736,-1.177562 1.415403,0.462603 0.292624,-1.270852 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="469.50342"
-         inkscape:export-xdpi="469.50342"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/library_object.png"
-         sodipodi:nodetypes="ccccccccccccc"
+         id="path7032-6-3-6-4"
+         d="m 346.31473,905.51946 c -0.0877,-0.4045 -0.2377,-1.01656 -0.43584,-1.62793 -1.8449,2.61843 -5.49564,4.31905 -8.74724,2.83279 l 1.49919,-1.69614 -7.21398,-0.11087 6.13222,6.20681 -0.65817,-2.93753 c 3.33833,0.72531 7.75964,-0.48533 9.42377,-2.66715 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
+         sodipodi:nodetypes="cccccccc"
          inkscape:connector-curvature="0"
-         id="path4411"
-         d="m 40.484375,34.987182 1.53125,0.4375 0.40625,-1.359375 0.5,1.359375 1.53125,-0.40625 -1.21875,1.40625 0.828125,1.609375 -0.296875,0.28125 -1.171875,-1 -1.28125,0.859375 -0.453125,-0.296875 0.703125,-1.609375 z"
-         style="fill:url(#linearGradient4419);fill-opacity:1;stroke:none" />
-    </g>
-    <path
-       style="fill:#ffffff;fill-opacity:0.21634617;stroke:none"
-       d="m 24.834647,0.77746602 c -0.08704,-0.0722768 -0.536359,-0.13544891 -0.690495,-0.0352038 -0.154136,0.10024511 0.0028,0.33444868 0.256845,0.35135958 0.254016,0.016911 0.102884,-0.149656 0.177764,-0.1893279 0.07488,-0.0396718 0.243509,-0.0637186 0.255886,-0.12682788 z"
-       id="path4103-2-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czzcc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/skull.png"
-       inkscape:export-xdpi="566.92914"
-       inkscape:export-ydpi="566.92914" />
-    <path
-       style="fill:#006000;fill-opacity:0.21634616;stroke:none"
-       d="m 30.018893,38.757757 -2.23733,-0.0221 0.07806,-0.15847 2.064412,-0.02734 z"
-       id="path4439"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
-       inkscape:export-xdpi="354"
-       inkscape:export-ydpi="354" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 33.466036,35.782483 -0.07257,-0.67109 -1.491767,2.698168 0.3125,0.8125 3.577934,-0.0054 0.71875,-0.875 -1.63063,-2.279029 -0.104149,0.549881 1.047279,1.604148 -0.3125,0.53125 -2.734184,0.130362 -0.3125,-0.59375 z"
-       id="path4441-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/warning_message.png"
-       inkscape:export-xdpi="390.52463"
-       inkscape:export-ydpi="390.52463" />
-    <path
-       transform="translate(-0.75455448,-0.08387202)"
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path4447-7"
-       sodipodi:cx="34.758717"
-       sodipodi:cy="37.619759"
-       sodipodi:rx="0.44194174"
-       sodipodi:ry="0.44194174"
-       d="m 35.200658,37.619759 a 0.44194174,0.44194174 0 1 1 -1.6e-5,-0.0038"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/warning_message.png"
-       inkscape:export-xdpi="390.52463"
-       inkscape:export-ydpi="390.52463" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 33.828957,36.83525 0.536343,0.05982 0.496859,-2.159963 -1.325825,-0.165593 z"
-       id="path4449-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/warning_message.png"
-       inkscape:export-xdpi="390.52463"
-       inkscape:export-ydpi="390.52463" />
-    <g
-       id="g4810"
-       transform="matrix(0.34363739,0,0,0.34363739,1.9033308,38.794917)">
-      <rect
-         inkscape:export-ydpi="93.218567"
-         inkscape:export-xdpi="93.218567"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style02.png"
-         y="71.693466"
-         x="5.1417742"
-         height="12.551146"
-         width="140.18391"
-         id="rect4641-5"
-         style="fill:#edeceb;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="93.218567"
-         inkscape:export-xdpi="93.218567"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style02.png"
-         inkscape:connector-curvature="0"
-         id="path4639-2"
-         d="m 5.3215779,78.057428 139.9705821,0"
-         style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022;stroke-dashoffset:0" />
-    </g>
-    <g
-       id="g4806"
-       transform="matrix(0.34363739,0,0,0.34363739,0.93137615,38.665819)">
-      <rect
-         inkscape:export-ydpi="93.218567"
-         inkscape:export-xdpi="93.218567"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style03.png"
-         y="88.310478"
-         x="7.9702067"
-         height="12.551146"
-         width="140.18391"
-         id="rect4641-5-7"
-         style="fill:#edeceb;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="93.218567"
-         inkscape:export-xdpi="93.218567"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style03.png"
-         inkscape:connector-curvature="0"
-         id="path4639-2-5"
-         d="m 8.1500096,94.674439 139.9705804,0"
-         style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4.95900011, 9.91800022;stroke-dashoffset:14.87700033" />
+         id="path7032-6-3-6-0-7"
+         d="m 331.41685,888.94932 c 0.0877,0.40451 0.23769,1.01656 0.43583,1.62793 1.84491,-2.61842 5.49564,-4.31905 8.74725,-2.83278 l -1.49919,1.69613 7.21399,0.11087 -6.13222,-6.2068 0.65816,2.93753 c -3.33833,-0.72532 -7.75965,0.48532 -9.42378,2.66714 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-9"
+         d="m 332.34711,893.19124 13.03219,0.0212 0.011,8.06459 -13.0491,-0.0509 z"
+         style="fill:none;stroke:#008700;stroke-width:1.80478692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g4802"
-       transform="matrix(0.34363739,0,0,0.34363739,0.9313779,39.508676)">
+       id="g9755"
+       transform="translate(-36.081884,-204.28126)">
       <rect
-         inkscape:export-ydpi="93.218567"
-         inkscape:export-xdpi="93.218567"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
-         y="102.09906"
-         x="7.9702072"
-         height="12.551146"
-         width="140.18391"
-         id="rect4641-5-7-1"
-         style="fill:#edeceb;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="93.218567"
-         inkscape:export-xdpi="93.218567"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
-         inkscape:connector-curvature="0"
-         id="path4639-2-5-4"
-         d="m 8.1500094,108.46302 139.9705706,0"
-         style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:14.87700033" />
-    </g>
-    <g
-       id="g4794"
-       transform="matrix(0.34363739,0,0,0.34363739,-1.4638665,39.865566)">
-      <g
-         inkscape:export-ydpi="93"
-         inkscape:export-xdpi="93"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style05.png"
-         id="g4787">
+         transform="scale(1,-1)"
+         ry="0.21548516"
+         y="-900.81415"
+         x="373.84805"
+         height="0.79298538"
+         width="38.884827"
+         id="rect4795"
+         style="fill:none;stroke:#007200;stroke-width:7.24535799;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368467,452.19167)"
+         id="g4887">
         <rect
-           style="fill:#edeceb;fill-opacity:1;stroke:none"
-           id="rect4641-5-7-1-6"
-           width="140.18391"
-           height="12.551146"
-           x="9.0308695"
-           y="117.30186"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
-           inkscape:export-xdpi="93.218567"
-           inkscape:export-ydpi="93.218567" />
-        <path
-           style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:41.65560093"
-           d="m 9.210674,123.57743 45.970566,0"
-           id="path4639-2-5-4-5"
-           inkscape:connector-curvature="0"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
-           inkscape:export-xdpi="93.218567"
-           inkscape:export-ydpi="93.218567"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:28.26630063"
-           d="m 55.452217,123.57743 45.970563,0"
-           id="path4639-2-5-4-5-2"
-           inkscape:connector-curvature="0"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
-           inkscape:export-xdpi="93.218567"
-           inkscape:export-ydpi="93.218567"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:28.26630063"
-           d="m 115.02989,123.57743 45.97056,0"
-           id="path4639-2-5-4-5-2-0"
-           inkscape:connector-curvature="0"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
-           inkscape:export-xdpi="93.218567"
-           inkscape:export-ydpi="93.218567"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#008700;stroke-width:4.95900011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:19.83600044, 9.91800022, 4.95900011, 9.91800022;stroke-dashoffset:28.26630063"
-           d="m 100.10847,123.57743 9.97056,0"
-           id="path4639-2-5-4-5-2-0-8"
-           inkscape:connector-curvature="0"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line_style04.png"
-           inkscape:export-xdpi="93.218567"
-           inkscape:export-ydpi="93.218567"
-           sodipodi:nodetypes="cc" />
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5"
+           width="0.47230023"
+           height="0.28480035"
+           x="41.763851"
+           y="51.672905"
+           ry="0.077391401" />
+        <rect
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5-3"
+           width="0.47230023"
+           height="0.28480035"
+           x="42.787289"
+           y="51.672905"
+           ry="0.077391401" />
+        <rect
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5-3-0"
+           width="0.47230023"
+           height="0.28480035"
+           x="43.810726"
+           y="51.672905"
+           ry="0.077391401" />
+        <rect
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5-3-0-1"
+           width="0.47230023"
+           height="0.28480035"
+           x="44.834164"
+           y="51.672905"
+           ry="0.077391401" />
+        <rect
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5-3-0-1-9"
+           width="0.47230023"
+           height="0.28480035"
+           x="45.857601"
+           y="51.672905"
+           ry="0.077391401" />
       </g>
-    </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 24.755362,40.290403 c -0.355737,-0.07797 -0.954542,-0.155943 -1.53125,0.03125 l 0.3125,1.34375 L 22.875,41.9375 22.15625,40.65625 C 21.650735,40.976601 21.194351,41.544716 21.125,41.9375 L 22.390625,42.453125 22.25,43.09375 21.0625,42.875 c -0.192708,0.5 -0.07292,0.859375 0.07813,1.328125 L 22.375,43.875 l 0.53125,0.859375 -1.0625,0.71875 C 22.015625,45.75 22.65625,46.21875 23.171875,46.3125 L 23.53125,45.015625 24.5,44.984375 25,46.3125 c 0.588542,-0.302083 1.036458,-0.854167 1.34375,-1.28125 L 25.1875,44.5 l 0.4375,-0.71875 1.25,0.4375 c 0.15625,-0.447917 0.15625,-1.005208 0,-1.4375 l -1.15625,0.1875 -0.28125,-0.6875 1.1875,-0.4375 C 26.536458,41.421875 26.119792,40.6875 25.5625,40.4375 l -0.625,1.5 -0.682138,-0.209597 z M 23.9375,42.40625 c 0.486992,0 0.902059,0.408803 0.90625,0.90625 0,0.500508 -0.416279,0.90625 -0.90625,0.90625 -0.489971,0 -0.875,-0.405742 -0.875,-0.90625 0,-0.500508 0.385029,-0.90625 0.875,-0.90625 z"
-       id="path4820"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccscsss"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_general_preferences.png"
-       inkscape:export-xdpi="1432.9553"
-       inkscape:export-ydpi="1432.9553" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.05;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 24.439099,40.455569 -0.931488,0.04742 0.253234,1.309876 -0.933885,0.39727 -0.692923,-1.237133 -0.658896,0.861483 1.025598,0.417838 0.217502,1.104702 -1.470523,-0.144118 0.151698,0.744789 1.154952,-0.398479 0.651469,1.160433 -0.993579,0.715022 0.74479,0.541714 0.556383,-1.316087 1.050191,0.04097 0.51566,1.186731 0.912131,-0.817291 -1.069549,-0.496789 0.453964,-1.068575 1.377539,0.487112 0.06629,-1.010199 -1.113742,0.218233 -0.658803,-0.855426 1.415279,-0.674936 -0.8389,-0.896487 -0.616954,1.370204 -0.906323,-0.125652 z m -0.596462,2.112323 0.73438,0.734379 -0.73438,0.73438 -0.709056,-0.73438 z"
-       id="path4820-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_general_preferences.png"
-       inkscape:export-xdpi="1432.9553"
-       inkscape:export-ydpi="1432.9553" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 33.128058,40.086873 c -0.355737,-0.07797 -0.954542,-0.155943 -1.53125,0.03125 l 0.3125,1.34375 -0.661612,0.272097 -0.71875,-1.28125 c -0.505515,0.320351 -0.961899,0.888466 -1.03125,1.28125 l 1.265625,0.515625 -0.140625,0.640625 -1.1875,-0.21875 c -0.192708,0.5 -0.07292,0.859375 0.07813,1.328125 l 1.23437,-0.328125 0.53125,0.859375 -1.0625,0.71875 c 0.171875,0.296875 0.8125,0.765625 1.328125,0.859375 l 0.359375,-1.296875 0.96875,-0.03125 0.5,1.328125 c 0.588542,-0.302083 1.036458,-0.854167 1.34375,-1.28125 l -1.15625,-0.53125 0.4375,-0.71875 1.25,0.4375 c 0.15625,-0.447917 0.15625,-1.005208 0,-1.4375 l -1.15625,0.1875 -0.28125,-0.6875 1.1875,-0.4375 c -0.08854,-0.421875 -0.505208,-1.15625 -1.0625,-1.40625 l -0.625,1.5 -0.682138,-0.209597 z m -1.049882,1.905924 c 0.680674,-0.148261 1.432389,0.20993 1.469726,1.094076 0,0.666236 -0.747735,1.038832 -1.237706,1.038832 -0.489971,0 -1.118068,-0.516227 -1.118068,-1.016735 0,-0.500508 0.293026,-0.987003 0.886048,-1.116173 z"
-       id="path4820-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccscsss"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_font_properties.png"
-       inkscape:export-xdpi="1432.9553"
-       inkscape:export-ydpi="1432.9553" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.05;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 32.811795,40.252039 -0.931488,0.04742 0.253234,1.309876 -0.933885,0.39727 -0.692923,-1.237133 -0.658896,0.861483 1.025598,0.417838 0.06125,0.932827 -1.314273,0.02776 0.151698,0.744789 1.154952,-0.398479 0.651469,1.160433 -0.993579,0.715022 0.74479,0.541714 0.60973,-1.364072 0.996844,0.08895 0.51566,1.186731 0.912131,-0.817291 -1.069549,-0.496789 0.453964,-1.068575 1.377539,0.487112 0.06629,-1.010199 -1.180033,0.24033 -0.482027,-0.910669 1.304794,-0.64179 -0.8389,-0.896487 -0.616954,1.370204 -0.906323,-0.125652 z m -0.596462,2.112323 0.73438,0.734379 -0.73438,0.73438 -0.709056,-0.73438 z"
-       id="path4820-4-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_font_properties.png"
-       inkscape:export-xdpi="1432.9553"
-       inkscape:export-ydpi="1432.9553" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 31.582053,42.341104 -0.004,0.443425 0.618437,-0.116001 0.01779,0.817726 -0.16155,0 0,0.282712 0.570238,0.01912 0.05818,-0.282712 -0.224538,-0.01912 0.08162,-0.804263 0.618438,0.15806 -0.01346,-0.484651 z"
-       id="path4884"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_font_properties.png"
-       inkscape:export-xdpi="1432"
-       inkscape:export-ydpi="1432" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 40.402923,40.174665 c -0.355737,-0.07797 -0.954542,-0.155943 -1.53125,0.03125 l 0.3125,1.34375 -0.661612,0.272097 -0.71875,-1.28125 c -0.505515,0.320351 -0.961899,0.888466 -1.03125,1.28125 l 1.265625,0.515625 -0.140625,0.640625 -1.1875,-0.21875 c -0.192708,0.5 -0.07292,0.859375 0.07813,1.328125 l 1.23437,-0.328125 0.53125,0.859375 -1.0625,0.71875 c 0.171875,0.296875 0.8125,0.765625 1.328125,0.859375 l 0.359375,-1.296875 0.96875,-0.03125 0.5,1.328125 c 0.588542,-0.302083 1.036458,-0.854167 1.34375,-1.28125 l -1.15625,-0.53125 0.4375,-0.71875 1.25,0.4375 c 0.15625,-0.447917 0.15625,-1.005208 0,-1.4375 l -1.15625,0.1875 -0.28125,-0.6875 1.1875,-0.4375 c -0.08854,-0.421875 -0.505208,-1.15625 -1.0625,-1.40625 l -0.625,1.5 -0.682138,-0.209597 z m -1.049882,1.905924 c 0.680674,-0.148261 1.432389,0.20993 1.469726,1.094076 0,0.666236 -0.747735,1.038832 -1.237706,1.038832 -0.489971,0 -1.118068,-0.516227 -1.118068,-1.016735 0,-0.500508 0.293026,-0.987003 0.886048,-1.116173 z"
-       id="path4820-8-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccscsss"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432.9553"
-       inkscape:export-ydpi="1432.9553" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.05;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 40.08666,40.339831 -0.931488,0.04742 0.253234,1.309876 -0.933885,0.39727 -0.692923,-1.237133 -0.658896,0.861483 1.025598,0.417838 0.06125,0.932827 -1.314273,0.02776 0.151698,0.744789 1.154952,-0.398479 0.651469,1.160433 -0.993579,0.715022 0.74479,0.541714 0.60973,-1.364072 0.996844,0.08895 0.51566,1.186731 0.912131,-0.817291 -1.069549,-0.496789 0.453964,-1.068575 1.377539,0.487112 0.06629,-1.010199 -1.180033,0.24033 -0.482027,-0.910669 1.304794,-0.64179 -0.8389,-0.896487 -0.616954,1.370204 -0.906323,-0.125652 z m -0.596462,2.112323 0.73438,0.734379 -0.73438,0.73438 -0.709056,-0.73438 z"
-       id="path4820-4-9-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432.9553"
-       inkscape:export-ydpi="1432.9553" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 40.213855,42.369406 0.02695,0.0876 -1.338884,0.07935 0,-0.121533 z"
-       id="path4910"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432"
-       inkscape:export-ydpi="1432" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 40.183555,42.436924 0.151998,-0.01496 -0.08772,1.488987 -0.105908,0.0039 z"
-       id="path4910-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432"
-       inkscape:export-ydpi="1432" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 38.981709,42.381287 -0.124654,-0.0071 0.111159,1.504612 0.121533,0 z"
-       id="path4910-3-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432"
-       inkscape:export-ydpi="1432" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 40.376901,43.884279 0.0071,-0.12856 -1.477269,0.05257 0.01172,0.0981 z"
-       id="path4910-3-1-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432"
-       inkscape:export-ydpi="1432" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 40.367193,42.916921 0.01038,0.115223 -1.394127,-0.009 0,-0.121533 z"
-       id="path4910-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432"
-       inkscape:export-ydpi="1432" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 39.586694,42.965577 0.09865,-0.02695 0.02967,1.024001 -0.121533,0 z"
-       id="path4910-9-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432"
-       inkscape:export-ydpi="1432" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 39.649372,43.215604 0.01038,0.0876 -0.797505,0.02415 0.02762,-0.08286 z"
-       id="path4910-9-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432"
-       inkscape:export-ydpi="1432" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 40.387965,43.461039 0.0038,0.0876 -0.780932,0.02415 0.0302,-0.08286 z"
-       id="path4910-9-9-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_theme_properties.png"
-       inkscape:export-xdpi="1432"
-       inkscape:export-ydpi="1432" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 48.434173,40.143415 c -0.355737,-0.07797 -0.954542,-0.155943 -1.53125,0.03125 l 0.3125,1.34375 -0.661612,0.272097 -0.71875,-1.28125 c -0.505515,0.320351 -0.961899,0.888466 -1.03125,1.28125 l 1.265625,0.515625 -0.140625,0.640625 -1.1875,-0.21875 c -0.192708,0.5 -0.07292,0.859375 0.07813,1.328125 l 1.23437,-0.328125 0.53125,0.859375 -1.0625,0.71875 c 0.171875,0.296875 0.8125,0.765625 1.328125,0.859375 l 0.359375,-1.296875 0.96875,-0.03125 0.5,1.328125 c 0.588542,-0.302083 1.036458,-0.854167 1.34375,-1.28125 l -1.15625,-0.53125 0.4375,-0.71875 1.25,0.4375 c 0.15625,-0.447917 0.15625,-1.005208 0,-1.4375 l -1.15625,0.1875 -0.28125,-0.6875 1.1875,-0.4375 c -0.08854,-0.421875 -0.505208,-1.15625 -1.0625,-1.40625 l -0.625,1.5 -0.682138,-0.209597 z m -1.049882,1.905924 c 0.680674,-0.148261 1.432389,0.20993 1.469726,1.094076 0,0.666236 -0.747735,1.038832 -1.237706,1.038832 -0.489971,0 -1.118068,-0.516227 -1.118068,-1.016735 0,-0.500508 0.293026,-0.987003 0.886048,-1.116173 z"
-       id="path4820-8-9-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccscsss"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_workspace_properties.png"
-       inkscape:export-xdpi="1432.9558"
-       inkscape:export-ydpi="1432.9558" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.05;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 48.11791,40.308581 -0.931488,0.04742 0.253234,1.309876 -0.933885,0.39727 -0.692923,-1.237133 -0.658896,0.861483 1.025598,0.417838 0.06125,0.932827 -1.314273,0.02776 0.151698,0.744789 1.154952,-0.398479 0.651469,1.160433 -0.993579,0.715022 0.74479,0.541714 0.60973,-1.364072 0.996844,0.08895 0.51566,1.186731 0.912131,-0.817291 -1.069549,-0.496789 0.453964,-1.068575 1.377539,0.487112 0.06629,-1.010199 -1.180033,0.24033 -0.482027,-0.910669 1.304794,-0.64179 -0.8389,-0.896487 -0.616954,1.370204 -0.906323,-0.125652 z m -0.596462,2.112323 0.73438,0.734379 -0.73438,0.73438 -0.709056,-0.73438 z"
-       id="path4820-4-9-5-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_workspace_properties.png"
-       inkscape:export-xdpi="1432.9558"
-       inkscape:export-ydpi="1432.9558" />
-    <path
-       style="fill:url(#linearGradient5053);fill-opacity:1;stroke:#008600;stroke-width:0.05243382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 46.869389,42.591407 0.120196,0.594702 0.393515,0.153399 0.213398,-0.213418 0.501478,0.572737 c 0.320456,0.158505 0.487469,-0.198906 0.374171,-0.341079 l -0.790615,-0.3435 0.10022,-0.422925 -0.305282,-0.244833 -0.465167,0.06063 0.256981,0.205468 0.116868,-0.08563 0.183795,0.06241 -0.01536,0.271834 -0.26891,0.179692 -0.159672,-0.07701 0.0065,-0.1647 z"
-       id="path4653-8-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ktoon_workspace_properties.png"
-       inkscape:export-xdpi="1432.9558"
-       inkscape:export-ydpi="1432.9558" />
-    <g
-       id="g5123">
-      <path
-         inkscape:export-ydpi="338.82352"
-         inkscape:export-xdpi="338.82352"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/recent_files.png"
-         sodipodi:nodetypes="ccccccccccc"
+      <g
+         id="g4887-0"
+         transform="matrix(8.4891828,0,0,8.4891828,19.368467,468.90476)">
+        <rect
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5-0"
+           width="0.47230023"
+           height="0.28480035"
+           x="41.763851"
+           y="51.672905"
+           ry="0.077391401" />
+        <rect
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5-3-08"
+           width="0.47230023"
+           height="0.28480035"
+           x="42.787289"
+           y="51.672905"
+           ry="0.077391401" />
+        <rect
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5-3-0-7"
+           width="0.47230023"
+           height="0.28480035"
+           x="43.810726"
+           y="51.672905"
+           ry="0.077391401" />
+        <rect
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5-3-0-1-5"
+           width="0.47230023"
+           height="0.28480035"
+           x="44.834164"
+           y="51.672905"
+           ry="0.077391401" />
+        <rect
+           style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect4795-5-3-0-1-9-1"
+           width="0.47230023"
+           height="0.28480035"
+           x="45.857601"
+           y="51.672905"
+           ry="0.077391401" />
+      </g>
+    </g>
+    <g
+       id="g9770"
+       transform="translate(-32.953724,-203.32057)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
          inkscape:connector-curvature="0"
-         id="path5117"
-         d="m 53.550285,34.689671 0.09937,2.500824 2.003972,0.01656 0.198741,-2.765812 -2.186151,-0.01656 0.04968,0.215303 1.954287,-0.04969 -0.165618,2.484262 -1.681017,-0.06625 -0.09109,-2.310364 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4477-1-8-1-0-9-9-4"
+         d="m 435.54088,902.61307 8.42947,0.0212 0.007,7.96603 -8.4404,-0.0501 z"
+         style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:1.44260275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="338.82352"
-         inkscape:export-xdpi="338.82352"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/recent_files.png"
-         sodipodi:nodetypes="ccccccccc"
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
          inkscape:connector-curvature="0"
-         id="path5119"
-         d="m 52.970624,36.635677 0.496852,-0.04141 -0.03312,0.695593 2.434577,0 0.04969,-0.861211 0.538257,0.107652 -0.01656,1.33322 -3.50281,0.0083 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4477-1-8-1-0-9-9-4-5"
+         d="m 441.20294,895.62834 8.42946,0.0212 0.007,7.96603 -8.44039,-0.0501 z"
+         style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:1.44260275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="338"
-         inkscape:export-xdpi="338"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/recent_files.png"
-         sodipodi:nodetypes="ccccccccccccc"
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
          inkscape:connector-curvature="0"
-         id="path5121"
-         d="m 55.471351,34.785077 c -0.03513,0 -1.598542,-0.01757 -1.598542,-0.01757 l 0.19323,2.031845 1.200371,0.04099 0.07612,-0.7495 -0.819765,0.06441 -0.134676,-0.09369 0.95444,-0.05856 0.04685,-0.567979 -0.767067,0.117109 -0.03513,-0.122964 0.819765,-0.06441 z"
-         style="fill:#008700;fill-opacity:0.45263157;stroke:none" />
+         id="path4477-1-8-1-0-9-9-4-5-0"
+         d="m 448.68201,889.53225 8.42946,0.0212 0.007,7.96602 -8.44039,-0.0501 z"
+         style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:1.44260275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-9-4-5-0-0"
+         d="m 451.32936,899.31569 8.42946,0.0212 0.007,7.96603 -8.44039,-0.0501 z"
+         style="fill:#35b314;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-9-4-5-0-0-6"
+         d="m 438.3841,885.89042 8.42946,0.0212 0.007,7.96603 -8.4404,-0.0501 z"
+         style="fill:#35b314;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-9-4-5-0-0-3"
+         d="m 445.58408,905.0366 8.42946,0.0212 0.007,7.96603 -8.44039,-0.0501 z"
+         style="fill:#35b314;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-9-4-5-0-0-3-9"
+         d="m 430.95055,893.09592 8.42946,0.0212 0.007,7.96603 -8.4404,-0.0501 z"
+         style="fill:#35b314;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-9-4-5-0-0-3-0"
+         d="m 458.90222,891.89318 8.42947,0.0212 0.007,7.96603 -8.44039,-0.0501 z"
+         style="fill:#35b314;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="564.13"
+         inkscape:export-xdpi="564.13"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-9-4-5-0-0-3-6"
+         d="m 425.894,903.03752 8.42946,0.0212 0.007,7.96603 -8.4404,-0.0501 z"
+         style="fill:#35b314;fill-opacity:1;stroke:none" />
     </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 61.398653,42.110617 -2.14065,-1.558268 0.09444,1.306427 -1.542528,-0.01574 0.08522,0.717988 1.471929,-0.136724 -0.0461,1.354766 z"
-       id="path5233-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_forward.png"
-       inkscape:export-xdpi="300.9415"
-       inkscape:export-ydpi="300.9415" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 53.329423,42.21111 2.14065,-1.558267 -0.09444,1.306427 1.542527,-0.01574 -0.08522,0.717987 -1.471929,-0.136722 0.0461,1.354764 z"
-       id="path5233-7-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_backward.png"
-       inkscape:export-xdpi="300.9415"
-       inkscape:export-ydpi="300.9415" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 58.847012,36.725199 -0.01429,-2.185811 3.126143,-0.04152 0.01429,0.231235 -2.924817,0.03883 0,1.723573 2.752292,-0.01942 -0.07655,-1.614198 0.251762,0.03883 0.04285,1.815524 z"
-       id="path4304-2-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_mode.png"
-       inkscape:export-xdpi="715.30231"
-       inkscape:export-ydpi="715.30231" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path4306-8-9"
-       sodipodi:cx="12.457031"
-       sodipodi:cy="31.397337"
-       sodipodi:rx="0.30859375"
-       sodipodi:ry="0.30859375"
-       d="m 12.765625,31.397337 a 0.30859375,0.30859375 0 1 1 -0.617187,0 0.30859375,0.30859375 0 1 1 0.617187,0 z"
-       transform="matrix(1.2911392,0,0,1.2911392,44.535437,-5.3003529)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_mode.png"
-       inkscape:export-xdpi="715"
-       inkscape:export-ydpi="715" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 58.924656,36.232129 0.772843,-1.039539 0.804208,1.015192 0.698701,-0.54395 0.66657,0.552766"
-       id="path4367-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_mode.png"
-       inkscape:export-xdpi="715"
-       inkscape:export-ydpi="715" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 3.0499086,48.706921 2.5434077,0.0042 0.0022,1.573913 -2.5467077,-0.0099 z"
-       id="path4477-1-8-1-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frames_mode.png"
-       inkscape:export-xdpi="715"
-       inkscape:export-ydpi="715"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 3.6902302,48.704443 -0.0045,-0.573774 2.6152241,-0.0013 -0.0088,1.524195 -0.68503,-0.0044"
-       id="path4477-1-8-7-2-9"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frames_mode.png"
-       inkscape:export-xdpi="715"
-       inkscape:export-ydpi="715"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 4.3586673,48.174112 0.001,-0.540629 2.620749,-0.0014 -0.01432,1.689922 -0.629787,-0.0043"
-       id="path4477-1-8-7-4-0-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frames_mode.png"
-       inkscape:export-xdpi="715"
-       inkscape:export-ydpi="715"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 10.652941,47.703196 -1.2047295,1.654982 1.0100255,-0.07301 -0.01217,1.192561 0.555092,-0.06589 -0.105704,-1.13798 1.047398,0.03564 z"
-       id="path5233-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_properties.png"
-       inkscape:export-xdpi="689.76874"
-       inkscape:export-ydpi="689.76874" />
-    <g
-       id="g3745"
-       transform="matrix(0.72751091,0,0,0.44373562,-5.1940323,25.403853)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_properties.png"
-       inkscape:export-xdpi="689.76874"
-       inkscape:export-ydpi="689.76874">
+    <g
+       id="g9781"
+       transform="translate(-27.710715,-204.00644)">
       <path
-         inkscape:export-ydpi="712.18268"
-         inkscape:export-xdpi="712.18268"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
          sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="411.42856"
+         inkscape:export-xdpi="411.42856"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/antialiasing.png"
          inkscape:connector-curvature="0"
-         id="path4558-1"
-         d="m 20.013468,49.15513 -0.273673,0.981718 4.02756,-0.314772 -0.07144,-0.628717 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4477-1-8-1-0-9-9-4-8"
+         d="m 475.48358,902.40841 8.42947,0.0212 0.007,7.96603 -8.4404,-0.0501 z"
+         style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:1.44260275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="712.18268"
-         inkscape:export-xdpi="712.18268"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
          sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="411.42856"
+         inkscape:export-xdpi="411.42856"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/antialiasing.png"
          inkscape:connector-curvature="0"
-         id="path4558-0-1"
-         d="m 19.940889,49.446095 -0.143591,0.436465 3.979427,-0.06226 -0.06705,-0.240841 z"
-         style="fill:#ffffff;fill-opacity:0.17307691;stroke:none" />
+         id="path4477-1-8-1-0-9-9-4-5-6"
+         d="m 481.14564,893.92299 8.42946,0.0212 0.007,7.96603 -8.44039,-0.0501 z"
+         style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:1.44260275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="411.42856"
+         inkscape:export-xdpi="411.42856"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/antialiasing.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-9-4-5-0-04"
+         d="m 489.93782,889.89035 8.42946,0.0212 0.007,7.96602 -8.4404,-0.0501 z"
+         style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:1.44260275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g5292"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/motion.png"
-       inkscape:export-xdpi="1014"
-       inkscape:export-ydpi="1014">
-      <g
-         id="g5288">
-        <path
-           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
-           d="m 14.180979,47.736309 c 1.095491,-0.625056 2.272274,0.171547 1.971296,1.272693 -0.300978,1.101145 -2.005831,0.227555 -1.268244,-0.808604 0.501813,-0.704945 1.841323,-1.160797 2.144354,0.159666"
-           id="path4630-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="czsc"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/motion.png"
-           inkscape:export-xdpi="1014.0845"
-           inkscape:export-ydpi="1014.0845" />
-        <path
-           style="fill:#30aa00;fill-opacity:1;stroke:#008700;stroke-width:0.13084352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 17.550406,49.013252 c 0.09239,0.328894 -0.09458,0.482553 -0.285033,0.513658 -0.190455,0.03111 -0.369642,-0.09548 -0.400224,-0.282733 -0.03058,-0.187255 0.09902,-0.364271 0.289476,-0.395376 0.137894,-0.02252 0.275721,0.03789 0.350446,0.153598"
-           id="path4545-6-8"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssc"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/motion.png"
-           inkscape:export-xdpi="1014.0845"
-           inkscape:export-ydpi="1014.0845" />
-      </g>
+       id="g9786"
+       transform="translate(-10.4267,-221.3811)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="490.91"
+         inkscape:export-xdpi="490.91"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_color.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-4"
+         d="m 495.33244,910.81918 21.59146,0.0357 0.0187,13.36124 -21.61947,-0.084 z"
+         style="fill:#3cc73d;fill-opacity:1;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="490.91"
+         inkscape:export-xdpi="490.91"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_color.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-4-1"
+         d="m 499.09901,913.68626 14.06215,0.0212 0.0119,7.64149 -14.0804,-0.0475 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.37373516;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g4641-1"
-       transform="matrix(0.86038431,0.60970836,-0.60970836,0.86038431,31.39184,-6.0733537)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-       inkscape:export-xdpi="744.45654"
-       inkscape:export-ydpi="744.45654">
+       id="g9790"
+       transform="translate(-6.1706184,-221.17061)">
       <path
-         inkscape:export-ydpi="865.95496"
-         inkscape:export-xdpi="865.95496"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         sodipodi:nodetypes="csssc"
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="490.91"
+         inkscape:export-xdpi="490.91"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
          inkscape:connector-curvature="0"
-         id="path4545-6-3-9"
-         d="m 20.970314,47.978259 c 0.40547,0.145726 0.426521,0.450225 0.319125,0.668636 -0.107395,0.218411 -0.368538,0.30987 -0.583278,0.204279 -0.214741,-0.10559 -0.301761,-0.368246 -0.194364,-0.586657 0.07776,-0.158135 0.240657,-0.255524 0.414197,-0.247626"
-         style="fill:url(#linearGradient5528);fill-opacity:1;stroke:#008700;stroke-width:0.16502121;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path4477-1-8-1-0-9-4-2"
+         d="m 527.05636,910.6087 21.59146,0.0357 0.0187,13.36123 -21.61946,-0.084 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="865.95496"
-         inkscape:export-xdpi="865.95496"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         transform="matrix(0.08195568,-0.16667399,0.17587696,0.08648089,14.657957,53.691299)"
-         sodipodi:open="true"
-         sodipodi:end="5.8778476"
-         sodipodi:start="0"
-         d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
-         sodipodi:ry="0.078125"
-         sodipodi:rx="0.0625"
-         sodipodi:cy="15.221559"
-         sodipodi:cx="41.859375"
-         id="path4556-7-3-7"
-         style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         sodipodi:type="arc" />
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="490.91"
+         inkscape:export-xdpi="490.91"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-4-1-4"
+         d="m 530.82294,913.47579 14.06214,0.0212 0.0119,7.6415 -14.08041,-0.0475 z"
+         style="fill:#3cc73d;fill-opacity:1;stroke:#008700;stroke-width:0.37373516;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 20.717942,49.21146 c -0.01033,-0.04765 -0.028,-0.119748 -0.05134,-0.191766 -0.217324,0.308443 -0.64737,0.508771 -1.030398,0.333694 l 0.176599,-0.1998 -0.849785,-0.01306 0.722357,0.731143 -0.07753,-0.346032 c 0.393245,0.08544 0.914062,-0.05717 1.110092,-0.314182 z"
-       id="path7032-6-3-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-       inkscape:export-xdpi="744.45654"
-       inkscape:export-ydpi="744.45654" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 18.963013,47.509547 c 0.01033,0.04765 0.028,0.119748 0.05134,0.191766 0.217325,-0.308443 0.64737,-0.508771 1.030399,-0.333694 l -0.1766,0.1998 0.849786,0.01306 -0.722357,-0.731143 0.07753,0.346032 c -0.393245,-0.08544 -0.914062,0.05717 -1.110093,0.314182 z"
-       id="path7032-6-3-6-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-       inkscape:export-xdpi="744.45654"
-       inkscape:export-ydpi="744.45654" />
-    <g
-       id="g4641-1-8"
-       transform="matrix(0.86038431,0.60970836,-0.60970836,0.86038431,35.02366,-6.1230505)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-       inkscape:export-xdpi="744.45654"
-       inkscape:export-ydpi="744.45654">
+    <g
+       id="g9794"
+       transform="translate(58.607732,-247.35187)">
       <path
-         inkscape:export-ydpi="865.95496"
-         inkscape:export-xdpi="865.95496"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         sodipodi:nodetypes="csssc"
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="490.91"
+         inkscape:export-xdpi="490.91"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_color.png"
          inkscape:connector-curvature="0"
-         id="path4545-6-3-9-2"
-         d="m 20.970314,47.978259 c 0.40547,0.145726 0.426521,0.450225 0.319125,0.668636 -0.107395,0.218411 -0.368538,0.30987 -0.583278,0.204279 -0.214741,-0.10559 -0.301761,-0.368246 -0.194364,-0.586657 0.07776,-0.158135 0.240657,-0.255524 0.414197,-0.247626"
-         style="fill:url(#linearGradient5528-7);fill-opacity:1;stroke:#008700;stroke-width:0.16502121;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path4477-1-8-1-0-9-4-3"
+         d="m 498.25801,936.78996 21.59145,0.0357 0.0187,13.36123 -21.61947,-0.084 z"
+         style="fill:#3cc73d;fill-opacity:1;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="865.95496"
-         inkscape:export-xdpi="865.95496"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         transform="matrix(0.08195568,-0.16667399,0.17587696,0.08648089,14.657957,53.691299)"
-         sodipodi:open="true"
-         sodipodi:end="5.8778476"
-         sodipodi:start="0"
-         d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
-         sodipodi:ry="0.078125"
-         sodipodi:rx="0.0625"
-         sodipodi:cy="15.221559"
-         sodipodi:cx="41.859375"
-         id="path4556-7-3-7-6"
-         style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         sodipodi:type="arc" />
+         inkscape:export-ydpi="490"
+         inkscape:export-xdpi="490"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_color.png"
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4866"
+         d="m 504.82941,946.27035 c -4.31662,-4.07629 7.90433,-10.1317 4.95655,-0.0586 1.21303,-2.25272 2.95663,-3.44429 4.43495,-3.57471"
+         style="fill:none;stroke:#ffffff;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g4816"
-       transform="translate(0,-0.007497)">
+       id="g9798"
+       transform="translate(65.039012,-248.74575)">
       <path
-         inkscape:export-ydpi="744.45654"
-         inkscape:export-xdpi="744.45654"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         sodipodi:nodetypes="cccccccc"
+         sodipodi:nodetypes="ccccc"
+         inkscape:export-ydpi="490.91"
+         inkscape:export-xdpi="490.91"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
          inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-4"
-         d="m 23.057112,48.976131 -0.156403,-0.125149 -0.30701,0.341911 -0.132985,-0.255419 -0.286887,0.799999 0.797117,-0.314543 -0.255253,-0.135216 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4477-1-8-1-0-9-4-2-1"
+         d="m 527.80671,938.18388 21.59145,0.0356 0.0187,13.36124 -21.61947,-0.084 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="744.45654"
-         inkscape:export-xdpi="744.45654"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         sodipodi:nodetypes="cccccccc"
+         inkscape:export-ydpi="490"
+         inkscape:export-xdpi="490"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
+         sodipodi:nodetypes="ccc"
          inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-2"
-         d="m 23.021949,47.735147 -0.166797,0.11092 -0.275774,-0.367569 -0.154917,0.242744 -0.215471,-0.822118 0.76639,0.383379 -0.266148,0.112261 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4866-1"
+         d="m 534.37811,947.66428 c -4.31662,-4.0763 7.90432,-10.13171 4.95655,-0.0586 1.21303,-2.25271 2.95663,-3.44429 4.43494,-3.57471"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g4820">
+       id="g9293"
+       transform="translate(242.58894,-275.61941)">
       <path
-         inkscape:export-ydpi="744.45654"
-         inkscape:export-xdpi="744.45654"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         sodipodi:nodetypes="cccccccc"
+         inkscape:export-ydpi="947.27002"
+         inkscape:export-xdpi="947.27002"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
+         sodipodi:nodetypes="csssc"
          inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9"
-         d="m 23.922645,47.735147 0.166797,0.11092 0.275774,-0.367569 0.154917,0.242744 0.215471,-0.822118 -0.76639,0.383379 0.266148,0.112261 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4545-8-2-1"
+         d="m 371.10475,720.79455 c 1.97581,5.75979 -2.44768,9.06886 -6.244,9.06886 -3.79632,0 -6.87386,-3.02581 -6.87386,-6.75833 0,-3.73252 3.07754,-6.75833 6.87386,-6.75833 2.74862,0 5.23299,1.60988 6.31686,4.09333"
+         style="fill:url(#linearGradient11119);fill-opacity:1;stroke:#008700;stroke-width:0.97990197;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="744.45654"
-         inkscape:export-xdpi="744.45654"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+         inkscape:export-ydpi="947.27002"
+         inkscape:export-xdpi="947.27002"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path7034-3-6"
+         d="m 371.23128,722.37182 c -1.50696,4.42029 -10.95281,5.1804 -13.15419,1.02309"
+         style="fill:none;stroke:#008700;stroke-width:0.97990197;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="947.27002"
+         inkscape:export-xdpi="947.27002"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
          sodipodi:nodetypes="cccccccc"
          inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-4-0"
-         d="m 23.872511,48.997322 0.151238,-0.131346 0.320529,0.329271 0.122591,-0.260567 0.31887,0.787799 -0.809137,-0.282189 0.2496,-0.145385 z"
+         id="path7032-2"
+         d="m 376.62116,711.5612 2.63444,1.85178 c -2.63555,-0.70935 -4.71645,-0.0475 -6.06726,0.99322 l 3.45597,1.0723 -10.88798,4.76259 4.98006,-9.0484 0.88983,2.52625 c 1.37332,-1.32059 3.55134,-2.31326 4.99494,-2.15774 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
     </g>
     <g
-       id="g4641-1-8-4"
-       transform="matrix(0.86038431,0.60970836,-0.60970836,0.86038431,39.395113,-6.9466701)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/opacity_tween.png"
-       inkscape:export-xdpi="865"
-       inkscape:export-ydpi="865">
+       id="g9311"
+       transform="translate(296.62784,-280.04243)">
+      <rect
+         inkscape:export-ydpi="947"
+         inkscape:export-xdpi="947"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
+         ry="0.15309671"
+         y="713.12549"
+         x="398.19827"
+         height="24.141113"
+         width="21.488243"
+         id="rect4017"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
+      <g
+         inkscape:export-ydpi="947"
+         inkscape:export-xdpi="947"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
+         transform="matrix(8.4891828,0,0,8.4891828,18.771594,451.81786)"
+         id="g4788">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 45.015625,31.03125 0.03125,2.34375 0.214174,-0.0221 -0.0404,-2.321653 z m 0.234375,0 0.0625,2.34375 1.34375,-0.03125 -0.0625,-2.3125 z m 1.373104,0 0.07165,2.290403 0.211493,0.0221 -0.09375,-2.3125 z m -1.248104,0.1875 1.0625,0 0.03125,0.5625 -1.0625,0 z m 1.09375,0.6875 L 46.5,32.46875 45.4375,32.5 45.40625,31.9375 z m -1.03125,0.71875 1.0625,0 0.03125,0.5625 -1.0625,0.03125 z"
+           id="path4318-7-8-2-1-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccccccccccccccccccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
+           inkscape:export-xdpi="1220"
+           inkscape:export-ydpi="1220" />
+      </g>
+    </g>
+    <g
+       id="g9806"
+       transform="translate(139.55806,-274.83341)">
       <path
-         inkscape:export-ydpi="865.95496"
-         inkscape:export-xdpi="865.95496"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
+         inkscape:export-ydpi="947.27002"
+         inkscape:export-xdpi="947.27002"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
          sodipodi:nodetypes="csssc"
          inkscape:connector-curvature="0"
-         id="path4545-6-3-9-2-9"
-         d="m 20.970314,47.978259 c 0.40547,0.145726 0.426521,0.450225 0.319125,0.668636 -0.107395,0.218411 -0.368538,0.30987 -0.583278,0.204279 -0.214741,-0.10559 -0.301761,-0.368246 -0.194364,-0.586657 0.07776,-0.158135 0.240657,-0.255524 0.414197,-0.247626"
-         style="fill:url(#linearGradient5528-7-6);fill-opacity:1;stroke:#008700;stroke-width:0.16502121;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path4545-8-2-1-2-3"
+         d="m 538.80392,969.9521 c 2.64098,7.6989 -3.27174,12.12201 -8.34614,12.12201 -5.0744,0 -9.18803,-4.04449 -9.18803,-9.0336 0,-4.98913 4.11363,-9.03362 9.18803,-9.03362 3.67398,0 6.99475,2.15187 8.44351,5.4714"
+         style="fill:url(#linearGradient11121);fill-opacity:1;stroke:#008700;stroke-width:1.30979884;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="490"
+         inkscape:export-xdpi="490"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4866-1-1"
+         d="m 526.61272,975.75613 c -4.31662,-4.0763 7.90433,-10.13171 4.95655,-0.0586 1.21303,-2.25271 2.95663,-3.44429 4.43495,-3.57471"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="865.95496"
-         inkscape:export-xdpi="865.95496"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         transform="matrix(0.08195568,-0.16667399,0.17587696,0.08648089,14.657957,53.691299)"
-         sodipodi:open="true"
-         sodipodi:end="5.8778476"
-         sodipodi:start="0"
-         d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
-         sodipodi:ry="0.078125"
-         sodipodi:rx="0.0625"
-         sodipodi:cy="15.221559"
-         sodipodi:cx="41.859375"
-         id="path4556-7-3-7-6-0"
-         style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         sodipodi:type="arc" />
+         inkscape:export-ydpi="947.27002"
+         inkscape:export-xdpi="947.27002"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path7032-2-3"
+         d="m 542.62849,959.57942 2.63444,1.85179 c -2.63555,-0.70936 -4.71645,-0.0475 -6.06726,0.99322 l 3.45597,1.07229 -10.88798,4.76259 4.98006,-9.0484 0.88983,2.52626 c 1.37332,-1.3206 3.55133,-2.31326 4.99494,-2.15775 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
     </g>
-    <path
-       style="fill:url(#linearGradient4576);fill-opacity:1;stroke:#008700;stroke-width:0.17401762;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.5098038;stroke-dasharray:none"
-       d="m 27.048753,47.549875 c 0.260009,0.372599 0.09247,0.64742 -0.133103,0.769857 -0.225567,0.122438 -0.506015,0.04191 -0.626394,-0.179871 -0.12038,-0.221777 -0.03511,-0.500819 0.190462,-0.623256 0.16332,-0.08865 0.362852,-0.07312 0.507348,0.03949"
-       id="path4545-6-3-9-2-9-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/opacity_tween.png"
-       inkscape:export-xdpi="865.95496"
-       inkscape:export-ydpi="865.95496" />
-    <path
-       style="fill:url(#linearGradient4593);fill-opacity:1;stroke:#008700;stroke-width:0.17401762;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.31372549;stroke-dasharray:none"
-       d="m 26.583334,48.642285 c 0.260009,0.372599 0.09247,0.64742 -0.133103,0.769857 -0.225568,0.122438 -0.506015,0.04191 -0.626394,-0.179871 -0.120381,-0.221777 -0.03511,-0.500819 0.190462,-0.623256 0.16332,-0.08865 0.362852,-0.07312 0.507348,0.03949"
-       id="path4545-6-3-9-2-9-6-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/opacity_tween.png"
-       inkscape:export-xdpi="865.95496"
-       inkscape:export-ydpi="865.95496" />
-    <g
-       id="g4853"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/colouring_tween.png"
-       inkscape:export-xdpi="1061.2621"
-       inkscape:export-ydpi="1061.2621">
-      <g
-         id="g4839">
-        <path
-           style="fill:url(#linearGradient4851);fill-opacity:1;stroke:#e78700;stroke-width:0.17401762;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 30.75521,47.400097 c 0.260009,0.372599 0.09247,0.64742 -0.133103,0.769857 -0.225568,0.122438 -0.506015,0.04191 -0.626394,-0.179871 -0.120381,-0.221777 -0.03511,-0.500819 0.190462,-0.623256 0.16332,-0.08865 0.362852,-0.07312 0.507348,0.03949"
-           id="path4545-6-3-9-2-9-8"
+    <g
+       id="g9690"
+       transform="translate(6.2286603,-220.34571)">
+      <g
+         transform="translate(121.5,76)"
+         id="g9519">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 525.17752,781.30969 c 0.66343,0.84213 1.32694,1.6842 1.99042,2.52631 0.0255,-3.01115 2.72117,-6.55051 4.43089,-6.19326 l 1.04393,2.35463 6.46777,-6.87905 -10.25836,1.14833 1.68421,1.6842 c -2.11802,1.45455 -4.61882,3.59808 -5.35886,5.35884 z"
+           id="path7032-6"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssc"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-           inkscape:export-xdpi="865.95496"
-           inkscape:export-ydpi="865.95496" />
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export_frame.png"
+           inkscape:export-xdpi="715"
+           inkscape:export-ydpi="715" />
         <path
-           sodipodi:type="arc"
-           style="fill:none;stroke:#e78700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           id="path4556-7-3-7-6-0-9"
-           sodipodi:cx="41.859375"
-           sodipodi:cy="15.221559"
-           sodipodi:rx="0.0625"
-           sodipodi:ry="0.078125"
-           d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
-           sodipodi:start="0"
-           sodipodi:end="5.8778476"
-           sodipodi:open="true"
-           transform="matrix(0.17213591,-0.09343462,0.09859366,0.18164045,21.840868,48.46681)"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-           inkscape:export-xdpi="865.95496"
-           inkscape:export-ydpi="865.95496" />
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 518.43061,787.38052 -0.12131,-18.55575 26.5384,-0.35247 0.12131,1.96299 -24.8293,0.32964 0,14.63172 23.36471,-0.16486 -0.64985,-13.70322 2.13725,0.32964 0.36377,15.41231 z"
+           id="path4304-2-4-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export_frame.png"
+           inkscape:export-xdpi="715.30231"
+           inkscape:export-ydpi="715.30231" />
       </g>
+    </g>
+    <g
+       id="g9381"
+       transform="translate(9.9783692,-216.50533)">
+      <path
+         inkscape:export-ydpi="947.27002"
+         inkscape:export-xdpi="947.27002"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/video_gallery.png"
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0"
+         id="path4545-8-2-1-9"
+         d="m 446.04582,721.88118 c 1.97581,5.75979 -2.44768,9.06886 -6.244,9.06886 -3.79632,0 -6.87386,-3.02581 -6.87386,-6.75832 0,-3.73253 3.07754,-6.75833 6.87386,-6.75833 2.74862,0 5.23299,1.60988 6.31686,4.09333"
+         style="fill:url(#linearGradient11123);fill-opacity:1;stroke:#008700;stroke-width:0.97990197;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="947.27002"
+         inkscape:export-xdpi="947.27002"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/video_gallery.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path7034-3-6-6"
+         d="m 446.17235,723.45846 c -1.50696,4.42028 -10.95281,5.18039 -13.15419,1.02309"
+         style="fill:none;stroke:#008700;stroke-width:0.97990197;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g9387"
+       transform="translate(26.28323,-220.56044)">
+      <rect
+         inkscape:export-ydpi="947"
+         inkscape:export-xdpi="947"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
+         ry="0.15309671"
+         y="716.17627"
+         x="454.04117"
+         height="24.141113"
+         width="21.488243"
+         id="rect4017-2"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
+      <path
+         inkscape:export-ydpi="1220"
+         inkscape:export-xdpi="1220"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export_button.png"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4318-7-8-2-1-8-5"
+         d="m 460.47437,716.70688 0.26529,19.89652 1.81816,-0.18761 -0.34296,-19.70893 z m 1.98965,0 0.53058,19.89652 11.40734,-0.26528 -0.53058,-19.63124 z m 11.65653,0 0.60825,19.44365 1.79541,0.18761 -0.79587,-19.63123 z m -10.59538,1.59172 9.01976,0 0.26528,4.77517 -9.01975,0 z m 9.28504,5.83632 0.26529,4.77516 -9.01976,0.26529 -0.26528,-4.77517 z m -8.75447,6.1016 9.01976,0 0.26529,4.77516 -9.01976,0.26529 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9802"
+       transform="translate(136.57421,-276.58282)">
+      <path
+         inkscape:export-ydpi="977.38"
+         inkscape:export-xdpi="977.38"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/storyboard.png"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path5117-4"
+         d="m 491.39326,965.89226 0.84357,15.16018 17.01208,0.10043 1.68715,-16.76658 -18.55864,-0.10042 0.42175,1.30518 16.5903,-0.30119 -1.21838,14.49703 -14.45805,0.16113 -0.77328,-14.00562 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="977.38"
+         inkscape:export-xdpi="977.38"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/storyboard.png"
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path5121-8"
+         d="m 508.23211,966.02069 c -0.29823,0 -14.10089,0.34339 -14.10089,0.34339 l 1.07761,12.31721 11.87845,0.43609 0.0832,-1.91733 -2.87913,0.056 -1.14329,-0.56792 4.02241,-0.0204 0.26036,-2.75712 -11.43924,0.0238 -0.34508,-6.70713 12.50764,-0.37157 z"
+         style="fill:#008700;fill-opacity:0.45263157;stroke:none" />
+    </g>
+    <g
+       id="g9813"
+       transform="translate(163.6915,-314.60421)">
       <g
-         id="g4843">
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,452.19167)"
+         inkscape:export-ydpi="605.49915"
+         inkscape:export-xdpi="605.49915"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/zoom_in.png"
+         id="g4833">
         <g
-           id="g4641-1-8-4-5-6"
-           transform="matrix(0.86038431,0.60970836,-0.60970836,0.86038431,41.332613,-5.6341707)"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-           inkscape:export-xdpi="744.45654"
-           inkscape:export-ydpi="744.45654">
-          <path
-             inkscape:export-ydpi="865.95496"
-             inkscape:export-xdpi="865.95496"
-             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-             sodipodi:nodetypes="csssc"
-             inkscape:connector-curvature="0"
-             id="path4545-6-3-9-2-9-8-5"
-             d="m 20.970314,47.978259 c 0.40547,0.145726 0.426521,0.450225 0.319125,0.668636 -0.107395,0.218411 -0.368538,0.30987 -0.583278,0.204279 -0.214741,-0.10559 -0.301761,-0.368246 -0.194364,-0.586657 0.07776,-0.158135 0.240657,-0.255524 0.414197,-0.247626"
-             style="fill:url(#linearGradient4729);fill-opacity:1;stroke:#008700;stroke-width:0.16502121;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+           id="g4829">
           <path
-             inkscape:export-ydpi="865.95496"
-             inkscape:export-xdpi="865.95496"
-             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-             transform="matrix(0.08195568,-0.16667399,0.17587696,0.08648089,14.657957,53.691299)"
+             inkscape:export-ydpi="478.02069"
+             inkscape:export-xdpi="478.02069"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+             transform="matrix(-0.57644731,1.1260375,-0.94671434,-0.48464724,75.219421,70.784036)"
              sodipodi:open="true"
-             sodipodi:end="5.8778476"
+             sodipodi:end="6.2756908"
              sodipodi:start="0"
-             d="m 41.921875,15.221559 c 0,0.04315 -0.02798,0.07813 -0.0625,0.07813 -0.03452,0 -0.0625,-0.03498 -0.0625,-0.07813 0,-0.04315 0.02798,-0.07813 0.0625,-0.07813 0.02499,0 0.04758,0.01861 0.05744,0.04732"
-             sodipodi:ry="0.078125"
-             sodipodi:rx="0.0625"
-             sodipodi:cy="15.221559"
-             sodipodi:cx="41.859375"
-             id="path4556-7-3-7-6-0-9-7"
-             style="fill:none;stroke:#008700;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+             d="m 2.453125,12.471557 c 0,1.044163 -0.6785684,1.890625 -1.515625,1.890625 -0.83705657,0 -1.515625,-0.846462 -1.515625,-1.890625 0,-1.044164 0.67856843,-1.890625 1.515625,-1.890625 0.8326241,0 1.5093424,0.83785 1.5155824,1.876455"
+             sodipodi:ry="1.890625"
+             sodipodi:rx="1.515625"
+             sodipodi:cy="12.471557"
+             sodipodi:cx="0.9375"
+             id="path4227-3"
+             style="fill:url(#linearGradient11125);fill-opacity:1;stroke:#008700;stroke-width:0.48670816;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              sodipodi:type="arc" />
-        </g>
-        <g
-           id="g4835">
-          <path
-             inkscape:export-ydpi="865.95496"
-             inkscape:export-xdpi="865.95496"
-             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-             sodipodi:nodetypes="csssc"
-             inkscape:connector-curvature="0"
-             id="path4545-6-3-9-2-9-8-5-5"
-             d="m 31.388022,48.431347 c 0.260009,0.372599 0.09247,0.64742 -0.133103,0.769857 -0.225568,0.122438 -0.506015,0.04191 -0.626394,-0.179871 -0.120381,-0.221777 -0.03511,-0.500819 0.190462,-0.623256 0.16332,-0.08865 0.362852,-0.07312 0.507348,0.03949"
-             style="fill:url(#linearGradient4747);fill-opacity:1;stroke:#00a3d2;stroke-width:0.17401762000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:export-ydpi="865.95496"
-             inkscape:export-xdpi="865.95496"
-             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-             transform="matrix(0.17213591,-0.09343462,0.09859366,0.18164045,22.47368,49.49806)"
+             inkscape:export-ydpi="478"
+             inkscape:export-xdpi="478"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+             transform="matrix(1.0132796,0,0,1.0132796,59.545505,50.986748)"
              sodipodi:open="true"
              sodipodi:end="5.8778476"
              sodipodi:start="0"
-             d="m 41.921875,15.221559 a 0.0625,0.078125 0 1 1 -0.0051,-0.03081"
-             sodipodi:ry="0.078125"
-             sodipodi:rx="0.0625"
-             sodipodi:cy="15.221559"
-             sodipodi:cx="41.859375"
-             id="path4556-7-3-7-6-0-9-7-1"
-             style="fill:none;stroke:#00a3d2;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+             d="m 3.7786019,14.218942 c 0,0.475951 -0.3660485,0.861786 -0.8175922,0.861786 -0.4515437,0 -0.8175922,-0.385835 -0.8175922,-0.861786 0,-0.475952 0.3660485,-0.861787 0.8175922,-0.861787 0.3269274,0 0.6224252,0.205283 0.7513422,0.521959"
+             sodipodi:ry="0.86178637"
+             sodipodi:rx="0.8175922"
+             sodipodi:cy="14.218942"
+             sodipodi:cx="2.9610097"
+             id="path4243-2"
+             style="fill:#ffffff;fill-opacity:0.50480772;stroke:none"
              sodipodi:type="arc" />
         </g>
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 63.163277,64.535453 -0.723398,-0.128446 0.161496,1.155728 -0.912199,-0.227134 -0.09404,0.785062 1.141453,-0.102193 -0.231502,1.052435 0.940776,0.07905 -0.265113,-1.130076 0.899603,0.108275 0.06915,-0.812328 -1.021272,0.195932 z"
+           id="path4153-6-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/plus_sign.png"
+           inkscape:export-xdpi="605.49915"
+           inkscape:export-ydpi="605.49915" />
       </g>
     </g>
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
-       d="m 35.102191,48.521377 c -1.581117,1.210518 -1.914115,0.01271 -1.530268,-0.681384 0.181818,-0.328773 0.740343,-0.308741 0.663553,0.205865 -0.102786,0.688817 -2.133239,0.41951 -1.370374,-1.010832"
-       id="path4630-2-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/compound_tween.png"
-       inkscape:export-xdpi="1058.8235"
-       inkscape:export-ydpi="1058.8235" />
-    <path
-       style="fill:#30aa00;fill-opacity:1;stroke:#008700;stroke-width:0.13084352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 35.851925,47.926324 c 0.09239,0.328894 -0.09458,0.482553 -0.285033,0.513658 -0.190455,0.03111 -0.369642,-0.09548 -0.400224,-0.282733 -0.03058,-0.187255 0.09902,-0.364271 0.289476,-0.395376 0.137894,-0.02252 0.275721,0.03789 0.350446,0.153598"
-       id="path4545-6-8-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/motion.png"
-       inkscape:export-xdpi="1014.0845"
-       inkscape:export-ydpi="1014.0845" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 4.647586,52.984755 c 0,0.212854 -0.08385,0.405557 -0.2194186,0.545047 -0.06778,0.06974 -0.148497,0.126186 -0.238123,0.165191 -0.04482,0.01951 -0.09185,0.03465 -0.140621,0.04491 -0.04876,0.01027 -0.09499,0.05147 -0.146705,0.05147 -0.05172,0 -0.106483,-0.04124 -0.15525,-0.05147 -0.04876,-0.01027 -0.09581,-0.02542 -0.140622,-0.04491 -0.08962,-0.03901 -0.170338,-0.09545 -0.238122,-0.165191 -0.135568,-0.13949 -0.219418,-0.332193 -0.219418,-0.545047 0,-0.212854 0.05683,-0.438265 0.219418,-0.545047 0.123023,-0.0808 0.275753,-0.157247 0.315661,-0.279116 0.01002,-0.303451 -0.210573,-0.339814 -0.465515,-0.298473 0.300355,-0.242903 0.559378,0.146818 0.589239,0.299435 0.01757,0.08979 0.01076,-0.623923 0.354286,-0.668833 -0.358092,0.207193 -0.248324,0.710261 -0.211871,0.658446 0.0729,-0.103629 0.41846,-0.447613 0.6270706,-0.250804 -0.3601286,-0.09278 -0.4614476,0.234855 -0.4407006,0.27909 0.06752,0.143959 0.195866,0.184986 0.291271,0.260255 0.1527106,0.12048 0.2194206,0.332193 0.2194206,0.545047 z"
-       id="path16134"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssssssssssccscscsss"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/onion.png"
-       inkscape:export-xdpi="1501.7224"
-       inkscape:export-ydpi="1501.7224" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient16179);fill-opacity:1;stroke:#009100;stroke-width:0.0904228;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path16171"
-       sodipodi:cx="42.570312"
-       sodipodi:cy="47.877808"
-       sodipodi:rx="0.7890625"
-       sodipodi:ry="0.78125"
-       d="m 43.359375,47.877808 a 0.7890625,0.78125 0 1 1 -1.578125,0 0.7890625,0.78125 0 1 1 1.578125,0 z"
-       transform="matrix(1.1053889,0,0,1.1064428,-40.952388,-0.14289909)"
-       inkscape:export-filename="/home/user/tupi/src/themes/default/icons/onion_big.png"
-       inkscape:export-xdpi="1929.9399"
-       inkscape:export-ydpi="1929.9399" />
     <g
-       id="g5639"
-       transform="translate(-0.28726213,0.08838835)">
-      <path
-         inkscape:export-ydpi="390.52463"
-         inkscape:export-xdpi="390.52463"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/warning_message.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4441-5-6"
-         d="m 38.177915,48.524548 0.367436,-0.775241 -0.659531,-0.0017 -0.384297,0.781034 z"
-         style="fill:none;stroke:#008700;stroke-width:0.1856636;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:export-ydpi="744.45654"
-         inkscape:export-xdpi="744.45654"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-9"
-         d="m 37.443552,47.063228 0.01604,0.199667 0.459394,-0.01072 -0.09488,0.271885 0.779216,-0.339303 -0.77533,-0.364961 0.07645,0.278555 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="744.45654"
-         inkscape:export-xdpi="744.45654"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotation.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-9-9"
-         d="m 38.603322,48.99565 -0.01604,0.199667 -0.459394,-0.01072 0.09488,0.271885 -0.779216,-0.339303 0.77533,-0.364961 -0.07645,0.278555 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-    </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 40.458876,47.422395 0.107801,-0.267159 -0.767475,0.346791 0.763776,0.346793 -0.105927,-0.261914 0.856491,3.29e-4 -0.09488,0.271885 0.779216,-0.339303 -0.77533,-0.364961 0.103794,0.274649 z"
-       id="path7032-6-3-6-0-9-9-97"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/horizontal_flip.png"
-       inkscape:export-xdpi="1023.34"
-       inkscape:export-ydpi="1023.34" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 43.372786,47.256365 0.267159,0.107801 -0.346791,-0.767475 -0.346793,0.763776 0.261914,-0.105927 -3.29e-4,0.856491 -0.271885,-0.09488 0.339303,0.779216 0.364961,-0.77533 -0.274649,0.103794 z"
-       id="path7032-6-3-6-0-9-9-97-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/vertical_flip.png"
-       inkscape:export-xdpi="1023.34"
-       inkscape:export-ydpi="1023.34" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 45.760538,47.418502 0.131928,0.256105 0.238558,-0.807695 -0.761411,0.351956 0.267529,0.09082 -0.559573,0.648426 -0.143944,-0.249407 -0.251897,0.811697 0.782715,-0.348842 -0.27578,-0.100751 z"
-       id="path7032-6-3-6-0-9-9-97-7-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/crossed_flip.png"
-       inkscape:export-xdpi="979.73792"
-       inkscape:export-ydpi="979.73792" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 51.744119,47.499505 0.983321,-1.160097 2.430679,-0.972271 -0.287263,2.386485 -0.893821,1.159312 -0.365712,-0.07655 0.917029,-1.126952 0.358129,-1.927023 -1.861516,0.693377 -1.137215,1.366228 z"
-       id="path3266-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil.png"
-       inkscape:export-xdpi="634.53595"
-       inkscape:export-ydpi="634.53595" />
-    <path
-       style="fill:url(#linearGradient4044-6);fill-opacity:1;stroke:none"
-       d="m 52.749536,46.670865 0.740253,0.154679 0,0.574525 0.751301,-0.15468 0.06629,0.441942 0.464039,0.04419 -0.872835,1.104854 -0.751798,-0.106173 0.002,-0.38636 -0.51414,0.07493 -0.769007,-0.753545 z"
-       id="path4036-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil.png"
-       inkscape:export-xdpi="634.53595"
-       inkscape:export-ydpi="634.53595" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 52.650099,46.626671 0.850738,0.198873 0,0.552428 0.707107,-0.132583 0.07734,0.508233 0.364602,0"
-       id="path4046-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil.png"
-       inkscape:export-xdpi="634.53595"
-       inkscape:export-ydpi="634.53595" />
-    <path
-       style="fill:#006000;fill-opacity:1;stroke:none"
-       d="m 54.247883,45.900535 c -0.03906,0.223958 0.414062,0.541667 0.632812,0.4375 0.04427,-0.255208 0.08854,-0.510416 0.132813,-0.765625 -0.255208,0.109375 -0.510417,0.21875 -0.765625,0.328125 z"
-       id="path4050-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/pencil.png"
-       inkscape:export-xdpi="634.53595"
-       inkscape:export-ydpi="634.53595" />
-    <g
-       id="g5220"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink_big.png"
-       inkscape:export-xdpi="810.41998"
-       inkscape:export-ydpi="810.41998">
-      <path
-         inkscape:export-ydpi="570.75616"
-         inkscape:export-xdpi="570.75616"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-         transform="matrix(-0.93915373,-0.34349714,0.34349714,-0.93915373,98.08148,109.86289)"
-         sodipodi:end="7.0222889"
-         sodipodi:start="0.74194727"
-         d="m 58.856256,46.591095 a 0.546875,0.546875 0 1 1 0.001,-0.0011 l -0.40418,-0.368389 z"
-         sodipodi:ry="0.546875"
-         sodipodi:rx="0.546875"
-         sodipodi:cy="46.221558"
-         sodipodi:cx="58.453125"
-         id="path6058"
-         style="fill:#008700;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+       id="g9822"
+       transform="translate(-590.08414,-257.14657)">
       <path
-         inkscape:export-ydpi="570.75616"
-         inkscape:export-xdpi="570.75616"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-         transform="matrix(-0.43941489,0.89828423,-0.89828423,-0.43941489,127.81451,16.503644)"
+         inkscape:export-ydpi="797.97998"
+         inkscape:export-xdpi="797.97998"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/zoom_in_big.png"
+         transform="matrix(-4.8935666,9.5591382,-8.0368311,-4.114259,729.93878,1058.1624)"
          sodipodi:open="true"
-         sodipodi:end="6.273489"
-         sodipodi:start="0.74194727"
-         d="m 59.735548,49.247373 a 1.125,1.125 0 1 1 0.295649,-0.771099"
-         sodipodi:ry="1.125"
-         sodipodi:rx="1.125"
-         sodipodi:cy="48.487183"
-         sodipodi:cx="58.90625"
-         id="path6060"
-         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:end="6.2756908"
+         sodipodi:start="0"
+         d="m 2.453125,12.471557 c 0,1.044163 -0.6785684,1.890625 -1.515625,1.890625 -0.83705657,0 -1.515625,-0.846462 -1.515625,-1.890625 0,-1.044164 0.67856843,-1.890625 1.515625,-1.890625 0.8326241,0 1.5093424,0.83785 1.5155824,1.876455"
+         sodipodi:ry="1.890625"
+         sodipodi:rx="1.515625"
+         sodipodi:cy="12.471557"
+         sodipodi:cx="0.9375"
+         id="path4227-3-80"
+         style="fill:none;stroke:#008700;stroke-width:0.48670816;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          sodipodi:type="arc" />
       <path
-         inkscape:export-ydpi="570.75616"
-         inkscape:export-xdpi="570.75616"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-         sodipodi:open="true"
-         sodipodi:end="7.0080184"
-         sodipodi:start="0.74194727"
-         d="m 58.856256,46.591095 a 0.546875,0.546875 0 1 1 0.0063,-0.007"
-         sodipodi:ry="0.546875"
-         sodipodi:rx="0.546875"
-         sodipodi:cy="46.221558"
-         sodipodi:cx="58.453125"
-         id="path6058-1"
-         style="fill:#008700;fill-opacity:1;stroke:none"
-         sodipodi:type="arc"
-         transform="matrix(-0.86429237,-1.2434029,1.2434029,-0.86429237,53.121774,160.08786)" />
-      <path
-         inkscape:export-ydpi="570.75616"
-         inkscape:export-xdpi="570.75616"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-         sodipodi:nodetypes="ccccccccccccccc"
+         inkscape:export-ydpi="797.97998"
+         inkscape:export-xdpi="797.97998"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/zoom_in_big.png"
+         sodipodi:nodetypes="ccccccccccccc"
          inkscape:connector-curvature="0"
-         id="path6080"
-         d="m 60.17061,47.549549 0.937378,-0.433043 -0.815346,0.433835 1.399149,0.830212 -1.428363,-0.644344 0.174246,0.7581 -0.335975,-0.807164 c 0,0 0.09744,0.07384 -0.652327,-0.383439 0.703356,0.261475 0.543154,0.25069 0.49353,0.19035 -0.04963,-0.06034 -0.171656,-0.991042 -0.171656,-0.991042 l 0.286869,0.60424 0.119018,-1.027394 0.02942,1.119839 0.867658,-1.038113 z"
+         id="path4153-6-8-8"
+         d="m 627.07553,1007.4552 -4.86385,-0.8636 1.08584,7.7707 -6.13329,-1.5272 -0.63227,5.2785 7.6747,-0.6872 -1.55653,7.0762 6.32543,0.5315 -1.78253,-7.5982 6.0486,0.7281 0.46496,-5.4618 -6.86666,1.3173 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g9831"
+       transform="translate(-530.14336,-299.14293)">
+      <g
+         id="g9826">
+        <g
+           id="g4850"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/zoom_out_big.png"
+           inkscape:export-xdpi="797.97998"
+           inkscape:export-ydpi="797.97998"
+           transform="matrix(8.4891828,0,0,8.4891828,19.368477,452.19167)">
+          <path
+             inkscape:export-ydpi="478.02069"
+             inkscape:export-xdpi="478.02069"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
+             transform="matrix(-0.57644731,1.1260375,-0.94671434,-0.48464724,83.676817,76.328558)"
+             sodipodi:open="true"
+             sodipodi:end="6.2756908"
+             sodipodi:start="0"
+             d="m 2.453125,12.471557 c 0,1.044163 -0.6785684,1.890625 -1.515625,1.890625 -0.83705657,0 -1.515625,-0.846462 -1.515625,-1.890625 0,-1.044164 0.67856843,-1.890625 1.515625,-1.890625 0.8326241,0 1.5093424,0.83785 1.5155824,1.876455"
+             sodipodi:ry="1.890625"
+             sodipodi:rx="1.515625"
+             sodipodi:cy="12.471557"
+             sodipodi:cx="0.9375"
+             id="path4227-3-80-5"
+             style="fill:none;stroke:#008700;stroke-width:0.48670816;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             inkscape:export-ydpi="605.49915"
+             inkscape:export-xdpi="605.49915"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/plus_sign.png"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4153-6-8-8-5"
+             d="m 70.407942,71.05164 -0.0901,0.559287 1.968349,0.0059 0.05477,-0.643382 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8727"
+       transform="translate(4.6075601,-152.10116)">
+      <g
+         transform="matrix(-7.3396059,0,0,8.4891828,614.38767,241.20422)"
+         inkscape:export-ydpi="1008"
+         inkscape:export-xdpi="1008"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
+         id="g4401-5-6">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
+           id="path4387-9-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc" />
+        <path
+           style="fill:#008700;fill-opacity:0.3942308;stroke:none"
+           d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
+           id="path4389-7-8"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
+           d="M 1.2805659,9.2180855 3.825795,10.520916"
+           id="path4399-2-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+      </g>
       <path
-         inkscape:export-ydpi="570.75616"
-         inkscape:export-xdpi="570.75616"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-         transform="matrix(-0.68842183,-0.2517915,0.2517915,-0.68842183,88.65498,95.457078)"
-         sodipodi:end="7.0222889"
-         sodipodi:start="0.74194727"
-         d="m 58.856256,46.591095 a 0.546875,0.546875 0 1 1 0.001,-0.0011 l -0.40418,-0.368389 z"
-         sodipodi:ry="0.546875"
-         sodipodi:rx="0.546875"
-         sodipodi:cy="46.221558"
-         sodipodi:cx="58.453125"
-         id="path6058-5"
-         style="fill:#008700;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:export-ydpi="570.75616"
-         inkscape:export-xdpi="570.75616"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-         transform="matrix(-0.30260344,-0.11067774,0.11067774,-0.30260344,73.676207,66.176901)"
-         sodipodi:end="7.0222889"
-         sodipodi:start="0.74194727"
-         d="m 58.856256,46.591095 a 0.546875,0.546875 0 1 1 0.001,-0.0011 l -0.40418,-0.368389 z"
-         sodipodi:ry="0.546875"
-         sodipodi:rx="0.546875"
-         sodipodi:cy="46.221558"
-         sodipodi:cx="58.453125"
-         id="path6058-5-1"
-         style="fill:#008700;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:export-ydpi="570.75616"
-         inkscape:export-xdpi="570.75616"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-         sodipodi:nodetypes="ccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path6080-0"
-         d="m 58.898626,46.479307 -1.317068,0.389016 1.378687,-0.318792 -0.03058,1.417171 0.150611,-1.448486 0.847251,1.349038 -0.730459,-1.512743 0.588037,-0.643513 -0.658501,0.568868 -0.0025,-1.159662 -0.09202,1.167312 -0.765348,-1.191071 0.649009,1.23495 -1.028724,-0.350402 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         inkscape:export-ydpi="1008"
+         inkscape:export-xdpi="1008"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
+         sodipodi:nodetypes="ccccc"
+         style="fill:#ffffff;fill-opacity:0;stroke:none"
+         d="m 608.67571,317.23277 -26.13077,0 -0.0662,21.22296 26.19708,-0.39789 z"
+         id="rect4472-8-6"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g8758"
+       transform="translate(24.503789,-152.10116)">
+      <g
+         id="g8751">
+        <g
+           id="g4714-1"
+           transform="matrix(8.4891828,0,0,8.4891828,560.03649,239.14826)">
+          <rect
+             inkscape:export-ydpi="900"
+             inkscape:export-xdpi="900"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
+             transform="scale(-1,1)"
+             y="9.1746817"
+             x="-11.546796"
+             height="2.546875"
+             width="2.8125"
+             id="rect4472-8-7-3"
+             style="fill:#ffffff;fill-opacity:0;stroke:none" />
+          <g
+             inkscape:export-ydpi="900"
+             inkscape:export-xdpi="900"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
+             id="g4586-2">
+            <path
+               style="fill:url(#linearGradient11127);fill-opacity:1;stroke:none"
+               d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+               id="path4576-1"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:#008700;fill-opacity:1;stroke:none"
+               d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.56088,0.0073 0.07364,0.9981615 -1.0868434,0.04956 0.017018,-1.0805781 1.5655594,-0.051051 z"
+               id="path4574-5"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccccccccc" />
+          </g>
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8766"
+       transform="translate(33.410785,-152.10117)">
+      <g
+         inkscape:export-ydpi="977.44684"
+         inkscape:export-xdpi="977.44684"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ff_big.png"
+         id="g4720-9"
+         transform="matrix(8.4891828,0,0,8.4891828,545.40477,239.37607)">
+        <g
+           transform="matrix(0.33765768,0,0,1,10.445758,-0.00244945)"
+           id="g4586-3-9"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4576-9-1"
+             d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+             style="fill:url(#linearGradient11129);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4574-3-4"
+             d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.769116,0.0073 0.07364,0.9981615 -0.6935087,0.03393 0.017018,-1.0805781 1.3804607,-0.035426 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           transform="matrix(0.30793803,0,0,1,11.526216,-0.05122005)"
+           id="g4586-3-5-9"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4576-9-9-1"
+             d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+             style="fill:url(#linearGradient11131);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4574-3-5-0"
+             d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.814584,0.030738 0.07364,0.9981625 -0.6555468,0.0105 0.017018,-1.0805786 1.3879668,-0.035426 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g4436-4-75"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176"
+           transform="matrix(0.81929493,0,0,0.81929493,13.891593,1.9839848)">
+          <g
+             transform="matrix(0.86458333,0,0,1,0.54589844,0)"
+             inkscape:export-ydpi="799"
+             inkscape:export-xdpi="799"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
+             id="g4401-52-8">
+            <path
+               style="fill:#008700;fill-opacity:1;stroke:none"
+               d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
+               id="path4387-2-7"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccccccccc" />
+            <path
+               style="fill:#008700;fill-opacity:0.3942308;stroke:none"
+               d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
+               id="path4389-0-0"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
+               d="m 1.1269514,11.335273 2.662699,-0.806544"
+               id="path4399-0-4"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+          </g>
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8713"
+       transform="translate(-5.4442485,-152.10117)">
+      <g
+         inkscape:export-ydpi="977.44684"
+         inkscape:export-xdpi="977.44684"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rw_big.png"
+         id="g4720-8-8"
+         transform="matrix(-8.4891828,0,0,8.4891828,696.27818,239.37607)">
+        <g
+           transform="matrix(0.33765768,0,0,1,10.445758,-0.00244945)"
+           id="g4586-3-8-0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4576-9-7-4"
+             d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+             style="fill:url(#linearGradient11133);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4574-3-2-2"
+             d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.769116,0.0073 0.07364,0.9981615 -0.6935087,0.03393 0.017018,-1.0805781 1.3804607,-0.035426 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           transform="matrix(0.30793803,0,0,1,11.526216,-0.05122005)"
+           id="g4586-3-5-2-9"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4576-9-9-4-6"
+             d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+             style="fill:url(#linearGradient11135);fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4574-3-5-9-1"
+             d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.814584,0.030738 0.07364,0.9981625 -0.6555468,0.0105 0.017018,-1.0805786 1.3879668,-0.035426 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g4436-4-7-0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+           inkscape:export-xdpi="1018.1176"
+           inkscape:export-ydpi="1018.1176"
+           transform="matrix(0.81929493,0,0,0.81929493,13.891593,1.9839848)">
+          <g
+             transform="matrix(0.86458333,0,0,1,0.54589844,0)"
+             inkscape:export-ydpi="799"
+             inkscape:export-xdpi="799"
+             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
+             id="g4401-52-7-4">
+            <path
+               style="fill:#008700;fill-opacity:1;stroke:none"
+               d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
+               id="path4387-2-9-2"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccccccccc" />
+            <path
+               style="fill:#008700;fill-opacity:0.3942308;stroke:none"
+               d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
+               id="path4389-0-2-2"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
+               d="m 1.1269514,11.335273 2.662699,-0.806544"
+               id="path4399-0-0-2"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+          </g>
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8742"
+       transform="translate(13.277136,-152.10116)">
+      <g
+         id="g8734">
+        <g
+           id="g7224"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
+           inkscape:export-xdpi="960"
+           inkscape:export-ydpi="960"
+           transform="matrix(8.4891828,0,0,8.4891828,11.742608,225.01198)">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4389-9"
+             d="m 70.998868,11.519096 0.02866,1.381068 1.700325,-0.596622 z"
+             style="fill:#73aec8;fill-opacity:0.50678735;stroke:none" />
+          <path
+             sodipodi:nodetypes="ccccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4387-5"
+             d="m 70.870401,10.957865 c -0.02934,-0.03151 -0.05867,-0.06302 -0.08801,-0.09454 0,0.833334 0,1.666668 0,2.500001 0.864583,-0.302083 1.729166,-0.604167 2.59375,-0.90625 -0.797772,-0.476039 -1.595544,-0.952079 -2.393315,-1.428118 -0.04062,0.05305 -0.08124,0.106107 -0.121863,0.15916 0.02377,0.126264 0.04754,0.252528 0.0713,0.378792 0.472393,0.220646 0.944787,0.441292 1.417181,0.661938 -0.396267,0.159409 -0.670953,0.279756 -1.06722,0.439165 -0.0101,0.0079 -0.145124,-1.319915 -0.145124,-1.319915 -0.05963,-0.130078 -0.207067,-0.260155 -0.266699,-0.390233 z"
+             style="fill:#00a2da;fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4399-4"
+             d="M 70.865134,13.242669 73.16726,12.436125"
+             style="fill:none;stroke:#ffffff;stroke-width:0.09298298;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
+          <rect
+             y="10.839892"
+             x="70.563644"
+             height="2.546875"
+             width="2.8125"
+             id="rect4472-9"
+             style="fill:#ffffff;fill-opacity:0;stroke:none" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4399-4-8"
+             d="m 71.327383,12.721865 1.042592,-0.430894"
+             style="fill:none;stroke:#ffffff;stroke-width:0.09298298;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8975"
+       transform="translate(47.760343,-174.53944)">
+      <rect
+         inkscape:export-ydpi="900"
+         inkscape:export-xdpi="900"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
+         transform="scale(-1,1)"
+         y="400.78232"
+         x="-578.8587"
+         height="21.620888"
+         width="23.875826"
+         id="rect4472-8-7-3-5"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
       <path
-         inkscape:export-ydpi="570.75616"
-         inkscape:export-xdpi="570.75616"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-         sodipodi:nodetypes="ccccccccccccccc"
+         sodipodi:nodetypes="cccccccccccccccccccccccc"
          inkscape:connector-curvature="0"
-         id="path6080-0-7"
-         d="m 60.001786,48.926275 -0.500057,-0.190457 0.541362,0.143383 0.03419,-0.535908 0.04627,0.5569 0.612131,-0.329776 -0.533842,0.439512 0.394178,0.431365 -0.441412,-0.381328 -0.0017,0.777355 -0.06168,-0.782483 -0.40255,0.544293 0.324564,-0.573707 -0.689583,0.234885 z"
+         id="path4574-5-5"
+         d="m 594.24614,395.61818 -14.9342,5.48038 -11.04126,0.0781 8.14321,-2.90056 11.55274,-0.19295 6.40648,-2.33633 c -0.42921,-0.0221 -17.95818,-0.0875 -18.38742,-0.10993 l -14.66543,5.25471 -4.35228,16.27271 0.8395,1.01386 26.23782,0.218 -1.14077,-4.94508 -2.06927,-8.6591 -4.89406,-0.86654 2.71136,10.0653 -16.14663,-0.10985 2.06782,-9.70379 16.32065,-0.0841 11.28768,-4.32863 3.17768,8.10951 -12.69531,5.5803 1.38669,4.90669 15.26365,-8.50184 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
     </g>
     <g
-       id="g4789"
-       transform="matrix(0.98233356,0.18713838,-0.18713838,0.98233356,15.975884,-11.139731)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22">
+       id="g8561"
+       transform="translate(1.628391,-178.07557)">
       <g
-         inkscape:export-ydpi="689.76874"
-         inkscape:export-xdpi="689.76874"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_properties.png"
-         transform="matrix(0.49178238,-0.53611773,0.32699789,0.29995613,15.668721,48.446876)"
-         id="g3745-7">
+         inkscape:export-ydpi="736.59003"
+         inkscape:export-xdpi="736.59003"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+         id="g5236-0"
+         transform="matrix(-5.1400007,6.7562281,-6.7562281,-5.1400007,816.88247,48.73756)">
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 19.817332,49.812189 c -0.02585,0.10822 -0.05169,0.216439 -0.07754,0.324659 l 2.26123,-0.972902 1.76633,0.65813 c -0.0037,-0.09366 -0.0074,-0.187322 -0.01112,-0.280983 l -1.722,-0.679968 z"
-           id="path4558-1-8"
+           d="M 42.140214,6.7965104 41.096336,6.5417208 41.229606,7.7484091 42.484654,7.5995063 42.266616,7.301418 41.502271,7.4346763 41.402792,7.017865 42.238932,7.109192 z"
+           id="path4350-5"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
-           inkscape:export-xdpi="712.18268"
-           inkscape:export-ydpi="712.18268" />
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
         <path
-           style="fill:#ffffff;fill-opacity:0.17307691;stroke:none"
-           d="m 19.793278,49.921933 c -0.0052,0.03047 -0.0104,0.06093 -0.0156,0.0914 l 2.257612,-0.949032 1.717102,0.657345 c 0.0022,-0.03253 0.0044,-0.06506 0.0066,-0.09759 L 22.04636,48.969801 z"
-           id="path4558-0-1-5"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 41.218515,7.7809647 c 0.05954,-0.1151733 0.04532,-0.5732844 -0.0103,-0.9705059 C 41.064512,5.919346 40.386246,6.3888145 40.04495,6.4021871 c -0.431697,-0.028427 0.0081,-1.1549823 -0.0615,-1.5055589 -0.148936,0.2997617 -0.639902,0.7059498 -0.657937,1.0325403 -0.252944,0.7792545 -0.03399,1.7892681 0.372616,2.0762826 0.406616,0.2870147 1.202493,0.3349163 1.520354,-0.2244814 z"
+           id="path4352-7"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
-           inkscape:export-xdpi="712.18268"
-           inkscape:export-ydpi="712.18268" />
-      </g>
-      <g
-         inkscape:export-ydpi="689.76874"
-         inkscape:export-xdpi="689.76874"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_properties.png"
-         transform="matrix(0.39613974,-0.61020114,0.37218408,0.24162017,16.242753,53.650433)"
-         id="g3745-7-5">
+           sodipodi:nodetypes="ccccczc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
         <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 19.98319,49.261571 -0.08018,0.329995 2.152102,-0.677333 1.682848,0.715063 0.02858,-0.303301 -1.657048,-0.72841 z"
-           id="path4558-1-8-4"
+           style="fill:#ffffff;fill-opacity:0.47058824;stroke:none"
+           d="m 39.636532,6.7186813 c 0.0462,0.7665583 0.590039,0.4550748 0.883299,0.1166901 0.388395,-0.1370162 0.687126,1.0741156 0.03376,1.1784466 -0.159485,0.081196 -0.539285,-0.1136201 -0.742394,-0.3328225 -0.05079,-0.054806 0.39559,0.3442611 0.723802,-0.056815 -0.42545,0.1313461 -0.881874,-0.056526 -0.944807,-0.3554733 -0.03442,-0.1634874 -0.03034,-0.3485938 0.04633,-0.5500258 z"
+           id="path4354-7"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
-           inkscape:export-xdpi="712.18268"
-           inkscape:export-ydpi="712.18268" />
+           sodipodi:nodetypes="cccscsc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
         <path
-           style="fill:#ffffff;fill-opacity:0.17307691;stroke:none"
-           d="m 19.96496,49.347319 c -0.01176,0.03966 -0.02351,0.07933 -0.03527,0.118995 l 2.165699,-0.64942 1.653958,0.70627 c 0.0034,-0.03752 0.0069,-0.07505 0.01029,-0.112568 l -1.641468,-0.709483 z"
-           id="path4558-0-1-5-0"
+           style="fill:none;stroke:#008700;stroke-width:0.16613059;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 41.808079,6.854845 c -0.0091,0.2233194 0.09177,0.5475912 0.238617,0.6974905"
+           id="path4364-7"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
-           inkscape:export-xdpi="712.18268"
-           inkscape:export-ydpi="712.18268" />
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
+           inkscape:export-xdpi="1126.7192"
+           inkscape:export-ydpi="1126.7192" />
       </g>
-      <path
-         inkscape:export-ydpi="712.18268"
-         inkscape:export-xdpi="712.18268"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/line.png"
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path4558-1-8-4-5"
-         d="m 42.034813,53.203744 c 0.0072,0.01247 0.0144,0.02493 0.0216,0.0374 l 0.808378,-1.553055 1.003243,-0.825365 c -0.01188,-0.01406 -0.02377,-0.02813 -0.03565,-0.04219 l -0.996218,0.82776 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3983"
-         d="m 42.131603,52.209046 -0.03277,0.919794 0.698217,-0.511565 z"
-         style="fill:none;stroke:#009000;stroke-width:0.03;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.77542372;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3983-8"
-         d="M 42.57023,51.375888 42.48098,52.4217 43.099593,51.905788 z"
-         style="fill:none;stroke:#009000;stroke-width:0.03;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.77542372;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3983-8-5"
-         d="m 43.371878,50.83422 -0.500693,0.819293 0.856407,-0.31096 z"
-         style="fill:none;stroke:#009000;stroke-width:0.03;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.77542372;stroke-dasharray:none" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(1.3076923,0,0,1.375,-14.604961,-18.340925)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050-7"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(1.3076923,0,0,1.375,-14.135817,-18.950685)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050-5"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(1.3076923,0,0,1.375,-13.591278,-19.629309)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050-6"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(1.3076923,0,0,1.375,-12.819573,-20.054488)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050-5-8"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(2.2983683,0,0,2.4166667,-60.84497,-70.957104)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050-5-8-4"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(2.2983683,0,0,2.4166667,-60.360122,-70.22859)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050-5-8-1"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(2.2983683,0,0,2.4166667,-59.946059,-71.353589)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050-5-8-1-5"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(2.2983683,0,0,2.4166667,-59.633559,-70.658277)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050-5-8-1-5-6"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(2.2983683,0,0,2.4166667,-60.774184,-69.603589)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       id="path7050-5-8-1-5-6-9"
-       sodipodi:cx="47.421875"
-       sodipodi:cy="48.91687"
-       sodipodi:rx="0.05078125"
-       sodipodi:ry="0.046875"
-       d="m 47.472656,48.91687 a 0.05078125,0.046875 0 1 1 -2e-6,-4.03e-4"
-       sodipodi:start="0"
-       sodipodi:end="6.2745801"
-       sodipodi:open="true"
-       transform="matrix(2.2983683,0,0,2.4166667,-61.438247,-70.220776)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/scheme.png"
-       inkscape:export-xdpi="1020.22"
-       inkscape:export-ydpi="1020.22" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 8.375368,52.379305 0.01604,0.199667 0.459394,-0.01072 -0.09488,0.271885 0.779216,-0.339303 -0.77533,-0.364961 0.07645,0.278555 z"
-       id="path7032-6-3-6-0-9-9-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi-manager/data/icons/right.png"
-       inkscape:export-xdpi="1940.0398"
-       inkscape:export-ydpi="1940.0398" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 11.582013,52.327352 -0.01604,0.199667 -0.459394,-0.01072 0.09488,0.271885 -0.779216,-0.339303 0.77533,-0.364961 -0.07645,0.278555 z"
-       id="path7032-6-3-6-0-9-9-9-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi-manager/data/icons/left.png"
-       inkscape:export-xdpi="1940.04"
-       inkscape:export-ydpi="1940.04" />
-    <g
-       id="g5306-9"
-       transform="matrix(0.50368244,0,0,0.50368244,-6.5235315,33.805026)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279">
-      <path
-         inkscape:export-ydpi="170"
-         inkscape:export-xdpi="170"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path5253-3-8"
-         d="m 45.409894,35.302305 -4.568466,0.02053 -0.0723,4.432362 6.408155,0.08839 -0.0944,-4.624303 -1.421145,-0.0404 0.454886,3.64824 -4.154253,0 -0.32544,-2.708788 4.762248,-0.08839 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="170"
-         inkscape:export-xdpi="170"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path5255-6-7"
-         d="m 42.330898,35.320145 c -0.0028,-2.135681 3.051859,-2.329526 3.147097,0.0221"
-         style="fill:none;stroke:#008700;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="170"
-         inkscape:export-xdpi="170"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-         inkscape:connector-curvature="0"
-         id="path5259-7-2"
-         d="m 43.637495,36.877209 -0.0065,1.686311 0.707106,-0.0221 -0.104015,-1.730505 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-    </g>
-    <rect
-       style="fill:#008700;fill-opacity:0.25480766;stroke:none"
-       id="rect3484-8"
-       width="2.8212655"
-       height="1.9806831"
-       x="14.237011"
-       y="51.7066"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/padlock.png"
-       inkscape:export-xdpi="279"
-       inkscape:export-ydpi="279" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 21.714106,51.532071 -2.785431,0.0494 -0.03642,2.232503 3.227675,0.04452 -0.04755,-2.32918 -0.715806,-0.02035 0.229118,1.837555 -2.092424,0 -0.163919,-1.364369 2.398661,-0.04452 z"
-       id="path5253-3-8-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/open_padlock.png"
-       inkscape:export-xdpi="697.09631"
-       inkscape:export-ydpi="697.09631" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.55405068;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 19.722166,51.070556 c 0.640301,-1.051377 1.709078,-0.316193 1.562423,0.576385"
-       id="path5255-6-7-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/open_padlock.png"
-       inkscape:export-xdpi="697.09631"
-       inkscape:export-ydpi="697.09631" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 20.337005,52.364386 -0.0033,0.849365 0.356157,-0.01113 -0.05239,-0.871625 z"
-       id="path5259-7-2-8"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/open_padlock.png"
-       inkscape:export-xdpi="697.09631"
-       inkscape:export-ydpi="697.09631"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="fill:#008700;fill-opacity:0.25480766;stroke:none"
-       id="rect3484-8-3"
-       width="2.8212655"
-       height="1.9806831"
-       x="19.118107"
-       y="51.691559"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/open_padlock.png"
-       inkscape:export-xdpi="697.09631"
-       inkscape:export-ydpi="697.09631" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 26.863371,51.852963 0.919352,-0.0275"
-       id="path5062-3-7-2-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
-       inkscape:export-xdpi="444.30115"
-       inkscape:export-ydpi="444.30115" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 27.719324,51.796556 24.631347,54.7476"
-       id="path5062-3-7-0-6-3-5-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
-       inkscape:export-xdpi="444.30115"
-       inkscape:export-ydpi="444.30115" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 23.995652,51.426647 28.64451,51.317272"
-       id="path5062-7-4-7"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
-       inkscape:export-xdpi="444.30115"
-       inkscape:export-ydpi="444.30115"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 23.858168,55.211721 4.634803,-0.1875"
-       id="path5062-7-4-2-5"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
-       inkscape:export-xdpi="444.30115"
-       inkscape:export-ydpi="444.30115"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 24.160483,51.21383 0.04956,4.167624"
-       id="path5062-7-4-5-6"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
-       inkscape:export-xdpi="444.30115"
-       inkscape:export-ydpi="444.30115"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 28.336832,51.05915 -0.01674,4.233915"
-       id="path5062-7-4-5-2-9"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
-       inkscape:export-xdpi="444.30115"
-       inkscape:export-ydpi="444.30115"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 27.526284,52.62638 0.123857,-0.889283"
-       id="path5062-3-7-2-4-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
-       inkscape:export-xdpi="444.30115"
-       inkscape:export-ydpi="444.30115" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 25.595113,54.598688 -0.919352,0.115888"
-       id="path5062-3-7-2-4-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
-       inkscape:export-xdpi="444.30115"
-       inkscape:export-ydpi="444.30115" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 24.799617,53.913659 24.67576,54.802942"
-       id="path5062-3-7-2-4-2-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/full_screen.png"
-       inkscape:export-xdpi="444.30115"
-       inkscape:export-ydpi="444.30115" />
-    <path
-       style="fill:#46be40;stroke:#008700;stroke-width:0.20000000000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="m 31.300618,52.670568 -0.0045,-0.573774 2.615224,-0.0013 -0.0088,1.524195 -0.68503,-0.0044"
-       id="path4477-1-8-7-2-9-8"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-       inkscape:export-xdpi="392.73001"
-       inkscape:export-ydpi="392.73001"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 31.969055,52.140237 10e-4,-0.540629 2.620749,-0.0014 -0.01432,1.689922 -0.629787,-0.0043"
-       id="path4477-1-8-7-4-0-0-7"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-       inkscape:export-xdpi="392.73001"
-       inkscape:export-ydpi="392.73001"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ffffff;stroke:#008700;stroke-width:0.20000000000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="m 30.660296,52.673046 2.543408,0.0042 0.0022,1.573913 -2.546708,-0.0099 z"
-       id="path4477-1-8-1-0-9"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-       inkscape:export-xdpi="392.73001"
-       inkscape:export-ydpi="392.73001"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 38.513277,53.40064 c -0.01033,-0.04765 -0.028,-0.119748 -0.05134,-0.191766 -0.217324,0.308443 -0.64737,0.508771 -1.030398,0.333694 l 0.176599,-0.1998 -0.849785,-0.01306 0.722357,0.731143 -0.07753,-0.346032 c 0.393245,0.08544 0.914062,-0.05717 1.110092,-0.314182 z"
-       id="path7032-6-3-6-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 36.758352,51.448727 c 0.01033,0.04765 0.028,0.119748 0.05134,0.191766 0.217325,-0.308443 0.64737,-0.508771 1.030399,-0.333694 l -0.1766,0.1998 0.849786,0.01306 -0.722357,-0.731143 0.07753,0.346032 c -0.393245,-0.08544 -0.914063,0.05717 -1.110093,0.314182 z"
-       id="path7032-6-3-6-0-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.21259843;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 36.867934,51.948412 1.535153,0.0025 0.0013,0.949984 -1.537144,-0.006 z"
-       id="path4477-1-8-1-0-9-9"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="fill:none;stroke:#007200;stroke-width:0.85348123;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect4795"
-       width="4.5805149"
-       height="0.093411274"
-       x="41.756618"
-       y="-52.846371"
-       ry="0.025383499"
-       transform="scale(1,-1)" />
-    <g
-       id="g4887"
-       transform="translate(-1.2038914e-6,0)">
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="41.763851"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="42.787289"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5-3"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="43.810726"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5-3-0"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="44.834164"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5-3-0-1"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="45.857601"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5-3-0-1-9"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       transform="translate(-1.2038914e-6,1.9687514)"
-       id="g4887-0">
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="41.763851"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5-0"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="42.787289"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5-3-08"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="43.810726"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5-3-0-7"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="44.834164"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5-3-0-1-5"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         ry="0.077391401"
-         y="51.672905"
-         x="45.857601"
-         height="0.28480035"
-         width="0.47230023"
-         id="rect4795-5-3-0-1-9-1"
-         style="fill:none;stroke:#47954a;stroke-width:0.4785381;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <path
-       style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:0.16993423;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 49.023848,53.058275 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:0.16993423;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 49.690821,52.235495 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:0.16993423;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 50.571833,51.517395 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#35b314;fill-opacity:1;stroke:none"
-       d="m 50.883683,52.669854 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5-0-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#35b314;fill-opacity:1;stroke:none"
-       d="m 49.35877,51.088398 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5-0-0-6"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#35b314;fill-opacity:1;stroke:none"
-       d="m 50.206906,53.34376 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5-0-0-3"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#35b314;fill-opacity:1;stroke:none"
-       d="m 48.48312,51.937184 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5-0-0-3-9"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#35b314;fill-opacity:1;stroke:none"
-       d="m 51.775743,51.795505 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5-0-0-3-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#35b314;fill-opacity:1;stroke:none"
-       d="m 47.887474,53.108274 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5-0-0-3-6"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rotate_workspace.png"
-       inkscape:export-xdpi="564.13"
-       inkscape:export-ydpi="564.13"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:0.16993423;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 53.728977,53.034167 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-8"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/antialiasing.png"
-       inkscape:export-xdpi="411.42856"
-       inkscape:export-ydpi="411.42856"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:0.16993423;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 54.39595,52.03461 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5-6"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/antialiasing.png"
-       inkscape:export-xdpi="411.42856"
-       inkscape:export-ydpi="411.42856"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#009000;fill-opacity:1;stroke:#008700;stroke-width:0.16993423;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 55.431642,51.559578 0.992965,0.0025 8.41e-4,0.938374 -0.994253,-0.0059 z"
-       id="path4477-1-8-1-0-9-9-4-5-0-04"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/antialiasing.png"
-       inkscape:export-xdpi="411.42856"
-       inkscape:export-ydpi="411.42856"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#3cc73d;fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 56.067112,54.02493 2.543408,0.0042 0.0022,1.573913 -2.546708,-0.0099 z"
-       id="path4477-1-8-1-0-9-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_color.png"
-       inkscape:export-xdpi="490.91"
-       inkscape:export-ydpi="490.91"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.04402487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 56.510803,54.362664 1.656478,0.0025 0.0014,0.900145 -1.658629,-0.0056 z"
-       id="path4477-1-8-1-0-9-4-1"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_color.png"
-       inkscape:export-xdpi="490.91"
-       inkscape:export-ydpi="490.91"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.20000000000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 59.804094,54.000137 2.543408,0.0042 0.0022,1.573913 -2.546708,-0.0099 z"
-       id="path4477-1-8-1-0-9-4-2"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
-       inkscape:export-xdpi="490.91"
-       inkscape:export-ydpi="490.91"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#3cc73d;fill-opacity:1;stroke:#008700;stroke-width:0.04402487000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 60.247785,54.337871 1.656478,0.0025 0.0014,0.900145 -1.658629,-0.0056 z"
-       id="path4477-1-8-1-0-9-4-1-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
-       inkscape:export-xdpi="490.91"
-       inkscape:export-ydpi="490.91"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#3cc73d;fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 56.411735,57.084209 2.543408,0.0042 0.0022,1.573913 -2.546708,-0.0099 z"
-       id="path4477-1-8-1-0-9-4-3"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_color.png"
-       inkscape:export-xdpi="490.91"
-       inkscape:export-ydpi="490.91"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 57.185826,58.200971 c -0.508484,-0.480175 0.931106,-1.193484 0.583867,-0.0069 0.142891,-0.265363 0.348282,-0.405727 0.522423,-0.42109"
-       id="path4866"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/background_color.png"
-       inkscape:export-xdpi="490"
-       inkscape:export-ydpi="490" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 59.892482,57.248409 2.543408,0.0042 0.0022,1.573913 -2.546708,-0.0099 z"
-       id="path4477-1-8-1-0-9-4-2-1"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
-       inkscape:export-xdpi="490.91"
-       inkscape:export-ydpi="490.91"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.20000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 60.666573,58.365171 c -0.508484,-0.480175 0.931106,-1.193484 0.583867,-0.0069 0.142891,-0.265363 0.348282,-0.405727 0.522423,-0.42109"
-       id="path4866-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
-       inkscape:export-xdpi="490"
-       inkscape:export-ydpi="490" />
-    <path
-       style="fill:url(#linearGradient4963);fill-opacity:1;stroke:#008700;stroke-width:0.11542948;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 41.433467,31.640605 c 0.232744,0.678486 -0.28833,1.068284 -0.735525,1.068284 -0.447195,0 -0.809719,-0.356431 -0.809719,-0.79611 0,-0.43968 0.362524,-0.796111 0.809719,-0.796111 0.323779,0 0.616431,0.189639 0.744107,0.482182"
-       id="path4545-8-2-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-       inkscape:export-xdpi="947.27002"
-       inkscape:export-ydpi="947.27002" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.11542948;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 41.448371,31.826403 c -0.177515,0.520696 -1.290207,0.610235 -1.549523,0.120517"
-       id="path7034-3-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-       inkscape:export-xdpi="947.27002"
-       inkscape:export-ydpi="947.27002" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 42.083283,30.552944 0.310329,0.218135 c -0.31046,-0.08356 -0.555583,-0.0056 -0.714705,0.116998 l 0.407103,0.126313 -1.282571,0.561019 0.586636,-1.065874 0.104819,0.297585 c 0.161773,-0.155562 0.418337,-0.272495 0.588389,-0.254176 z"
-       id="path7032-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-       inkscape:export-xdpi="947.27002"
-       inkscape:export-ydpi="947.27002" />
-    <g
-       id="g4788"
-       transform="translate(-0.070311,-0.04403346)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
-       inkscape:export-xdpi="947"
-       inkscape:export-ydpi="947">
-      <path
-         inkscape:export-ydpi="1220"
-         inkscape:export-xdpi="1220"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
-         sodipodi:nodetypes="cccccccccccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4318-7-8-2-1-8"
-         d="m 45.015625,31.03125 0.03125,2.34375 0.214174,-0.0221 -0.0404,-2.321653 z m 0.234375,0 0.0625,2.34375 1.34375,-0.03125 -0.0625,-2.3125 z m 1.373104,0 0.07165,2.290403 0.211493,0.0221 -0.09375,-2.3125 z m -1.248104,0.1875 1.0625,0 0.03125,0.5625 -1.0625,0 z m 1.09375,0.6875 L 46.5,32.46875 45.4375,32.5 45.40625,31.9375 z m -1.03125,0.71875 1.0625,0 0.03125,0.5625 -1.0625,0.03125 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-    </g>
-    <path
-       style="fill:url(#linearGradient4828);fill-opacity:1;stroke:#008700;stroke-width:0.15429033;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 61.18792,60.990609 c 0.3111,0.906907 -0.3854,1.427936 -0.983149,1.427936 -0.597749,0 -1.082322,-0.476429 -1.082322,-1.064131 0,-0.587704 0.484573,-1.064133 1.082322,-1.064133 0.432783,0 0.82396,0.253484 0.99462,0.644515"
-       id="path4545-8-2-1-2-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-       inkscape:export-xdpi="947.27002"
-       inkscape:export-ydpi="947.27002" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 59.751834,61.674306 c -0.508484,-0.480175 0.931106,-1.193484 0.583867,-0.0069 0.142891,-0.265363 0.348282,-0.405727 0.522423,-0.42109"
-       id="path4866-1-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/brush_color.png"
-       inkscape:export-xdpi="490"
-       inkscape:export-ydpi="490" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 61.638443,59.768739 0.310329,0.218135 c -0.31046,-0.08356 -0.555583,-0.0056 -0.714705,0.116998 l 0.407103,0.126313 -1.282571,0.561019 0.586636,-1.065874 0.104819,0.297585 c 0.161773,-0.155562 0.418337,-0.272495 0.588389,-0.254176 z"
-       id="path7032-2-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-       inkscape:export-xdpi="947.27002"
-       inkscape:export-ydpi="947.27002" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 59.582772,38.769105 c 0.07815,0.0992 0.15631,0.198394 0.234466,0.297592 0.003,-0.354705 0.320545,-0.77163 0.521945,-0.729547 l 0.122972,0.277368 0.761883,-0.810331 -1.208403,0.135269 0.198395,0.198394 c -0.249497,0.171341 -0.544084,0.423843 -0.631258,0.631255 z"
-       id="path7032-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export_frame.png"
-       inkscape:export-xdpi="715"
-       inkscape:export-ydpi="715" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 58.788007,39.48423 -0.01429,-2.185811 3.126143,-0.04152 0.01429,0.231235 -2.924817,0.03883 0,1.723573 2.752292,-0.01942 -0.07655,-1.614198 0.251762,0.03883 0.04285,1.815524 z"
-       id="path4304-2-4-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export_frame.png"
-       inkscape:export-xdpi="715.30231"
-       inkscape:export-ydpi="715.30231" />
-    <path
-       style="fill:url(#linearGradient3994);fill-opacity:1;stroke:#008700;stroke-width:0.11542948;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 50.261298,31.768607 c 0.232744,0.678486 -0.28833,1.068284 -0.735525,1.068284 -0.447195,0 -0.809719,-0.356431 -0.809719,-0.79611 0,-0.43968 0.362524,-0.796111 0.809719,-0.796111 0.323779,0 0.616431,0.189639 0.744107,0.482182"
-       id="path4545-8-2-1-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/video_gallery.png"
-       inkscape:export-xdpi="947.27002"
-       inkscape:export-ydpi="947.27002" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.11542948;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 50.276202,31.954405 c -0.177515,0.520696 -1.290207,0.610235 -1.549523,0.120517"
-       id="path7034-3-6-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/video_gallery.png"
-       inkscape:export-xdpi="947.27002"
-       inkscape:export-ydpi="947.27002" />
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect4017-2"
-       width="2.53125"
-       height="2.84375"
-       x="51.203125"
-       y="31.096588"
-       ry="0.018034328"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export.png"
-       inkscape:export-xdpi="947"
-       inkscape:export-ydpi="947" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 51.960937,31.15909 0.03125,2.34375 0.214174,-0.0221 -0.0404,-2.321653 z m 0.234375,0 0.0625,2.34375 1.34375,-0.03125 -0.0625,-2.3125 z m 1.373104,0 0.07165,2.290403 0.211493,0.0221 -0.09375,-2.3125 z m -1.248104,0.1875 1.0625,0 0.03125,0.5625 -1.0625,0 z m 1.09375,0.6875 0.03125,0.5625 -1.0625,0.03125 -0.03125,-0.5625 z m -1.03125,0.71875 1.0625,0 0.03125,0.5625 -1.0625,0.03125 z"
-       id="path4318-7-8-2-1-8-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/export_button.png"
-       inkscape:export-xdpi="1220"
-       inkscape:export-ydpi="1220" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 55.603088,60.512372 0.09937,1.785824 2.003972,0.01183 0.198741,-1.975052 -2.186151,-0.01183 0.04968,0.153747 1.954287,-0.03548 -0.143521,1.707707 -1.703114,0.01898 -0.09109,-1.649819 z"
-       id="path5117-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/storyboard.png"
-       inkscape:export-xdpi="977.38"
-       inkscape:export-ydpi="977.38" />
-    <path
-       style="fill:#008700;fill-opacity:0.45263157;stroke:none"
-       d="m 57.586654,60.527501 c -0.03513,0 -1.661042,0.04045 -1.661042,0.04045 l 0.126939,1.45093 1.399245,0.05137 0.0098,-0.225855 -0.339153,0.0066 -0.134676,-0.0669 0.473828,-0.0024 0.03067,-0.32478 -1.347508,0.0028 -0.04065,-0.79008 1.473362,-0.04377 z"
-       id="path5121-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/storyboard.png"
-       inkscape:export-xdpi="977.38"
-       inkscape:export-ydpi="977.38" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 58.413331,68.334951 -0.424128,0.65382 0.438413,0.223158 0.366067,-0.673829 z"
-       id="path4229-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-       inkscape:export-xdpi="478.02069"
-       inkscape:export-ydpi="478.02069" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 57.740901,68.71325 1.226703,0.861431 -0.204936,0.314437 -0.27833,-0.219831 -0.462205,0.997603 -1.109653,-0.679111 0.65369,-0.796767 -0.376152,-0.223419 0.292054,-0.308125 0.205703,0.158526 -0.08651,0.130351 0.447784,0.325187 -0.699256,0.645753 0.393993,0.243915 0.388142,-0.80822 0.322208,0.150978 0.05186,-0.08732 -0.808382,-0.49483 z"
-       id="path4231-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-       inkscape:export-xdpi="478.02069"
-       inkscape:export-ydpi="478.02069" />
-    <path
-       style="fill:#008700;fill-opacity:0.50480772;stroke:none"
-       d="m 57.800221,68.863964 c -0.06629,-0.01105 -0.37565,0.0442 -0.37565,0.0442 l 0.342505,0.287262 -0.552427,0.718155 0.618718,0.45299 0.408796,-0.850738 0.331456,0.07734 0.05524,-0.110485 z"
-       id="path4241-9"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-       inkscape:export-xdpi="478"
-       inkscape:export-ydpi="478" />
-    <g
-       id="g4833"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/zoom_in.png"
-       inkscape:export-xdpi="605.49915"
-       inkscape:export-ydpi="605.49915">
+       id="g8568"
+       transform="translate(8.8942326,-191.26539)">
       <g
-         id="g4829">
+         transform="matrix(8.4891828,0,0,8.4891828,39.530285,245.10136)"
+         inkscape:export-ydpi="723.53003"
+         inkscape:export-xdpi="723.53003"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
+         id="g6266">
         <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient4059);fill-opacity:1;stroke:#008700;stroke-width:0.48670816;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path4227-3"
-           sodipodi:cx="0.9375"
-           sodipodi:cy="12.471557"
-           sodipodi:rx="1.515625"
-           sodipodi:ry="1.890625"
-           d="m 2.453125,12.471557 a 1.515625,1.890625 0 1 1 -4.26e-5,-0.01417"
-           sodipodi:start="0"
-           sodipodi:end="6.2756908"
-           sodipodi:open="true"
-           transform="matrix(-0.57644731,1.1260375,-0.94671434,-0.48464724,75.219421,70.784036)"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-           inkscape:export-xdpi="478.02069"
-           inkscape:export-ydpi="478.02069" />
+           style="fill:url(#linearGradient11137);fill-opacity:1;stroke:none"
+           d="m 66.940889,5.0054046 -2.563263,1.347923 -0.142631,0.4617028 0.209901,-0.2629638 c 0.164057,0.1197191 -0.506946,0.5682043 -0.491977,0.7340303 l 1.419404,0.8172291 0.165498,-0.1358959 0.220139,-0.037051 0.06319,-0.057588 0.313194,-0.1825881 z"
+           id="path4054-4"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
+           inkscape:export-xdpi="1152.0601"
+           inkscape:export-ydpi="1152.0601"
+           sodipodi:nodetypes="ccccccccccc" />
         <path
-           sodipodi:type="arc"
-           style="fill:#ffffff;fill-opacity:0.50480772;stroke:none"
-           id="path4243-2"
-           sodipodi:cx="2.9610097"
-           sodipodi:cy="14.218942"
-           sodipodi:rx="0.8175922"
-           sodipodi:ry="0.86178637"
-           d="m 3.7786019,14.218942 a 0.8175922,0.86178637 0 1 1 -0.06625,-0.339828"
-           sodipodi:start="0"
-           sodipodi:end="5.8778476"
-           sodipodi:open="true"
-           transform="matrix(1.0132796,0,0,1.0132796,59.545505,50.986748)"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-           inkscape:export-xdpi="478"
-           inkscape:export-ydpi="478" />
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 67.062423,4.8286289 -2.778221,1.4537367 0.03314,0.397748 0.509019,0.288372 0.142465,0.074619 0.451277,-0.5704947 c 0.08373,-0.081615 0.167467,-0.1632296 0.251201,-0.2448444 l 0.671047,-0.4879124 -0.500068,0.8396615 -0.687567,0.6521615 0.145947,0.1997375 0.479894,0.457012 0.433898,-0.04008 0.816158,-2.782011 -0.243068,0.06629 -0.713482,2.49766 -0.227212,-0.03693 -0.47548,-0.377546 0.61739,-0.4996185 0.682992,-1.4147135 -1.310864,0.8733385 -0.386663,0.6767205 -0.259134,-0.149317 -0.165729,-0.287263 2.40257,-1.321154 z"
+           id="path4052-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccccccccccccccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
+           inkscape:export-xdpi="1152.0601"
+           inkscape:export-ydpi="1152.0601" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 65.768209,7.9360162 -1.322532,-1.144852 c -0.340292,0.094784 -0.507022,0.3499488 -0.28913,0.5952877 0.192701,0.1382872 0.571818,0.4893365 0.772119,0.6087091 0.2003,0.1193726 0.451528,0.2453799 0.475395,0.089038 C 64.779816,7.6658256 64.634402,7.4310444 64.2797,7.2234656 64.2852,7.0690754 64.34036,7.0829295 64.402046,7.0843996 l 1.135024,0.8897645 z"
+           id="path4052-3-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccczccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
+           inkscape:export-xdpi="1152.0601"
+           inkscape:export-ydpi="1152.0601" />
       </g>
+    </g>
+    <g
+       id="g9146"
+       transform="translate(-396.02497,-71.092404)">
       <path
-         inkscape:export-ydpi="605.49915"
-         inkscape:export-xdpi="605.49915"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/plus_sign.png"
-         sodipodi:nodetypes="ccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4153-6-8"
-         d="m 63.163277,64.535453 -0.723398,-0.128446 0.161496,1.155728 -0.912199,-0.227134 -0.09404,0.785062 1.141453,-0.102193 -0.231502,1.052435 0.940776,0.07905 -0.265113,-1.130076 0.899603,0.108275 0.06915,-0.812328 -1.021272,0.195932 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         inkscape:export-ydpi="1001.74"
+         inkscape:export-xdpi="1001.74"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pen_properties.png"
+         sodipodi:open="true"
+         sodipodi:end="6.2756908"
+         sodipodi:start="0"
+         d="m 68.302099,21.720903 c 0,0.933598 -0.75683,1.690428 -1.690428,1.690428 -0.933597,0 -1.690427,-0.75683 -1.690427,-1.690428 0,-0.933597 0.75683,-1.690427 1.690427,-1.690427 0.928654,0 1.68342,0.749131 1.69038,1.677759"
+         sodipodi:ry="1.6904272"
+         sodipodi:rx="1.6904272"
+         sodipodi:cy="21.720903"
+         sodipodi:cx="66.611671"
+         id="path6273"
+         style="fill:#008700;fill-opacity:1;stroke:#005600;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
     </g>
     <g
-       id="g4005">
+       id="g9090"
+       transform="translate(328.49228,-138.33862)">
       <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         inkscape:export-ydpi="783.26001"
+         inkscape:export-xdpi="783.26001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/delete_big.png"
+         id="g6311">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 24.72664,18.837235 -0.220971,1.104854 4.596194,-0.0221 -0.552427,-1.171145 -1.635184,0.464039 0,-0.640816 -0.950175,0 0.441942,0.552427 z"
+           id="path5037"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/delete.png"
+           inkscape:export-xdpi="464.06003"
+           inkscape:export-ydpi="464.06003" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 25.190679,20.229351 0.06361,2.36929 -0.288372,0.01183 -0.21228,0.81001 4.281933,-0.0092 -0.220971,-0.839689 -0.37565,0.04419 -0.132583,-2.496971 -0.685009,0.0221 0.198873,2.80633 -2.099223,0 -0.0221,-2.894718 z"
+           id="path5039"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/delete.png"
+           inkscape:export-xdpi="464.06003"
+           inkscape:export-ydpi="464.06003" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 26.045439,20.353032 0.457051,-0.171875 -0.06771,2.578125 -0.363948,-0.01563 z"
+           id="rect5041"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/delete.png"
+           inkscape:export-xdpi="464.06003"
+           inkscape:export-ydpi="464.06003" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 27.253263,20.305406 -0.457051,-0.171875 0.06771,2.578125 0.363948,-0.01563 z"
+           id="rect5041-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/delete.png"
+           inkscape:export-xdpi="464.06003"
+           inkscape:export-ydpi="464.06003" />
+        <path
+           style="fill:url(#linearGradient11139);fill-opacity:1;stroke:none"
+           d="m 25.65625,19.862182 -0.203125,3.265625 c 0,0 2.796875,0.1875 2.765625,0.125 -0.03125,-0.0625 0.07812,-3.359375 0.07812,-3.359375 z"
+           id="path6281"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccscc" />
+        <path
+           style="fill:#ffffff;fill-opacity:0.15384617;stroke:none"
+           d="M 28.673501,19.59301 27.484483,19.250918 28.39493,18.994497 z"
+           id="path5015-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
+           inkscape:export-xdpi="477.82242"
+           inkscape:export-ydpi="477.82242" />
+      </g>
+    </g>
+    <g
+       id="g9270"
+       transform="translate(4.6281931,-274.06288)">
+      <path
+         sodipodi:nodetypes="cccc"
          inkscape:export-ydpi="605"
          inkscape:export-xdpi="605"
          inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
-         transform="matrix(0.88697263,0,0,0.84134706,55.443788,50.840646)"
-         id="g4300-8">
+         inkscape:connector-curvature="0"
+         id="path4296-2-9"
+         d="M 19.757769,728.26041 20.5757,710.17258 7.8440209,716.63302 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:export-ydpi="605"
+         inkscape:export-xdpi="605"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
+         inkscape:connector-curvature="0"
+         id="path4298-5-5"
+         d="m 17.283525,721.94272 0.327378,-6.82017 -4.485809,2.07999 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <g
+         inkscape:export-ydpi="1676.08"
+         inkscape:export-xdpi="1676.08"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign_big.png"
+         transform="matrix(0.93086292,-8.9010024,8.4431376,0.8829796,-242.15459,745.50609)"
+         id="g4300-4">
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 5.1520053,30.938157 -0.047381,0.829166 2.0373806,4e-6 -0.2724404,-0.900238 z"
-           id="path4296-5"
+           d="M 5.116241,32.043763 7.1358741,31.917972 6.2699467,30.505509 z"
+           id="path4296-2"
            inkscape:connector-curvature="0"
            inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
            inkscape:export-xdpi="605"
            inkscape:export-ydpi="605"
-           sodipodi:nodetypes="ccccc" />
+           sodipodi:nodetypes="cccc" />
         <path
            style="fill:#ffffff;fill-opacity:1;stroke:none"
-           d="m 5.3770648,31.186907 -0.00592,0.307975 1.3088985,0 -0.071071,-0.379046 z"
-           id="path4298-0"
+           d="M 5.7895791,31.676479 6.5513186,31.631271 6.2680328,31.131207 z"
+           id="path4298-5"
            inkscape:connector-curvature="0"
            inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
            inkscape:export-xdpi="605"
            inkscape:export-ydpi="605"
-           sodipodi:nodetypes="ccccc" />
+           sodipodi:nodetypes="cccc" />
       </g>
+    </g>
+    <g
+       id="g9214"
+       transform="translate(129.39404,-308.25934)">
       <g
-         id="g4330-4-8"
-         transform="translate(55.800435,60.04959)">
+         id="g9209">
         <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient4239-8-6);fill-opacity:1;stroke:#008700;stroke-width:0.48670816;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path4227-3-8"
-           sodipodi:cx="0.9375"
-           sodipodi:cy="12.471557"
-           sodipodi:rx="1.515625"
-           sodipodi:ry="1.890625"
-           d="m 2.453125,12.471557 c 0,1.044163 -0.6785684,1.890625 -1.515625,1.890625 -0.83705657,0 -1.515625,-0.846462 -1.515625,-1.890625 0,-1.044164 0.67856843,-1.890625 1.515625,-1.890625 0.8326241,0 1.5093424,0.83785 1.5155824,1.876455"
-           sodipodi:start="0"
-           sodipodi:end="6.2756908"
-           sodipodi:open="true"
-           transform="matrix(-0.40843576,0.79784217,-0.67078462,-0.34339177,12.174183,18.302799)"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-           inkscape:export-xdpi="478.02069"
-           inkscape:export-ydpi="478.02069" />
+           style="fill:url(#linearGradient11141);fill-opacity:1;stroke:#008700;stroke-width:1.93242264;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 590.73376,683.19484 c 3.8964,11.35864 -4.82698,17.8843 -12.31354,17.8843 -7.48656,0 -13.55563,-5.96706 -13.55563,-13.32779 0,-7.36075 6.06907,-13.32782 13.55563,-13.32782 5.42043,0 10.31977,3.17478 12.45721,8.07228"
+           id="path4545-8-2-1-9-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csssc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/links_big.png"
+           inkscape:export-xdpi="1072.1801"
+           inkscape:export-ydpi="1072.1801" />
         <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 2.6128964,15.72286 -0.4241288,0.65382 0.4384136,0.223158 0.3660673,-0.673829 z"
-           id="path4229-1-9"
+           style="fill:#007700;fill-opacity:1;stroke:none"
+           d="m 571.7622,677.31226 -1.02799,1.32643 0.37709,1.41356 -1.40504,-0.0871 -2.05597,2.65287 2.52023,0.79586 -1.32643,4.90781 1.45907,-1.32644 1.32644,3.0508 2.25494,0.39789 -0.66326,3.44873 2.38758,1.32643 2.1223,5.04046 1.98965,-8.48919 -4.14137,-2.23884 -3.15402,0.24916 -0.33159,-2.71919 2.32126,-0.0662 0.89539,1.1938 -0.23209,-2.1223 1.75752,-4.44354 1.26012,0.0331 -0.59687,-0.97823 0.89533,-1.93991 -2.91815,0.69628 1.1938,-2.52023 z"
+           id="path4154"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccccccccccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/links_big.png"
+           inkscape:export-xdpi="1072.1801"
+           inkscape:export-ydpi="1072.1801" />
+        <path
+           style="fill:#007700;fill-opacity:1;stroke:none"
+           d="m 582.10845,675.91873 -0.66317,0.38134 0.26528,1.04458 0.99486,1.29326 1.32643,0.53058 -0.26528,0.86218 -0.92851,0.53058 -0.19898,1.32643 1.32643,-0.72956 0.72956,1.32644 1.59172,-0.96167 2.10572,-0.53057 0.94508,0.96166 0.1658,1.06115 -2.2881,2.38761 -0.92851,-1.26011 -1.06114,1.06115 -1.26011,-1.85701 -1.32644,-1.06115 -2.12229,0.86218 -0.72956,0.72956 -0.86686,2.18667 0.60146,1.92527 c 0.96996,0.52735 1.09658,0.0832 1.98965,0.59687 l 0.59696,1.09431 1.32644,0.72956 0.35697,5.06419 0.99483,0.9285 1.79069,-0.66326 1e-5,-2.38758 0.57132,-6.02585 -1.52541,-1.65804 1.79069,1.12742 0.39789,1.39276 0.86218,-0.0662 0.53057,-0.86219 1.49225,-0.19898 c 0.15943,-2.99156 -1.20351,-6.80978 -3.67322,-8.42896 -1.41441,-1.48519 -3.64228,-2.27339 -4.91522,-2.7131 z"
+           id="path4924"
            inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/links_big.png"
+           inkscape:export-xdpi="1072.1801"
+           inkscape:export-ydpi="1072.1801" />
+      </g>
+    </g>
+    <g
+       id="g9149"
+       transform="translate(-402.20451,-73.286907)">
+      <path
+         inkscape:export-ydpi="1174.63"
+         inkscape:export-xdpi="1174.63"
+         inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_scene_big.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4290-6"
+         d="m 653.71261,440.05042 -0.12029,24.55569 -23.9069,-0.29042 0.57115,-23.24193 z"
+         style="fill:#2fa725;fill-opacity:0.76987448;fill-rule:evenodd;stroke:none" />
+      <g
+         inkscape:export-ydpi="1174.63"
+         inkscape:export-xdpi="1174.63"
+         inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_scene_big.png"
+         transform="matrix(8.4891828,0,0,8.4891828,-8.9605007,262.53266)"
+         id="g4227">
+        <path
            sodipodi:nodetypes="ccccc"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-           inkscape:export-xdpi="478.02069"
-           inkscape:export-ydpi="478.02069" />
+           style="fill:none;stroke:none"
+           d="m 75.275366,23.792522 2.719787,0.0711 0.02298,-2.909443 -2.755339,0.08888 z"
+           id="path6081-0-6-5"
+           inkscape:connector-curvature="0" />
         <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 1.9404663,16.101159 1.2267026,0.861431 -0.204936,0.314437 -0.2783296,-0.219831 -0.4622049,0.997603 -1.1096529,-0.679111 0.6536897,-0.796767 -0.3761518,-0.223419 0.2920539,-0.308125 0.2057024,0.158526 -0.086507,0.130351 0.4477842,0.325187 -0.6992561,0.645753 0.3939934,0.243915 0.3881413,-0.80822 0.3222082,0.150978 0.051865,-0.08732 -0.8083818,-0.49483 z"
-           id="path4231-4-7"
+           sodipodi:nodetypes="ccccc"
+           style="fill:none;stroke:#008700;stroke-width:0.28442213;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 75.261162,23.893166 0.0089,-2.877483 2.790496,-0.08799 -0.0089,2.902622 -2.45085,-0.04964"
+           id="path5783-9-2-8-9-7"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 76.318968,23.527117 c 0,-0.05028 -0.04786,-2.204814 -0.04786,-2.204814"
+           id="path5785-7-9-0-0-9-3"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.825141,22.016584 c -0.05028,0 -2.457136,0.02882 -2.457136,0.02882"
+           id="path5785-7-6-8-9-0-4-1-6"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccccc"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-           inkscape:export-xdpi="478.02069"
-           inkscape:export-ydpi="478.02069" />
+           sodipodi:nodetypes="cc" />
         <path
-           style="fill:#008700;fill-opacity:0.50480772;stroke:none"
-           d="m 1.9997864,16.251873 c -0.066291,-0.01105 -0.3756505,0.0442 -0.3756505,0.0442 l 0.3425048,0.287262 -0.5524271,0.718155 0.6187184,0.45299 0.4087961,-0.850738 0.3314563,0.07734 0.055243,-0.110485 z"
-           id="path4241-9-7"
+           sodipodi:nodetypes="cc"
            inkscape:connector-curvature="0"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-           inkscape:export-xdpi="478"
-           inkscape:export-ydpi="478" />
+           id="path5785-7-6-8-9-0-4-1-0-6"
+           d="m 78.096722,22.917712 c -0.05028,0 -2.457135,0.02882 -2.457135,0.02882"
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
+           inkscape:export-xdpi="292"
+           inkscape:export-ydpi="292" />
         <path
-           sodipodi:type="arc"
-           style="fill:#ffffff;fill-opacity:0.50480772;stroke:none"
-           id="path4243-2-6"
-           sodipodi:cx="2.9610097"
-           sodipodi:cy="14.218942"
-           sodipodi:rx="0.8175922"
-           sodipodi:ry="0.86178637"
-           d="m 3.7786019,14.218942 c 0,0.475951 -0.3660485,0.861786 -0.8175922,0.861786 -0.4515437,0 -0.8175922,-0.385835 -0.8175922,-0.861786 0,-0.475952 0.3660485,-0.861787 0.8175922,-0.861787 0.3269274,0 0.6224252,0.205283 0.7513422,0.521959"
-           sodipodi:start="0"
-           sodipodi:end="5.8778476"
-           sodipodi:open="true"
-           transform="matrix(0.71794871,0,0,0.71794871,1.0685925,4.2756359)"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-           inkscape:export-xdpi="478"
-           inkscape:export-ydpi="478" />
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.194577,23.531408 c 0,-0.05028 -0.04786,-2.39744 -0.04786,-2.39744"
+           id="path5785-7-9-0-0-9-3-5"
+           inkscape:connector-curvature="0" />
       </g>
     </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;stroke:#008700;stroke-width:0.48670816000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4227-3-80"
-       sodipodi:cx="0.9375"
-       sodipodi:cy="12.471557"
-       sodipodi:rx="1.515625"
-       sodipodi:ry="1.890625"
-       d="m 2.453125,12.471557 a 1.515625,1.890625 0 1 1 -4.26e-5,-0.01417"
-       sodipodi:start="0"
-       sodipodi:end="6.2756908"
-       sodipodi:open="true"
-       transform="matrix(-0.57644731,1.1260375,-0.94671434,-0.48464724,83.703028,71.381514)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/zoom_in_big.png"
-       inkscape:export-xdpi="797.97998"
-       inkscape:export-ydpi="797.97998" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 71.586049,65.408361 -0.572947,-0.101732 0.127908,0.915363 -0.722482,-0.179896 -0.07448,0.621787 0.904057,-0.08094 -0.183355,0.833553 0.745116,0.06261 -0.209976,-0.895046 0.712507,0.08576 0.05477,-0.643382 -0.808871,0.155183 z"
-       id="path4153-6-8-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/zoom_in_big.png"
-       inkscape:export-xdpi="797.97998"
-       inkscape:export-ydpi="797.97998" />
-    <g
-       id="g4850"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/zoom_out_big.png"
-       inkscape:export-xdpi="797.97998"
-       inkscape:export-ydpi="797.97998">
-      <path
-         inkscape:export-ydpi="478.02069"
-         inkscape:export-xdpi="478.02069"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/magnifying.png"
-         transform="matrix(-0.57644731,1.1260375,-0.94671434,-0.48464724,83.676817,76.328558)"
-         sodipodi:open="true"
-         sodipodi:end="6.2756908"
-         sodipodi:start="0"
-         d="m 2.453125,12.471557 a 1.515625,1.890625 0 1 1 -4.26e-5,-0.01417"
-         sodipodi:ry="1.890625"
-         sodipodi:rx="1.515625"
-         sodipodi:cy="12.471557"
-         sodipodi:cx="0.9375"
-         id="path4227-3-80-5"
-         style="fill:none;fill-opacity:1;stroke:#008700;stroke-width:0.48670816000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
+    <g
+       id="g9159"
+       transform="translate(-384.32745,-73.286907)">
       <path
-         inkscape:export-ydpi="605.49915"
-         inkscape:export-xdpi="605.49915"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/plus_sign.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4153-6-8-8-5"
-         d="m 70.407942,71.05164 -0.0901,0.559287 1.968349,0.0059 0.05477,-0.643382 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         inkscape:export-ydpi="1174.63"
+         inkscape:export-xdpi="1174.63"
+         inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_layer_big.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4290"
+         d="m 683.97221,441.22317 0.81759,8.32947 -23.8131,0.45995 0.10221,-8.89159 z"
+         style="fill:#2fa725;fill-opacity:0.76987448;fill-rule:evenodd;stroke:none" />
+      <g
+         inkscape:export-ydpi="1174.63"
+         inkscape:export-xdpi="1174.63"
+         inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_layer_big.png"
+         transform="matrix(8.4891828,0,0,8.4891828,21.853582,262.53266)"
+         id="g4227-7">
+        <path
+           sodipodi:nodetypes="ccccc"
+           style="fill:none;stroke:none"
+           d="m 75.275366,23.792522 2.719787,0.0711 0.02298,-2.909443 -2.755339,0.08888 z"
+           id="path6081-0-6-5-5"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           style="fill:none;stroke:#008700;stroke-width:0.28442213;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 75.261162,23.893166 0.0089,-2.877483 2.790496,-0.08799 -0.0089,2.902622 -2.45085,-0.04964"
+           id="path5783-9-2-8-9-7-5"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 76.318968,23.527117 c 0,-0.05028 -0.04786,-2.204814 -0.04786,-2.204814"
+           id="path5785-7-9-0-0-9-3-4"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.825141,22.016584 c -0.05028,0 -2.457136,0.02882 -2.457136,0.02882"
+           id="path5785-7-6-8-9-0-4-1-6-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path5785-7-6-8-9-0-4-1-0-6-6"
+           d="m 78.096722,22.917712 c -0.05028,0 -2.457135,0.02882 -2.457135,0.02882"
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
+           inkscape:export-xdpi="292"
+           inkscape:export-ydpi="292" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.194577,23.531408 c 0,-0.05028 -0.04786,-2.39744 -0.04786,-2.39744"
+           id="path5785-7-9-0-0-9-3-5-4"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       id="g9169"
+       transform="translate(-366.45038,-73.286907)">
+      <path
+         inkscape:export-ydpi="1174.63"
+         inkscape:export-xdpi="1174.63"
+         inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_frame_big.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4290-4"
+         d="m 691.74111,440.83575 8.32948,-0.35332 0.39356,9.15599 -8.89158,-0.10221 z"
+         style="fill:#2fa725;fill-opacity:0.76987448;fill-rule:evenodd;stroke:none" />
+      <g
+         inkscape:export-ydpi="1174.63"
+         inkscape:export-xdpi="1174.63"
+         inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_frame_big.png"
+         transform="matrix(8.4891828,0,0,8.4891828,52.66768,262.53266)"
+         id="g4227-1">
+        <path
+           sodipodi:nodetypes="ccccc"
+           style="fill:none;stroke:none"
+           d="m 75.275366,23.792522 2.719787,0.0711 0.02298,-2.909443 -2.755339,0.08888 z"
+           id="path6081-0-6-5-51"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           style="fill:none;stroke:#008700;stroke-width:0.28442213;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 75.261162,23.893166 0.0089,-2.877483 2.790496,-0.08799 -0.0089,2.902622 -2.45085,-0.04964"
+           id="path5783-9-2-8-9-7-9"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 76.318968,23.527117 c 0,-0.05028 -0.04786,-2.204814 -0.04786,-2.204814"
+           id="path5785-7-9-0-0-9-3-43"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.825141,22.016584 c -0.05028,0 -2.457136,0.02882 -2.457136,0.02882"
+           id="path5785-7-6-8-9-0-4-1-6-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path5785-7-6-8-9-0-4-1-0-6-0"
+           d="m 78.096722,22.917712 c -0.05028,0 -2.457135,0.02882 -2.457135,0.02882"
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
+           inkscape:export-xdpi="292"
+           inkscape:export-ydpi="292" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.194577,23.531408 c 0,-0.05028 -0.04786,-2.39744 -0.04786,-2.39744"
+           id="path5785-7-9-0-0-9-3-5-5"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       id="g9695"
+       transform="translate(10.270077,-226.99058)">
+      <g
+         transform="translate(118,48.5)"
+         id="g9523">
+        <rect
+           style="fill:none;stroke:none"
+           id="rect5681"
+           width="39.017933"
+           height="39.017933"
+           x="557.36566"
+           y="792.56232"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/share.png"
+           inkscape:export-xdpi="1174.89"
+           inkscape:export-ydpi="1174.89" />
+        <g
+           id="g5683"
+           transform="matrix(8.4891828,0,0,8.4891828,-2.6729493,428.07537)"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/share.png"
+           inkscape:export-xdpi="1174.89"
+           inkscape:export-ydpi="1174.89">
+          <g
+             transform="translate(-8.7946407,-2.3422912)"
+             id="g5673">
+            <g
+               id="g5623"
+               transform="matrix(0.72656251,0,0,0.72656251,21.064047,13.053967)">
+              <path
+                 inkscape:export-ydpi="354.93695"
+                 inkscape:export-xdpi="354.93695"
+                 inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
+                 transform="matrix(1.7777778,0,0,1.7777778,26.16295,-13.953894)"
+                 sodipodi:open="true"
+                 sodipodi:end="6.2745801"
+                 sodipodi:start="0"
+                 d="m 29.43332,35.498436 c 0,0.43934 -0.356155,0.795495 -0.795495,0.795495 -0.43934,0 -0.795495,-0.356155 -0.795495,-0.795495 0,-0.43934 0.356155,-0.795495 0.795495,-0.795495 0.436669,0 0.791708,0.351997 0.795466,0.78865"
+                 sodipodi:ry="0.79549515"
+                 sodipodi:rx="0.79549515"
+                 sodipodi:cy="35.498436"
+                 sodipodi:cx="28.637825"
+                 id="path4400-8"
+                 style="fill:#008700;fill-opacity:1;stroke:none"
+                 sodipodi:type="arc" />
+              <path
+                 inkscape:export-ydpi="354.93695"
+                 inkscape:export-xdpi="354.93695"
+                 inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
+                 transform="matrix(1.7777778,0,0,1.7777778,25.432013,-14.221562)"
+                 sodipodi:open="true"
+                 sodipodi:end="6.2745801"
+                 sodipodi:start="0"
+                 d="m 29.21875,35.38562 c 0,0.194163 -0.1574,0.351563 -0.351563,0.351563 -0.194162,0 -0.351562,-0.1574 -0.351562,-0.351563 0,-0.194162 0.1574,-0.351562 0.351562,-0.351562 0.192983,0 0.349889,0.155562 0.35155,0.348537"
+                 sodipodi:ry="0.3515625"
+                 sodipodi:rx="0.3515625"
+                 sodipodi:cy="35.38562"
+                 sodipodi:cx="28.867188"
+                 id="path3619-7"
+                 style="fill:#ffffff;fill-opacity:0.10576926;stroke:none"
+                 sodipodi:type="arc" />
+            </g>
+            <g
+               id="g5669"
+               transform="translate(0.07107907,0)">
+              <path
+                 inkscape:export-ydpi="300.9415"
+                 inkscape:export-xdpi="300.9415"
+                 inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_backward.png"
+                 sodipodi:nodetypes="cccccccc"
+                 inkscape:connector-curvature="0"
+                 id="path5233-7-8-2"
+                 d="m 75.429817,45.356443 1.533873,1.064917 -0.65233,0.270785 0.611386,0.945794 c -0.161575,0.0056 -0.385687,0.08879 -0.524822,0.180311 l -0.441268,-0.914542 -0.60655,0.334182 z"
+                 style="fill:#008700;fill-opacity:1;stroke:none" />
+              <path
+                 inkscape:export-ydpi="300.9415"
+                 inkscape:export-xdpi="300.9415"
+                 inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_backward.png"
+                 sodipodi:nodetypes="cccccccc"
+                 inkscape:connector-curvature="0"
+                 id="path5233-7-8-2-8"
+                 d="m 78.555206,45.356443 -1.533873,1.064917 0.65233,0.270785 -0.611386,0.945794 c 0.213642,0.02715 0.38047,0.09838 0.519298,0.207932 l 0.446792,-0.942163 0.60655,0.334182 z"
+                 style="fill:#008700;fill-opacity:1;stroke:none" />
+            </g>
+          </g>
+        </g>
+      </g>
     </g>
     <g
-       id="g4401-5-6"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
-       inkscape:export-xdpi="1008"
-       inkscape:export-ydpi="1008"
-       transform="matrix(-0.86458333,0,0,1,70.989761,1.9073965)">
+       id="g9402"
+       transform="translate(124.41119,-222.03455)">
       <path
+         inkscape:export-ydpi="14124.43"
+         inkscape:export-xdpi="14124.43"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/dynamic_background_mode.png"
          sodipodi:nodetypes="ccccccccccc"
          inkscape:connector-curvature="0"
-         id="path4387-9-9"
-         d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
+         id="path4304-2-4-8"
+         d="m 518.63975,739.17505 -0.12131,-18.55575 26.5384,-0.35247 0.12131,1.96299 -24.8293,0.32964 0,14.63173 23.36471,-0.16486 -0.64985,-13.70323 2.13725,0.32964 0.36377,15.41231 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
+         inkscape:export-ydpi="14124.43"
+         inkscape:export-xdpi="14124.43"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/dynamic_background_mode.png"
+         sodipodi:nodetypes="cccccccc"
          inkscape:connector-curvature="0"
-         id="path4389-7-8"
-         d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
-         style="fill:#008700;fill-opacity:0.3942308;stroke:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4399-2-7"
-         d="M 1.2805659,9.2180855 3.825795,10.520916"
-         style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
+         id="path7032-6-3-6-0-9-9-97-6"
+         d="m 523.59818,728.79169 -0.0195,1.80714 9.40849,0.004 -1.04225,2.98663 8.55963,-3.72722 -8.51693,-4.00907 1.14016,3.017 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
     </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="rect4472-8-6"
-       d="m 70.31691,10.86333 -3.078125,0 -0.0078,2.5 3.085937,-0.04687 z"
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
-       inkscape:export-xdpi="1008"
-       inkscape:export-ydpi="1008" />
     <g
-       id="g4714-1"
-       transform="translate(64.587357,1.6652111)">
-      <rect
-         inkscape:export-ydpi="900"
-         inkscape:export-xdpi="900"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
-         transform="scale(-1,1)"
-         y="9.1746817"
-         x="-11.546796"
-         height="2.546875"
-         width="2.8125"
-         id="rect4472-8-7-3"
-         style="fill:#ffffff;fill-opacity:0;stroke:none" />
+       id="g8696"
+       transform="translate(-48.577122,-154.69083)">
       <g
-         inkscape:export-ydpi="900"
-         inkscape:export-xdpi="900"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
-         id="g4586-2">
+         inkscape:export-ydpi="725.5"
+         inkscape:export-xdpi="725.5"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/new_item.png"
+         transform="matrix(8.4891828,0,0,8.4891828,172.16825,268.76026)"
+         id="g4371-1">
         <path
-           style="fill:url(#linearGradient4584-2);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576-1"
-           inkscape:connector-curvature="0" />
+           sodipodi:nodetypes="scscs"
+           inkscape:connector-curvature="0"
+           id="path4204-0"
+           d="m 46.726563,8.6434331 c -0.664468,0 -1.820313,0.1232635 -2.007814,-0.1484375 -0.01031,-0.3455895 1.163658,-0.3671875 1.828126,-0.3671875 0.558752,0 1.497092,0.038055 1.624768,0.1533009 0.437732,0.3918372 -0.780612,0.3623241 -1.44508,0.3623241 z"
+           style="fill:#008700;fill-opacity:0.43269234;stroke:none" />
+        <g
+           id="g4144-0"
+           transform="matrix(0.95243881,0,0,1.2224944,-5.2816729,3.4051066)">
+          <path
+             inkscape:export-ydpi="583.88239"
+             inkscape:export-xdpi="583.88239"
+             inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="rect3928-0-8"
+             d="m 53.071592,2.4983545 2.315893,-0.017679 -0.0088,1.3170537 -2.324732,0.035357 z"
+             style="fill:url(#linearGradient11143);fill-opacity:1;stroke:none" />
+          <path
+             inkscape:export-ydpi="583.88239"
+             inkscape:export-xdpi="583.88239"
+             inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
+             inkscape:connector-curvature="0"
+             id="path3132-2-2"
+             d="m 53.001881,2.4047839 -0.0125,1.550079 2.512629,-0.012502 -0.05,-1.5625796 -2.262616,-0.012501 0,0.2125109 2.100107,-0.087505 0.025,1.3000664 -2.125108,0 -0.02501,-1.4000715 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
         <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.56088,0.0073 0.07364,0.9981615 -1.0868434,0.04956 0.017018,-1.0805781 1.5655594,-0.051051 z"
-           id="path4574-5"
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           id="path4140-2-3"
+           sodipodi:cx="54.977551"
+           sodipodi:cy="2.8499913"
+           sodipodi:rx="0.9722718"
+           sodipodi:ry="0.9722718"
+           d="m 55.949822,2.8499913 c 0,0.5369709 -0.435301,0.9722718 -0.972271,0.9722718 -0.536971,0 -0.972272,-0.4353009 -0.972272,-0.9722718 0,-0.5369709 0.435301,-0.9722718 0.972272,-0.9722718 0.53697,0 0.972271,0.4353009 0.972271,0.9722718 z"
+           transform="matrix(0.6656206,0,0,0.6656206,11.046434,5.8557945)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:url(#linearGradient11145);fill-opacity:1;stroke:#008700;stroke-width:0.30047148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           id="path4140-9"
+           sodipodi:cx="54.977551"
+           sodipodi:cy="2.8499913"
+           sodipodi:rx="0.9722718"
+           sodipodi:ry="0.9722718"
+           d="m 55.949822,2.8499913 c 0,0.5369709 -0.435301,0.9722718 -0.972271,0.9722718 -0.536971,0 -0.972272,-0.4353009 -0.972272,-0.9722718 0,-0.5369709 0.435301,-0.9722718 0.972272,-0.9722718 0.53697,0 0.972271,0.4353009 0.972271,0.9722718 z"
+           transform="matrix(0.6656206,0,0,0.6656206,11.01578,5.8612866)" />
+        <g
+           id="g4150-2"
+           transform="matrix(-1.4043648,0.03338636,0.03338636,1.4043648,121.08734,-0.1589198)">
+          <path
+             inkscape:connector-curvature="0"
+             id="path4148-2"
+             d="M 53.804739,3.5818324 53.34375,4.6824949 54.4273,4.7256384 z"
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             sodipodi:nodetypes="cccc" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4142-1"
+             d="m 53.733355,3.5196701 -0.591586,1.3059784 1.413838,-0.03288 -0.612329,-1.2068077 -0.110476,0.1375425 0.504143,0.9226537 -0.940554,0.014349 0.502693,-1.162932 z"
+             style="fill:#008700;fill-opacity:1;stroke:none"
+             sodipodi:nodetypes="ccccccccc" />
+        </g>
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 46.988951,6.3880713 -0.0046,-0.4165133 0.95234,-0.012944 -0.03582,1.1821384"
+           id="path4206-0"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+    <g
+       id="g9666"
+       transform="translate(-16.042893,-221.47363)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,25.368477,583.19167)"
+         id="g8929">
+        <g
+           id="g8831">
+          <path
+             inkscape:export-ydpi="888.16077"
+             inkscape:export-xdpi="888.16077"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back.png"
+             sodipodi:nodetypes="cccccccc"
+             inkscape:connector-curvature="0"
+             id="path7032-6-3-6-0-9-9-97-7-3"
+             d="m 63.782537,30.75963 -0.21085,-0.0017 0.0096,1.851611 -0.34847,-0.08926 0.434879,0.733101 0.467764,-0.729444 -0.352013,0.09765 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:export-ydpi="888.16077"
+             inkscape:export-xdpi="888.16077"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back.png"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path7032-6-3-6-0-9-9-97-7-3-5"
+             d="m 64.455016,33.290935 0.0012,-0.07805 -1.543395,0.0017 -7.59e-4,0.07668 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
       </g>
     </g>
     <g
-       transform="translate(62.863785,1.692046)"
-       id="g4720-9"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ff_big.png"
-       inkscape:export-xdpi="977.44684"
-       inkscape:export-ydpi="977.44684">
+       id="g9672"
+       transform="translate(-7.1243993,-221.48489)">
       <g
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4586-3-9"
-         transform="matrix(0.33765768,0,0,1,10.445758,-0.00244945)">
-        <path
-           style="fill:url(#linearGradient4584-5-0);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576-9-1"
-           inkscape:connector-curvature="0" />
+         transform="matrix(8.4891828,0,0,8.4891828,25.368477,583.19167)"
+         id="g8934">
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.769116,0.0073 0.07364,0.9981615 -0.6935087,0.03393 0.017018,-1.0805781 1.3804607,-0.035426 z"
-           id="path4574-3-4"
+           d="m 65.754648,30.762283 -0.21085,-0.0017 0.0096,0.882861 -0.34847,-0.08926 0.434879,0.733101 0.467764,-0.729444 -0.352013,0.09765 z"
+           id="path7032-6-3-6-0-9-9-97-7-3-4"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
-      </g>
-      <g
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4586-3-5-9"
-         transform="matrix(0.30793803,0,0,1,11.526216,-0.05122005)">
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
+           inkscape:export-xdpi="888.16077"
+           inkscape:export-ydpi="888.16077" />
         <path
-           style="fill:url(#linearGradient4584-5-8-0);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576-9-9-1"
-           inkscape:connector-curvature="0" />
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 66.427126,33.290935 0.0012,-0.07805 -1.543395,0.0017 -7.59e-4,0.07668 z"
+           id="path7032-6-3-6-0-9-9-97-7-3-5-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
+           inkscape:export-xdpi="888.16077"
+           inkscape:export-ydpi="888.16077" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.814584,0.030738 0.07364,0.9981625 -0.6555468,0.0105 0.017018,-1.0805786 1.3879668,-0.035426 z"
-           id="path4574-3-5-0"
+           d="m 66.06051,32.341197 6.29e-4,-0.07805 -0.809381,0.0017 -3.98e-4,0.07668 z"
+           id="path7032-6-3-6-0-9-9-97-7-3-5-0-4"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
+           inkscape:export-xdpi="888.16077"
+           inkscape:export-ydpi="888.16077" />
       </g>
+    </g>
+    <g
+       id="g9678"
+       transform="translate(-2.5403638,-220.62543)">
       <g
-         transform="matrix(0.81929493,0,0,0.81929493,13.891593,1.9839848)"
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4436-4-75">
+         inkscape:export-ydpi="888.16077"
+         inkscape:export-xdpi="888.16077"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_export.png"
+         id="g8929-6"
+         transform="matrix(8.4891828,0,0,-8.4891828,63.186139,1126.0688)">
         <g
-           id="g4401-52-8"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
-           inkscape:export-xdpi="799"
-           inkscape:export-ydpi="799"
-           transform="matrix(0.86458333,0,0,1,0.54589844,0)">
+           id="g8831-2">
           <path
-             sodipodi:nodetypes="ccccccccccc"
+             inkscape:export-ydpi="888.16077"
+             inkscape:export-xdpi="888.16077"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back.png"
+             sodipodi:nodetypes="cccccccc"
              inkscape:connector-curvature="0"
-             id="path4387-2-7"
-             d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
+             id="path7032-6-3-6-0-9-9-97-7-3-1"
+             d="m 63.782537,30.75963 -0.21085,-0.0017 0.0096,1.851611 -0.34847,-0.08926 0.434879,0.733101 0.467764,-0.729444 -0.352013,0.09765 z"
              style="fill:#008700;fill-opacity:1;stroke:none" />
           <path
+             inkscape:export-ydpi="888.16077"
+             inkscape:export-xdpi="888.16077"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back.png"
+             sodipodi:nodetypes="ccccc"
              inkscape:connector-curvature="0"
-             id="path4389-0-0"
-             d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
-             style="fill:#008700;fill-opacity:0.3942308;stroke:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path4399-0-4"
-             d="m 1.1269514,11.335273 2.662699,-0.806544"
-             style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
+             id="path7032-6-3-6-0-9-9-97-7-3-5-9"
+             d="m 64.455016,33.290935 0.0012,-0.07805 -1.543395,0.0017 -7.59e-4,0.07668 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
         </g>
       </g>
     </g>
     <g
-       transform="matrix(-1,0,0,1,80.636215,1.692046)"
-       id="g4720-8-8"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/rw_big.png"
-       inkscape:export-xdpi="977.44684"
-       inkscape:export-ydpi="977.44684">
+       id="g9684"
+       transform="translate(6.3781291,-220.63667)">
       <g
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4586-3-8-0"
-         transform="matrix(0.33765768,0,0,1,10.445758,-0.00244945)">
+         inkscape:export-ydpi="888.16077"
+         inkscape:export-xdpi="888.16077"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_front_one.png"
+         id="g8934-8"
+         transform="matrix(8.4891828,0,0,-8.4891828,63.186139,1126.0913)">
         <path
-           style="fill:url(#linearGradient4584-5-9-9);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576-9-7-4"
-           inkscape:connector-curvature="0" />
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 65.754648,30.762283 -0.21085,-0.0017 0.0096,0.882861 -0.34847,-0.08926 0.434879,0.733101 0.467764,-0.729444 -0.352013,0.09765 z"
+           id="path7032-6-3-6-0-9-9-97-7-3-4-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
+           inkscape:export-xdpi="888.16077"
+           inkscape:export-ydpi="888.16077" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.769116,0.0073 0.07364,0.9981615 -0.6935087,0.03393 0.017018,-1.0805781 1.3804607,-0.035426 z"
-           id="path4574-3-2-2"
+           d="m 66.427126,33.290935 0.0012,-0.07805 -1.543395,0.0017 -7.59e-4,0.07668 z"
+           id="path7032-6-3-6-0-9-9-97-7-3-5-0-1"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
+           inkscape:export-xdpi="888.16077"
+           inkscape:export-ydpi="888.16077" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 66.06051,32.341197 6.29e-4,-0.07805 -0.809381,0.0017 -3.98e-4,0.07668 z"
+           id="path7032-6-3-6-0-9-9-97-7-3-5-0-4-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
+           inkscape:export-xdpi="888.16077"
+           inkscape:export-ydpi="888.16077" />
       </g>
+    </g>
+    <g
+       id="g9264"
+       transform="translate(-143.19859,-239.32063)">
       <g
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4586-3-5-2-9"
-         transform="matrix(0.30793803,0,0,1,11.526216,-0.05122005)">
+         inkscape:export-ydpi="11912.27"
+         inkscape:export-xdpi="11912.27"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/player.png"
+         transform="matrix(8.4891828,0,0,8.4891828,-23.077437,426.72412)"
+         id="g4335">
         <path
-           style="fill:url(#linearGradient4584-5-8-7-9);fill-opacity:1;stroke:none"
-           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
-           id="path4576-9-9-4-6"
-           inkscape:connector-curvature="0" />
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 81.200849,30.196205 -2.612854,0.06296 0,0.550903 -0.456462,0.01574 0,-0.409242 -0.645343,-0.01574 0,1.054584 0.692563,-0.01574 0.01574,-0.299061 0.377762,-0.03148 0.04721,0.865705 2.534152,-0.03148 z"
+           id="path5081-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
+           inkscape:export-xdpi="170"
+           inkscape:export-ydpi="170" />
         <path
+           inkscape:connector-curvature="0"
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.814584,0.030738 0.07364,0.9981625 -0.6555468,0.0105 0.017018,-1.0805786 1.3879668,-0.035426 z"
-           id="path4574-3-5-9-1"
+           d="m 79.280558,28.795339 c -0.382896,0 -0.692563,0.348591 -0.692563,0.771263 0,0.422672 0.309667,0.755524 0.692563,0.755524 0.382897,0 0.692564,-0.332852 0.692564,-0.755524 0,-0.422672 -0.309667,-0.771263 -0.692564,-0.771263 z m 0.0787,0.409242 c 0.190726,0 0.346282,0.182963 0.346282,0.393501 0,0.21054 -0.155556,0.377762 -0.346282,0.377762 -0.190726,0 -0.346281,-0.167222 -0.346281,-0.377762 0,-0.210538 0.155555,-0.393501 0.346281,-0.393501 z"
+           id="path5083-3-2-5"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
+           inkscape:export-xdpi="170"
+           inkscape:export-ydpi="170" />
+        <path
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 80.571245,28.749533 c 0.382896,0 0.692564,0.348591 0.692564,0.771264 0,0.422672 -0.309668,0.755524 -0.692564,0.755524 -0.382896,0 -0.692564,-0.332852 -0.692564,-0.755524 0,-0.422673 0.309668,-0.771264 0.692564,-0.771264 z m -0.0787,0.409242 c -0.190726,0 -0.346282,0.182963 -0.346282,0.393501 0,0.21054 0.155556,0.377763 0.346282,0.377763 0.190727,0 0.346282,-0.167223 0.346282,-0.377763 0,-0.210538 -0.155555,-0.393501 -0.346282,-0.393501 z"
+           id="path5083-3-2-7-9"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
+           inkscape:export-xdpi="170"
+           inkscape:export-ydpi="170" />
       </g>
+    </g>
+    <g
+       id="g8957"
+       transform="translate(-87.675918,-172.99749)">
       <g
-         transform="matrix(0.81929493,0,0,0.81929493,13.891593,1.9839848)"
-         inkscape:export-ydpi="1018.1176"
-         inkscape:export-xdpi="1018.1176"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
-         id="g4436-4-7-0">
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         inkscape:export-ydpi="11912.27"
+         inkscape:export-xdpi="11912.27"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/player.png"
+         id="g8175">
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 73.176672,14.94479 4.0089,-0.03817 0.175575,3.223609 -4.082409,0.189017 z"
+           id="path4477-1-8-1-0-9-44"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="ccccc" />
         <g
-           id="g4401-52-7-4"
-           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
-           inkscape:export-xdpi="799"
-           inkscape:export-ydpi="799"
-           transform="matrix(0.86458333,0,0,1,0.54589844,0)">
+           id="g4401-5-6-3"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
+           inkscape:export-xdpi="1008"
+           inkscape:export-ydpi="1008"
+           transform="matrix(0.86458333,0,0,1,73.295172,6.4215903)">
           <path
              sodipodi:nodetypes="ccccccccccc"
              inkscape:connector-curvature="0"
-             id="path4387-2-9-2"
+             id="path4387-9-9-1"
              d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
              style="fill:#008700;fill-opacity:1;stroke:none" />
           <path
              inkscape:connector-curvature="0"
-             id="path4389-0-2-2"
+             id="path4389-7-8-2"
              d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
              style="fill:#008700;fill-opacity:0.3942308;stroke:none" />
           <path
              sodipodi:nodetypes="cc"
              inkscape:connector-curvature="0"
-             id="path4399-0-0-2"
-             d="m 1.1269514,11.335273 2.662699,-0.806544"
+             id="path4399-2-7-0"
+             d="M 1.2805659,9.2180855 3.825795,10.520916"
              style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
         </g>
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.25016239;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 72.419832,18.525879 0.1606,-3.767735"
+           id="path4477-1-8-1-0-9-44-3"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.25016239;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 78.017032,18.277271 77.815607,14.77197"
+           id="path4477-1-8-1-0-9-44-3-4"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.788058,15.436071 -0.607367,0.03972"
+           id="path4477-1-8-1-0-9-44-3-4-6"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.897434,16.232946 -0.607367,0.03972"
+           id="path4477-1-8-1-0-9-44-3-4-6-1"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.928684,16.982946 -0.607367,0.03972"
+           id="path4477-1-8-1-0-9-44-3-4-6-1-7"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 77.928684,17.748571 -0.607367,0.03972"
+           id="path4477-1-8-1-0-9-44-3-4-6-1-7-5"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 73.131809,15.436071 -0.607367,0.03972"
+           id="path4477-1-8-1-0-9-44-3-4-6-1-7-5-6"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 73.194309,16.232946 -0.747992,0.05535"
+           id="path4477-1-8-1-0-9-44-3-4-6-1-7-5-6-2"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 73.194309,16.982946 -0.794867,0.05535"
+           id="path4477-1-8-1-0-9-44-3-4-6-1-7-5-6-3"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 73.163059,17.748571 -0.794867,0.03972"
+           id="path4477-1-8-1-0-9-44-3-4-6-1-7-5-6-9"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="cc" />
       </g>
     </g>
     <g
-       id="g7224"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/play.png"
-       inkscape:export-xdpi="960"
-       inkscape:export-ydpi="960">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4389-9"
-         d="m 70.998868,11.519096 0.02866,1.381068 1.700325,-0.596622 z"
-         style="fill:#73aec8;fill-opacity:0.50678735;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4387-5"
-         d="m 70.870401,10.957865 c -0.02934,-0.03151 -0.05867,-0.06302 -0.08801,-0.09454 0,0.833334 0,1.666668 0,2.500001 0.864583,-0.302083 1.729166,-0.604167 2.59375,-0.90625 -0.797772,-0.476039 -1.595544,-0.952079 -2.393315,-1.428118 -0.04062,0.05305 -0.08124,0.106107 -0.121863,0.15916 0.02377,0.126264 0.04754,0.252528 0.0713,0.378792 0.472393,0.220646 0.944787,0.441292 1.417181,0.661938 -0.396267,0.159409 -0.670953,0.279756 -1.06722,0.439165 -0.0101,0.0079 -0.145124,-1.319915 -0.145124,-1.319915 -0.05963,-0.130078 -0.207067,-0.260155 -0.266699,-0.390233 z"
-         style="fill:#00a2da;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4399-4"
-         d="M 70.865134,13.242669 73.16726,12.436125"
-         style="fill:none;stroke:#ffffff;stroke-width:0.09298298;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
-      <rect
-         y="10.839892"
-         x="70.563644"
-         height="2.546875"
-         width="2.8125"
-         id="rect4472-9"
-         style="fill:#ffffff;fill-opacity:0;stroke:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4399-4-8"
-         d="m 71.327383,12.721865 1.042592,-0.430894"
-         style="fill:none;stroke:#ffffff;stroke-width:0.09298298;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
-    </g>
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect4472-8-7-3-5"
-       width="2.8125"
-       height="2.546875"
-       x="-65.90625"
-       y="15.854369"
-       transform="scale(-1,1)"
-       inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/stop.png"
-       inkscape:export-xdpi="900"
-       inkscape:export-ydpi="900" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 67.718846,15.24605 -1.759204,0.645573 -1.300626,0.0092 0.959245,-0.341677 1.360878,-0.02273 0.754664,-0.275212 c -0.05056,-0.0026 -2.11542,-0.01031 -2.165983,-0.01295 l -1.727543,0.61899 -0.512685,1.916875 0.09889,0.11943 3.090736,0.02568 -0.134379,-0.582516 -0.243754,-1.020016 -0.576505,-0.102075 0.319389,1.185662 -1.902024,-0.01294 0.243583,-1.143078 1.922524,-0.0099 1.329654,-0.5099 0.374321,0.955276 -1.495469,0.657342 0.163348,0.577993 1.798012,-1.001491 z"
-       id="path4574-5-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccc" />
-    <g
-       transform="matrix(-0.6054765,0.79586319,-0.79586319,-0.6054765,93.944731,-25.615435)"
-       id="g5236-0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-       inkscape:export-xdpi="736.59003"
-       inkscape:export-ydpi="736.59003">
-      <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4350-5"
-         d="M 42.140214,6.7965104 41.096336,6.5417208 41.229606,7.7484091 42.484654,7.5995063 42.266616,7.301418 41.502271,7.4346763 41.402792,7.017865 42.238932,7.109192 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="ccccczc"
-         inkscape:connector-curvature="0"
-         id="path4352-7"
-         d="m 41.218515,7.7809647 c 0.05954,-0.1151733 0.04532,-0.5732844 -0.0103,-0.9705059 C 41.064512,5.919346 40.386246,6.3888145 40.04495,6.4021871 c -0.431697,-0.028427 0.0081,-1.1549823 -0.0615,-1.5055589 -0.148936,0.2997617 -0.639902,0.7059498 -0.657937,1.0325403 -0.252944,0.7792545 -0.03399,1.7892681 0.372616,2.0762826 0.406616,0.2870147 1.202493,0.3349163 1.520354,-0.2244814 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="cccscsc"
-         inkscape:connector-curvature="0"
-         id="path4354-7"
-         d="m 39.636532,6.7186813 c 0.0462,0.7665583 0.590039,0.4550748 0.883299,0.1166901 0.388395,-0.1370162 0.687126,1.0741156 0.03376,1.1784466 -0.159485,0.081196 -0.539285,-0.1136201 -0.742394,-0.3328225 -0.05079,-0.054806 0.39559,0.3442611 0.723802,-0.056815 -0.42545,0.1313461 -0.881874,-0.056526 -0.944807,-0.3554733 -0.03442,-0.1634874 -0.03034,-0.3485938 0.04633,-0.5500258 z"
-         style="fill:#ffffff;fill-opacity:0.47058824;stroke:none" />
-      <path
-         inkscape:export-ydpi="1126.7192"
-         inkscape:export-xdpi="1126.7192"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/brush.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4364-7"
-         d="m 41.808079,6.854845 c -0.0091,0.2233194 0.09177,0.5475912 0.238617,0.6974905"
-         style="fill:none;stroke:#008700;stroke-width:0.16613059;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <g
-       id="g6266"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/ink.png"
-       inkscape:export-xdpi="723.53003"
-       inkscape:export-ydpi="723.53003"
-       transform="translate(2.3749999,-2.4843749)">
-      <path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:export-ydpi="1152.0601"
-         inkscape:export-xdpi="1152.0601"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
-         inkscape:connector-curvature="0"
-         id="path4054-4"
-         d="m 66.940889,5.0054046 -2.563263,1.347923 -0.142631,0.4617028 0.209901,-0.2629638 c 0.164057,0.1197191 -0.506946,0.5682043 -0.491977,0.7340303 l 1.419404,0.8172291 0.165498,-0.1358959 0.220139,-0.037051 0.06319,-0.057588 0.313194,-0.1825881 z"
-         style="fill:url(#linearGradient6271);fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="1152.0601"
-         inkscape:export-xdpi="1152.0601"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
-         sodipodi:nodetypes="cccccccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4052-3"
-         d="m 67.062423,4.8286289 -2.778221,1.4537367 0.03314,0.397748 0.509019,0.288372 0.142465,0.074619 0.451277,-0.5704947 c 0.08373,-0.081615 0.167467,-0.1632296 0.251201,-0.2448444 l 0.671047,-0.4879124 -0.500068,0.8396615 -0.687567,0.6521615 0.145947,0.1997375 0.479894,0.457012 0.433898,-0.04008 0.816158,-2.782011 -0.243068,0.06629 -0.713482,2.49766 -0.227212,-0.03693 -0.47548,-0.377546 0.61739,-0.4996185 0.682992,-1.4147135 -1.310864,0.8733385 -0.386663,0.6767205 -0.259134,-0.149317 -0.165729,-0.287263 2.40257,-1.321154 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="1152.0601"
-         inkscape:export-xdpi="1152.0601"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/selection_big.png"
-         sodipodi:nodetypes="ccczccccc"
-         inkscape:connector-curvature="0"
-         id="path4052-3-5"
-         d="m 65.768209,7.9360162 -1.322532,-1.144852 c -0.340292,0.094784 -0.507022,0.3499488 -0.28913,0.5952877 0.192701,0.1382872 0.571818,0.4893365 0.772119,0.6087091 0.2003,0.1193726 0.451528,0.2453799 0.475395,0.089038 C 64.779816,7.6658256 64.634402,7.4310444 64.2797,7.2234656 64.2852,7.0690754 64.34036,7.0829295 64.402046,7.0843996 l 1.135024,0.8897645 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:#008700;stroke:#005600;stroke-width:0.20000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"
-       id="path6273"
-       sodipodi:cx="66.611671"
-       sodipodi:cy="21.720903"
-       sodipodi:rx="1.6904272"
-       sodipodi:ry="1.6904272"
-       d="m 68.302099,21.720903 a 1.6904272,1.6904272 0 1 1 -4.8e-5,-0.01267"
-       sodipodi:start="0"
-       sodipodi:end="6.2756908"
-       sodipodi:open="true"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pen_properties.png"
-       inkscape:export-xdpi="1001.74"
-       inkscape:export-ydpi="1001.74" />
-    <g
-       id="g6311"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/delete_big.png"
-       inkscape:export-xdpi="783.26001"
-       inkscape:export-ydpi="783.26001">
-      <path
-         inkscape:export-ydpi="464.06003"
-         inkscape:export-xdpi="464.06003"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/delete.png"
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path5037"
-         d="m 24.72664,18.837235 -0.220971,1.104854 4.596194,-0.0221 -0.552427,-1.171145 -1.635184,0.464039 0,-0.640816 -0.950175,0 0.441942,0.552427 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="464.06003"
-         inkscape:export-xdpi="464.06003"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/delete.png"
-         sodipodi:nodetypes="ccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path5039"
-         d="m 25.190679,20.229351 0.06361,2.36929 -0.288372,0.01183 -0.21228,0.81001 4.281933,-0.0092 -0.220971,-0.839689 -0.37565,0.04419 -0.132583,-2.496971 -0.685009,0.0221 0.198873,2.80633 -2.099223,0 -0.0221,-2.894718 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="464.06003"
-         inkscape:export-xdpi="464.06003"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/delete.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect5041"
-         d="m 26.045439,20.353032 0.457051,-0.171875 -0.06771,2.578125 -0.363948,-0.01563 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="464.06003"
-         inkscape:export-xdpi="464.06003"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/delete.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect5041-9"
-         d="m 27.253263,20.305406 -0.457051,-0.171875 0.06771,2.578125 0.363948,-0.01563 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccscc"
-         inkscape:connector-curvature="0"
-         id="path6281"
-         d="m 25.65625,19.862182 -0.203125,3.265625 c 0,0 2.796875,0.1875 2.765625,0.125 -0.03125,-0.0625 0.07812,-3.359375 0.07812,-3.359375 z"
-         style="fill:url(#linearGradient6319);fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="477.82242"
-         inkscape:export-xdpi="477.82242"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/cut.png"
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path5015-6"
-         d="M 28.673501,19.59301 27.484483,19.250918 28.39493,18.994497 z"
-         style="fill:#ffffff;fill-opacity:0.15384617;stroke:none" />
-    </g>
-    <g
-       id="g4300-4"
-       transform="matrix(0.10965283,-1.0485111,0.99457601,0.10401232,-30.806624,34.551549)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign_big.png"
-       inkscape:export-xdpi="1676.08"
-       inkscape:export-ydpi="1676.08">
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:export-ydpi="605"
-         inkscape:export-xdpi="605"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
-         inkscape:connector-curvature="0"
-         id="path4296-2"
-         d="M 5.116241,32.043763 7.1358741,31.917972 6.2699467,30.505509 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:export-ydpi="605"
-         inkscape:export-xdpi="605"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
-         inkscape:connector-curvature="0"
-         id="path4298-5"
-         d="M 5.7895791,31.676479 6.5513186,31.631271 6.2680328,31.131207 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    </g>
-    <g
-       id="g4300-4-7"
-       transform="matrix(0.10965283,-1.0485111,0.99457601,0.10401232,-32.385111,34.551549)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign_big.png"
-       inkscape:export-xdpi="1676.08"
-       inkscape:export-ydpi="1676.08">
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:export-ydpi="605"
-         inkscape:export-xdpi="605"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
-         inkscape:connector-curvature="0"
-         id="path4296-2-9"
-         d="M 5.116241,32.043763 7.1358741,31.917972 6.2699467,30.505509 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:export-ydpi="605"
-         inkscape:export-xdpi="605"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/minus_sign.png"
-         inkscape:connector-curvature="0"
-         id="path4298-5-5"
-         d="M 5.7895791,31.676479 6.5513186,31.631271 6.2680328,31.131207 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    </g>
-    <path
-       style="fill:url(#linearGradient4132);fill-opacity:1;stroke:#008700;stroke-width:0.22763354;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 67.305098,27.211473 c 0.458984,1.338013 -0.568603,2.106717 -1.450497,2.106717 -0.881894,0 -1.596812,-0.702902 -1.596812,-1.569974 0,-0.867074 0.714918,-1.569976 1.596812,-1.569976 0.63851,0 1.215637,0.373979 1.467421,0.95089"
-       id="path4545-8-2-1-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/links_big.png"
-       inkscape:export-xdpi="1072.1801"
-       inkscape:export-ydpi="1072.1801" />
-    <path
-       style="fill:#007700;fill-opacity:1;stroke:none"
-       d="m 65.070306,26.518523 -0.121094,0.15625 0.04442,0.166513 -0.165509,-0.01026 -0.242187,0.3125 0.296875,0.09375 -0.15625,0.578124 0.171875,-0.15625 0.15625,0.359375 0.265625,0.04687 -0.07813,0.40625 0.28125,0.15625 0.25,0.59375 0.234375,-1 -0.487841,-0.263729 -0.371534,0.02935 -0.03906,-0.320312 0.273438,-0.0078 0.105474,0.140625 -0.02734,-0.25 0.207031,-0.523436 0.148438,0.0039 -0.07031,-0.115233 0.105468,-0.228516 -0.343749,0.08202 0.140625,-0.296875 z"
-       id="path4154"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/links_big.png"
-       inkscape:export-xdpi="1072.1801"
-       inkscape:export-ydpi="1072.1801" />
-    <path
-       style="fill:#007700;fill-opacity:1;stroke:none"
-       d="m 66.289063,26.35437 -0.07812,0.04492 0.03125,0.123048 0.117191,0.152343 0.15625,0.0625 -0.03125,0.101563 -0.109375,0.0625 -0.02344,0.15625 0.15625,-0.08594 0.08594,0.15625 0.1875,-0.113281 0.248047,-0.0625 0.111328,0.113281 0.01953,0.125 -0.269531,0.281253 -0.109375,-0.148437 -0.125,0.125 -0.148437,-0.21875 -0.15625,-0.125 -0.25,0.101562 -0.08594,0.08594 -0.102113,0.257583 0.07085,0.226791 c 0.114259,0.06212 0.129174,0.0098 0.234375,0.07031 l 0.07032,0.128906 0.156251,0.08594 0.04205,0.596546 0.117188,0.109375 0.210937,-0.07813 10e-7,-0.28125 0.0673,-0.709827 -0.179688,-0.195312 0.210938,0.132807 0.04687,0.164062 0.101562,-0.0078 0.0625,-0.101563 0.175782,-0.02344 c 0.01878,-0.352396 -0.14177,-0.802171 -0.432694,-0.992906 -0.166614,-0.17495 -0.42905,-0.267798 -0.578998,-0.319594 z"
-       id="path4924"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/links_big.png"
-       inkscape:export-xdpi="1072.1801"
-       inkscape:export-ydpi="1072.1801" />
+       id="g8574"
+       transform="translate(5.4261757,-208.9536)">
+      <g
+         transform="matrix(8.4891828,0,0,8.4891828,19.368477,266.19167)"
+         inkscape:export-ydpi="511.89999"
+         inkscape:export-xdpi="511.89999"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/security_frame.png"
+         id="g5323">
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 71.49909,4.2030853 4.296837,0.00919 0.0037,3.4437752 -4.302413,-0.021662 z"
+           id="path4477-1-8-1-0-9-47-0"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 72.744534,5.2514209 1.806918,0.00361 0.0016,1.3526841 -1.809263,-0.00851 z"
+           id="path4477-1-8-1-0-9-47"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 71.01121,6.0855989 0.0026,-0.311928 0.98174,-2.69e-4 -0.0062,0.312332 z"
+           id="path4477-1-8-1-0-9-47-6-8-3"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 75.301301,6.0855989 0.0026,-0.311928 0.98174,-2.69e-4 -0.0062,0.312332 z"
+           id="path4477-1-8-1-0-9-47-6-8-5"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 72.77738,3.7015257 0.311928,0.00263 2.69e-4,0.9817392 -0.312332,-0.00618 z"
+           id="path4477-1-8-1-0-9-47-6"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 74.20741,3.7015257 0.311928,0.00263 2.69e-4,0.9817392 -0.312332,-0.00618 z"
+           id="path4477-1-8-1-0-9-47-6-8"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 72.77738,7.1390257 0.311928,0.00263 2.69e-4,0.9817392 -0.312332,-0.00618 z"
+           id="path4477-1-8-1-0-9-47-6-85"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 74.20741,7.1390257 0.311928,0.00263 2.69e-4,0.9817392 -0.312332,-0.00618 z"
+           id="path4477-1-8-1-0-9-47-6-8-8"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+           inkscape:export-xdpi="392.73001"
+           inkscape:export-ydpi="392.73001"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
     <g
-       id="g4227"
-       transform="translate(-3.3370677,-0.43101981)"
-       inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_scene_big.png"
-       inkscape:export-xdpi="1174.63"
-       inkscape:export-ydpi="1174.63">
+       id="g8585"
+       transform="translate(5.3709512,-208.06277)">
       <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
+         sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
-         id="path6081-0-6-5"
-         d="m 75.275366,23.792522 2.719787,0.0711 0.02298,-2.909443 -2.755339,0.08888 z"
-         style="fill:none;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
+         id="rect3928-2-7"
+         d="m 682.09645,311.40146 2.21642,-3.1615 c 9.38358,0.46424 18.77038,0.61328 28.1625,0.71151 l 4.09229,2.7475 -0.3203,18.0756 -34.88523,0.53057 z"
+         style="fill:none;stroke:none" />
+      <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
+         sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="path5783-9-2-8-9-7"
-         d="m 75.261162,23.893166 0.0089,-2.877483 2.790496,-0.08799 -0.0089,2.902622 -2.45085,-0.04964"
-         style="fill:none;stroke:#008700;stroke-width:0.28442213;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="ccccc" />
+         id="path4327-3"
+         d="m 685.75607,312.25677 -0.4917,15.22276 28.2384,-0.34298 -0.99291,-14.29426 z"
+         style="fill:none;stroke:#008700;stroke-width:0.84891832;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
+         sodipodi:nodetypes="ccccccccccccccc"
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
          inkscape:connector-curvature="0"
-         id="path5785-7-9-0-0-9-3"
-         d="m 76.318968,23.527117 c 0,-0.05028 -0.04786,-2.204814 -0.04786,-2.204814"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
+         id="path3132-4-4"
+         d="m 680.44873,314.57548 -0.0552,17.55702 37.70483,-0.18762 -0.65655,-21.6662 -4.89424,-2.64092 -28.6239,-0.29609 -3.95472,6.20091 3.0508,-0.26253 2.6691,-3.56609 26.52199,-0.0459 2.79235,2.29891 0.28133,17.72689 -31.88965,0 -0.50782,-15.30598 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
+         sodipodi:nodetypes="csssc"
          inkscape:connector-curvature="0"
-         id="path5785-7-6-8-9-0-4-1-6"
-         d="m 77.825141,22.016584 c -0.05028,0 -2.457136,0.02882 -2.457136,0.02882"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path4303-1"
+         d="m 707.529,319.98468 c 0,4.09492 -3.5567,7.41451 -7.94411,7.41451 -4.38742,0 -7.94411,-3.31959 -7.94411,-7.41451 0,-4.09492 3.04529,-7.43895 7.4145,-7.83819 3.47754,-0.31777 8.90572,1.73517 8.89986,7.4181"
+         style="fill:none;stroke:#008700;stroke-width:1.91738439;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+      <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
+         transform="matrix(6.8883176,0,0,6.8883176,329.16111,269.03036)"
+         sodipodi:open="true"
+         sodipodi:end="6.2342569"
+         sodipodi:start="0"
+         d="m 54.491418,7.3577971 c 0,0.3661166 -0.30669,0.6629127 -0.68501,0.6629127 -0.37832,0 -0.68501,-0.2967961 -0.68501,-0.6629127 0,-0.3661165 0.30669,-0.6629126 0.68501,-0.6629126 0.365297,0 0.666324,0.2774004 0.68419,0.6304903"
+         sodipodi:ry="0.66291261"
+         sodipodi:rx="0.68500972"
+         sodipodi:cy="7.3577971"
+         sodipodi:cx="53.806408"
+         id="path4325-7"
+         style="fill:url(#linearGradient11147);fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
       <path
-         inkscape:export-ydpi="292"
-         inkscape:export-xdpi="292"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 78.096722,22.917712 c -0.05028,0 -2.457135,0.02882 -2.457135,0.02882"
-         id="path5785-7-6-8-9-0-4-1-0-6"
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
+         sodipodi:nodetypes="cccsccccc"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4329-3"
+         d="m 705.8117,308.37516 -1.21931,-6.47172 7.22206,0.0938 c 0,0 -0.93792,6.84689 -1.40689,6.84689 -0.46894,0 -2.06345,-0.56275 -2.06345,-0.56275 l 0.93794,-3.93931 -1.96966,-0.0938 0.56275,4.22069 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
+         inkscape:export-ydpi="541.01862"
+         inkscape:export-xdpi="541.01862"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
+         sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
-         id="path5785-7-9-0-0-9-3-5"
-         d="m 77.194577,23.531408 c 0,-0.05028 -0.04786,-2.39744 -0.04786,-2.39744"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
+         id="rect4341-4"
+         d="m 709.10605,311.47976 4.50988,0.0663 0.0662,2.52023 -3.6477,0.26528 z"
+         style="fill:#008700;fill-opacity:1;stroke:none" />
     </g>
     <g
-       id="g4227-7"
-       transform="translate(0.29273787,-0.43101981)"
-       inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_layer_big.png"
-       inkscape:export-xdpi="1174.63"
-       inkscape:export-ydpi="1174.63">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6081-0-6-5-5"
-         d="m 75.275366,23.792522 2.719787,0.0711 0.02298,-2.909443 -2.755339,0.08888 z"
-         style="fill:none;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5783-9-2-8-9-7-5"
-         d="m 75.261162,23.893166 0.0089,-2.877483 2.790496,-0.08799 -0.0089,2.902622 -2.45085,-0.04964"
-         style="fill:none;stroke:#008700;stroke-width:0.28442213;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5785-7-9-0-0-9-3-4"
-         d="m 76.318968,23.527117 c 0,-0.05028 -0.04786,-2.204814 -0.04786,-2.204814"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
+       id="g9508"
+       transform="translate(65.057125,-226.94308)">
       <path
          sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="433.32001"
+         inkscape:export-xdpi="433.32001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
          inkscape:connector-curvature="0"
-         id="path5785-7-6-8-9-0-4-1-6-1"
-         d="m 77.825141,22.016584 c -0.05028,0 -2.457136,0.02882 -2.457136,0.02882"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path5062-7-4-7-6"
+         d="m 627.22527,768.19962 39.46501,-0.9285"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="292"
-         inkscape:export-xdpi="292"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 78.096722,22.917712 c -0.05028,0 -2.457135,0.02882 -2.457135,0.02882"
-         id="path5785-7-6-8-9-0-4-1-0-6-6"
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="433.32001"
+         inkscape:export-xdpi="433.32001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path5062-7-4-2-5-0"
+         d="m 626.58872,797.41365 39.34569,-1.59172"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="433.32001"
+         inkscape:export-xdpi="433.32001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
          inkscape:connector-curvature="0"
-         id="path5785-7-9-0-0-9-3-5-4"
-         d="m 77.194577,23.531408 c 0,-0.05028 -0.04786,-2.39744 -0.04786,-2.39744"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
-    </g>
-    <g
-       id="g4227-1"
-       transform="translate(3.9225452,-0.43101981)"
-       inkscape:export-filename="/home/user/tupi/src/themes/default/icons/add_frame_big.png"
-       inkscape:export-xdpi="1174.63"
-       inkscape:export-ydpi="1174.63">
+         id="path5062-7-4-5-6-6"
+         d="m 631.14478,764.9339 0.42072,35.37972"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="433.32001"
+         inkscape:export-xdpi="433.32001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
          inkscape:connector-curvature="0"
-         id="path6081-0-6-5-51"
-         d="m 75.275366,23.792522 2.719787,0.0711 0.02298,-2.909443 -2.755339,0.08888 z"
-         style="fill:none;stroke:none"
-         sodipodi:nodetypes="ccccc" />
+         id="path5062-7-4-5-2-9-2"
+         d="m 663.0172,764.15137 -0.14211,35.94248"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
+         inkscape:export-ydpi="433.32001"
+         inkscape:export-xdpi="433.32001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path5783-9-2-8-9-7-9"
-         d="m 75.261162,23.893166 0.0089,-2.877483 2.790496,-0.08799 -0.0089,2.902622 -2.45085,-0.04964"
-         style="fill:none;stroke:#008700;stroke-width:0.28442213;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="ccccc" />
+         id="path5062-3-7-2-4-6"
+         d="m 654.85581,776.88194 7.73198,5.15303"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
+         inkscape:export-ydpi="433.32001"
+         inkscape:export-xdpi="433.32001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path5785-7-9-0-0-9-3-43"
-         d="m 76.318968,23.527117 c 0,-0.05028 -0.04786,-2.204814 -0.04786,-2.204814"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
+         id="path5062-3-7-0-6-3-5-6-4"
+         d="m 662.75465,781.2543 -30.08391,1.16056"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
+         inkscape:export-ydpi="433.32001"
+         inkscape:export-xdpi="433.32001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path5785-7-6-8-9-0-4-1-6-9"
-         d="m 77.825141,22.016584 c -0.05028,0 -2.457136,0.02882 -2.457136,0.02882"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path5062-3-7-2-4-2-7"
+         d="m 655.27971,786.06679 6.97433,-5.27949"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="292"
-         inkscape:export-xdpi="292"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/exposure_sheet.png"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 78.096722,22.917712 c -0.05028,0 -2.457135,0.02882 -2.457135,0.02882"
-         id="path5785-7-6-8-9-0-4-1-0-6-0"
+         inkscape:export-ydpi="433.32001"
+         inkscape:export-xdpi="433.32001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path5062-3-7-2-4-8-7"
+         d="m 640.65987,786.66887 -7.542,-4.21718"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
+         inkscape:export-ydpi="433.32001"
+         inkscape:export-xdpi="433.32001"
+         inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path5785-7-9-0-0-9-3-5-5"
-         d="m 77.194577,23.531408 c 0,-0.05028 -0.04786,-2.39744 -0.04786,-2.39744"
-         style="fill:none;stroke:#008700;stroke-width:0.17065328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
-    </g>
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect6135"
-       width="6.0104074"
-       height="6.0104074"
-       x="-16.166853"
-       y="0.093701355"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/undo.png"
-       inkscape:export-xdpi="14974.02"
-       inkscape:export-ydpi="14974.02" />
-    <g
-       id="g3961-1"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/undo.png"
-       inkscape:export-xdpi="14974.02"
-       inkscape:export-ydpi="14974.02"
-       transform="matrix(1.9571546,0,0,1.9571546,-17.947427,-9.7762333)">
-      <g
-         inkscape:export-ydpi="1200"
-         inkscape:export-xdpi="1200"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
-         transform="translate(-0.171875,-0.59375)"
-         id="g3919-5">
-        <path
-           style="fill:url(#linearGradient4005-5);fill-opacity:1;stroke:none"
-           d="M 3.6570679,6.5899207 C 3.2022362,6.3063414 2.3828026,6.5144224 1.7898641,6.8274644 1.7861812,6.7132961 1.7051586,6.5549337 1.6572815,6.5070566 1.5136504,6.7943187 1.3700194,7.4461829 1.3589708,7.7776391 1.8672039,7.6450566 2.5190679,7.6229596 2.8726213,7.6450566 2.6921618,7.4940598 2.5117022,7.3430631 2.3312427,7.1920663 2.649809,6.9729368 3.2390646,6.6985648 3.6570679,6.5899207 z"
-           id="path3899-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 1.6257457,6.4537659 c 0.057292,0.049479 0.1695009,0.139036 0.28148,0.2275777 C 2.2130817,6.4433307 3.1045105,6.0948323 3.9959394,6.6412659 3.2214587,6.6469346 2.7618617,6.9840588 2.5508568,7.2438436 2.7904401,7.4417603 2.8201012,7.5291915 3.0596845,7.7271082 2.5232909,7.6159786 1.9603842,7.6248254 1.2383568,7.9938436 1.2774198,7.4287394 1.4110646,6.6543634 1.6024709,6.4486342 c 0.083333,0.1354167 0.05082,0.152698 0.084434,0.2881147 C 1.5801345,7.0570614 1.4623151,7.3610311 1.4649193,7.6813436 1.8841135,7.4831017 2.1537597,7.481838 2.6281966,7.5156155 2.4713148,7.4165038 2.4028212,7.3284407 2.2348908,7.2624747 2.3714086,7.0017328 3.0990235,6.6028841 3.6111918,6.5686373 2.6434384,6.2651949 2.0041352,6.7928442 1.7696068,6.9938436 1.6758568,6.7021769 1.6432664,6.8548076 1.5495164,6.5631409 c 0.083333,0.020833 -0.0071,-0.130208 0.076229,-0.109375 z"
-           id="path3897-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccc" />
-      </g>
-    </g>
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect6135-6"
-       width="6.0104074"
-       height="6.0104074"
-       x="-9.3167572"
-       y="0.093701355"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/redo.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03" />
-    <g
-       id="g3961-1-9"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/redo.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       transform="matrix(-1.9571546,0,0,1.9571546,-1.525776,-9.7762333)">
-      <g
-         inkscape:export-ydpi="1200"
-         inkscape:export-xdpi="1200"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
-         transform="translate(-0.171875,-0.59375)"
-         id="g3919-5-8">
-        <path
-           style="fill:url(#linearGradient4005-5-6);fill-opacity:1;stroke:none"
-           d="M 3.6570679,6.5899207 C 3.2022362,6.3063414 2.3828026,6.5144224 1.7898641,6.8274644 1.7861812,6.7132961 1.7051586,6.5549337 1.6572815,6.5070566 1.5136504,6.7943187 1.3700194,7.4461829 1.3589708,7.7776391 1.8672039,7.6450566 2.5190679,7.6229596 2.8726213,7.6450566 2.6921618,7.4940598 2.5117022,7.3430631 2.3312427,7.1920663 2.649809,6.9729368 3.2390646,6.6985648 3.6570679,6.5899207 z"
-           id="path3899-1-8"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 1.6257457,6.4537659 c 0.057292,0.049479 0.1695009,0.139036 0.28148,0.2275777 C 2.2130817,6.4433307 3.1045105,6.0948323 3.9959394,6.6412659 3.2214587,6.6469346 2.7618617,6.9840588 2.5508568,7.2438436 2.7904401,7.4417603 2.8201012,7.5291915 3.0596845,7.7271082 2.5232909,7.6159786 1.9603842,7.6248254 1.2383568,7.9938436 1.2774198,7.4287394 1.4110646,6.6543634 1.6024709,6.4486342 c 0.083333,0.1354167 0.05082,0.152698 0.084434,0.2881147 C 1.5801345,7.0570614 1.4623151,7.3610311 1.4649193,7.6813436 1.8841135,7.4831017 2.1537597,7.481838 2.6281966,7.5156155 2.4713148,7.4165038 2.4028212,7.3284407 2.2348908,7.2624747 2.3714086,7.0017328 3.0990235,6.6028841 3.6111918,6.5686373 2.6434384,6.2651949 2.0041352,6.7928442 1.7696068,6.9938436 1.6758568,6.7021769 1.6432664,6.8548076 1.5495164,6.5631409 c 0.083333,0.020833 -0.0071,-0.130208 0.076229,-0.109375 z"
-           id="path3897-0-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccc" />
-      </g>
+         id="path5062-3-7-2-4-2-2-8"
+         d="m 639.75169,777.31205 -7.10696,5.67741"
+         style="fill:none;stroke:#008700;stroke-width:2.54675484;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect6135-6-0"
-       width="6.0104074"
-       height="6.0104074"
-       x="-16.299437"
-       y="6.7670212"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/palette.png"
-       inkscape:export-xdpi="14974.02"
-       inkscape:export-ydpi="14974.02" />
     <g
-       id="g4827-6"
-       transform="matrix(0,1.5021856,-1.5021856,0,-2.934315,-44.198027)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/palette.png"
-       inkscape:export-xdpi="14974.02"
-       inkscape:export-ydpi="14974.02">
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:100;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:All Things Pink Skinny;-inkscape-font-specification:All Things Pink Skinny Thin"
+       id="text6423"
+       transform="translate(1.0571253,-184.94308)">
       <path
-         inkscape:export-ydpi="1017.6678"
-         inkscape:export-xdpi="1017.6678"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect4291-3"
-         d="m 34.260023,5.0859996 1.440663,0.1038316 -0.05192,1.6353479 -1.349809,-0.090852 z"
-         style="fill:#009aff;fill-opacity:1;stroke:none" />
+         d="m 36.061051,18.058125 -1,2.08 -1.04,2.44 c -0.586684,1.413352 -1.106683,2.600017 -1.56,3.56 -0.693349,1.493348 -1.266681,2.66668 -1.72,3.52 -0.320014,0.506679 -0.600014,0.920012 -0.84,1.24 -0.34668,0.453345 -0.706679,0.706678 -1.08,0.76 -0.560012,0.08001 -1.146678,-0.119989 -1.76,-0.6 -0.48001,-0.346655 -0.986676,-0.853321 -1.52,-1.52 -0.853342,-1.119986 -1.840007,-2.693318 -2.96,-4.72 l -2.32,-4.32 c 0.133329,2.720019 0.213329,5.01335 0.24,6.88 0.05333,1.86668 0.08,3.426678 0.08,4.68 -4e-6,1.226676 -0.01334,2.973341 -0.04,5.24 -4e-6,2.26667 -4e-6,3.853335 0,4.76 -4e-6,0.213334 -0.08,0.4 -0.24,0.56 -0.160004,0.16 -0.34667,0.24 -0.56,0.24 -0.18667,0 -0.373336,-0.08 -0.56,-0.24 -0.160003,-0.16 -0.240002,-0.346666 -0.24,-0.56 -2e-6,-0.933332 -2e-6,-2.57333 0,-4.92 0.02666,-2.373326 0.02666,-4.186657 0,-5.44 -2e-6,-1.253321 -0.01334,-2.839986 -0.04,-4.76 -0.02667,-1.946649 -0.09334,-3.759981 -0.2,-5.44 -0.08,-1.679977 -0.200002,-3.346642 -0.36,-5 -0.133335,-0.373307 -0.08,-0.693307 0.16,-0.96 0.159998,-0.133306 0.333331,-0.213306 0.52,-0.24 0.213331,-0.02664 0.399997,0.02669 0.56,0.16 0.186663,0.13336 0.306663,0.320027 0.36,0.56 0.106663,0.266693 0.399996,0.880026 0.88,1.84 l 1.52,3.16 1.64,3.04 c 1.066658,1.97335 2.013324,3.466682 2.84,4.48 0.453323,0.560013 0.853322,0.973346 1.2,1.24 l 0.4,0.4 c 0.399988,-0.45332 0.706654,-0.89332 0.92,-1.32 0.45332,-0.773319 1.013319,-1.893318 1.68,-3.36 l 1.6,-3.64 1.04,-2.44 0.92,-2.08 0.68,-1.28 c 0.133314,-0.18664 0.226648,-0.333306 0.28,-0.44 0.07998,-0.10664 0.173314,-0.18664 0.28,-0.24 0.346647,-0.293306 0.693313,-0.293306 1.04,0 0.213313,0.160027 0.386646,0.440027 0.52,0.84 0.07998,0.240026 0.159979,0.573359 0.24,1 0.106645,0.613358 0.199979,1.466691 0.28,2.56 0.05331,0.746689 0.106645,1.586688 0.16,2.52 0.05331,0.986686 0.09331,1.560019 0.12,1.72 0.933311,8.72001 2.706642,15.613336 5.32,20.68 0.10664,0.213331 0.119973,0.426664 0.04,0.64 -0.05336,0.21333 -0.186694,0.359997 -0.4,0.44 -0.186693,0.106663 -0.386693,0.13333 -0.6,0.08 -0.213359,-0.05334 -0.373359,-0.18667 -0.48,-0.4 -2.693356,-5.253331 -4.520021,-12.346657 -5.48,-21.28 -2e-5,-0.133315 -0.04002,-0.706648 -0.12,-1.72 -0.05335,-1.039979 -0.106687,-1.879978 -0.16,-2.52 -2e-5,-0.239977 -0.08002,-0.866643 -0.24,-1.88"
+         id="path8901"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="1017.6678"
-         inkscape:export-xdpi="1017.6678"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect4291-8-1"
-         d="m 37.225713,5.1768518 -1.245978,-0.038936 -0.02597,1.7521584 1.427683,-0.2076624 z"
-         style="fill:#009a00;fill-opacity:1;stroke:none" />
+         d="m 52.481676,25.058125 c -0.21334,0.02668 -0.37334,0.04002 -0.48,0.04 -0.05334,1.7e-5 -0.13334,0.01335 -0.24,0.04 -0.106673,1.7e-5 -0.186673,1.7e-5 -0.24,0 -0.266672,0.02668 -0.453339,0.08002 -0.56,0.16 -0.933338,0.480017 -1.760004,1.560016 -2.48,3.24 -0.746669,1.733346 -1.173335,3.56001 -1.28,5.48 -0.106668,2.106673 0.199998,3.826671 0.92,5.16 0.719997,1.333335 1.826662,2.053335 3.32,2.16 1.893326,0.133334 3.373324,-0.533332 4.44,-2 0.986655,-1.413329 1.466655,-3.22666 1.44,-5.44 -0.02668,-1.946656 -0.466678,-3.733321 -1.32,-5.36 -0.826676,-1.653318 -2.000008,-2.813316 -3.52,-3.48 m -2,-1.2 c 0.133328,-0.373314 0.279995,-0.599981 0.44,-0.68 0.186661,-0.106647 0.373328,-0.146647 0.56,-0.12 1.573326,0.293353 2.933325,1.026685 4.08,2.2 1.146656,1.146683 1.986655,2.453348 2.52,3.92 0.53332,1.520012 0.81332,3.08001 0.84,4.68 0.05332,2.586673 -0.533346,4.720004 -1.76,6.4 -1.413343,1.973334 -3.346675,2.866666 -5.8,2.68 -1.146671,-0.106667 -2.120004,-0.426667 -2.92,-0.96 -0.773335,-0.559999 -1.373335,-1.279998 -1.8,-2.16 -0.400001,-0.879996 -0.693334,-1.813329 -0.88,-2.8 -0.16,-0.98666 -0.213333,-1.999992 -0.16,-3.04 0.133333,-2.159989 0.599999,-4.186654 1.4,-6.08 0.906664,-2.02665 1.986663,-3.373315 3.24,-4.04 -0.02667,1.9e-5 0.05333,1.9e-5 0.24,0"
+         id="path8903"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="1017.6678"
-         inkscape:export-xdpi="1017.6678"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect4291-8-9-8"
-         d="m 35.759092,7.0198629 -1.440663,0.1038316 -0.194685,1.5834321 1.59641,-0.038936 z"
-         style="fill:#ff5900;fill-opacity:1;stroke:none" />
+         d="m 61.243551,41.778125 0,-0.2 0,-0.04 0,-0.04 0,-0.04 0,-0.4 0,-0.28 0,-0.28 0,-0.2 c -10e-7,-0.799997 0.02667,-1.45333 0.08,-1.96 l 0.08,-0.12 0,-0.24 c 0.02667,-0.399995 0.05333,-1.879994 0.08,-4.44 0.08,-5.599985 -0.09333,-11.106647 -0.52,-16.52 -0.02667,-0.239974 0.02667,-0.439974 0.16,-0.6 0.159999,-0.159974 0.346666,-0.253307 0.56,-0.28 0.213332,-0.02664 0.399998,0.04003 0.56,0.2 0.186665,0.133359 0.293331,0.306693 0.32,0.52 0.346664,4.240021 0.519997,9.440016 0.52,15.6 0.85333,-1.759988 1.439996,-2.959987 1.76,-3.6 1.093328,-1.973318 2.22666,-3.413316 3.4,-4.32 1.546657,-1.173314 3.079989,-1.386647 4.6,-0.64 1.386653,0.720018 2.186652,2.080017 2.4,4.08 0.106652,1.280013 -0.05335,2.746679 -0.48,4.4 -0.853347,3.360007 -2.386679,5.986671 -4.6,7.88 -2.213341,1.92 -5.000005,2.919999 -8.36,3 -0.240001,-10e-7 -0.440001,-0.08 -0.6,-0.24 -0.160001,-0.133334 -0.24,-0.306667 -0.24,-0.52 0,-0.24 0.09333,-0.479999 0.28,-0.72 m 1.6,-0.2 c 2.853328,-0.373332 5.119993,-1.373331 6.8,-3 1.679989,-1.653328 2.866655,-3.853325 3.56,-6.6 0.37332,-1.439988 0.519987,-2.73332 0.44,-3.88 -0.133346,-1.413317 -0.653346,-2.333317 -1.56,-2.76 -0.880011,-0.479982 -1.826676,-0.319982 -2.84,0.48 -0.960008,0.720016 -1.946673,1.986681 -2.96,3.8 -0.826672,1.493345 -1.533338,3.053343 -2.12,4.68 -0.58667,1.65334 -0.986669,3.013339 -1.2,4.08 -2e-6,0.160004 -0.02667,0.440004 -0.08,0.84 -0.02667,0.400003 -0.04,0.706669 -0.04,0.92 l 0,0.2 0,0.4 0,0.84"
+         id="path8905"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="1017.6678"
-         inkscape:export-xdpi="1017.6678"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect4291-1-6"
-         d="m 35.966757,7.0717787 1.466621,-0.012975 0.298516,1.6223689 -1.700241,-0.077874 z"
-         style="fill:#e89aff;fill-opacity:1;stroke:none" />
-    </g>
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect6135-7"
-       width="6.0104074"
-       height="6.0104074"
-       x="-9.3609505"
-       y="6.9658947"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/width.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03" />
-    <path
-       transform="matrix(1.549799,0,0,1.549799,-109.59045,-23.691936)"
-       sodipodi:type="arc"
-       style="fill:#008700;fill-opacity:1;stroke:#005600;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path6273-3"
-       sodipodi:cx="66.611671"
-       sodipodi:cy="21.720903"
-       sodipodi:rx="1.6904272"
-       sodipodi:ry="1.6904272"
-       d="m 68.302099,21.720903 a 1.6904272,1.6904272 0 1 1 -4.8e-5,-0.01267"
-       sodipodi:start="0"
-       sodipodi:end="6.2756908"
-       sodipodi:open="true"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/width.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03" />
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect6135-7-4"
-       width="6.0104074"
-       height="6.0104074"
-       x="-16.630203"
-       y="13.66948"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/opacity.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6389);fill-opacity:1;stroke:#009100;stroke-width:0.0904228;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path16171-9"
-       sodipodi:cx="42.570312"
-       sodipodi:cy="47.877808"
-       sodipodi:rx="0.7890625"
-       sodipodi:ry="0.78125"
-       d="m 43.359375,47.877808 a 0.7890625,0.78125 0 1 1 -1.578125,0 0.7890625,0.78125 0 1 1 1.578125,0 z"
-       transform="matrix(3.3531141,0,0,3.3563111,-156.36811,-144.01813)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/opacity.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03" />
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect6135-7-8"
-       width="6.0104074"
-       height="6.0104074"
-       x="-9.3855667"
-       y="13.629077"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -8.154908,19.22842 0.0023,-5.188278"
-       id="path4477-1-8-1-0-9-6-3"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -7.445551,19.22842 0.0023,-5.188278"
-       id="path4477-1-8-1-0-9-6-3-74"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -6.736193,19.22842 0.0023,-5.188278"
-       id="path4477-1-8-1-0-9-6-3-3"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -6.026835,19.22842 0.0023,-5.188278"
-       id="path4477-1-8-1-0-9-6-3-6"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -5.317475,19.22842 0.0023,-5.188278"
-       id="path4477-1-8-1-0-9-6-3-79"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -4.608118,19.22842 0.0023,-5.188278"
-       id="path4477-1-8-1-0-9-6-3-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -8.974502,14.859735 5.188278,0.0023"
-       id="path4477-1-8-1-0-9-6-3-1"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -8.974502,15.569093 5.188278,0.0023"
-       id="path4477-1-8-1-0-9-6-3-74-6"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -8.974502,16.278451 5.188278,0.0023"
-       id="path4477-1-8-1-0-9-6-3-3-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -8.974502,16.987809 5.188278,0.0023"
-       id="path4477-1-8-1-0-9-6-3-6-1"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -8.974502,17.697168 5.188278,0.0023"
-       id="path4477-1-8-1-0-9-6-3-79-6"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m -8.974502,18.406526 5.188278,0.0023"
-       id="path4477-1-8-1-0-9-6-3-0-8"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03"
-       sodipodi:nodetypes="cc" />
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect6135-2"
-       width="6.0104074"
-       height="6.0104074"
-       x="-16.829767"
-       y="20.334633"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/post.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03" />
-    <g
-       id="g6809"
-       transform="translate(12.221235,3.04745)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/post.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03">
+         d="m 79.836676,25.418125 c -0.160002,1.360016 -0.253335,2.746681 -0.28,4.16 -0.02667,1.413345 0.01333,2.866677 0.12,4.36 0.133331,1.49334 0.279998,2.840006 0.44,4.04 0.159997,1.173337 0.37333,2.640002 0.64,4.4 0.02666,0.213333 -0.02667,0.413333 -0.16,0.6 -0.133336,0.186666 -0.306669,0.293333 -0.52,0.32 -0.213336,0.02667 -0.413336,-0.02667 -0.6,-0.16 -0.186668,-0.133334 -0.293335,-0.306667 -0.32,-0.52 -0.266668,-1.759998 -0.480001,-3.226663 -0.64,-4.4 -0.133334,-1.199994 -0.266667,-2.573326 -0.4,-4.12 -0.133334,-1.546657 -0.186667,-3.053322 -0.16,-4.52 0.02667,-1.466652 0.119999,-2.933317 0.28,-4.4 0.02667,-0.213316 0.119999,-0.386649 0.28,-0.52 0.186665,-0.133315 0.386665,-0.186649 0.6,-0.16 0.239998,0.02668 0.426665,0.133351 0.56,0.32 0.133331,0.160018 0.186664,0.360017 0.16,0.6 m 0.04,-6.2 c 0.159997,0.160023 0.239997,0.34669 0.24,0.56 -3e-6,0.213356 -0.08,0.400022 -0.24,0.56 -0.160002,0.160022 -0.346669,0.240022 -0.56,0.24 -0.213335,2.2e-5 -0.400001,-0.07998 -0.56,-0.24 -0.160001,-0.159978 -0.240001,-0.346644 -0.24,-0.56 -10e-7,-0.21331 0.08,-0.399977 0.24,-0.56 0.159999,-0.159976 0.346665,-0.239976 0.56,-0.24 0.213331,2.4e-5 0.399998,0.08002 0.56,0.24"
+         id="path8907"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="947.27002"
-         inkscape:export-xdpi="947.27002"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-         sodipodi:nodetypes="csssc"
-         inkscape:connector-curvature="0"
-         id="path4545-8-2-1-7"
-         d="m -25.334456,20.297999 c 0.515113,1.501636 -0.638136,2.364343 -1.627876,2.364343 -0.989739,0 -1.792083,-0.788858 -1.792083,-1.761963 0,-0.973107 0.802344,-1.761966 1.792083,-1.761966 0.716593,0 1.364296,0.419712 1.64687,1.067173"
-         style="fill:url(#linearGradient6814);fill-opacity:1;stroke:#008700;stroke-width:0.25547042;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         d="m 86.265426,15.818125 c -0.506669,2.720024 -0.866669,5.613354 -1.08,8.68 -0.186669,3.066682 -0.133335,6.266678 0.16,9.6 0.293331,3.306672 0.906663,6.080002 1.84,8.32 0.05333,0.186667 0.04,0.373333 -0.04,0.56 -0.08,0.213333 -0.226671,0.359999 -0.44,0.44 -0.18667,0.08 -0.38667,0.08 -0.6,0 -0.18667,-0.08 -0.333336,-0.226667 -0.44,-0.44 -0.933335,-2.319998 -1.560001,-5.226662 -1.88,-8.72 -0.320001,-3.493322 -0.373334,-6.799985 -0.16,-9.92 0.213332,-3.119979 0.586665,-6.066642 1.12,-8.84 0.02667,-0.213306 0.119998,-0.373306 0.28,-0.48 0.186664,-0.133306 0.386664,-0.173306 0.6,-0.12 0.239997,0.02669 0.41333,0.133361 0.52,0.32 0.13333,0.160027 0.17333,0.360027 0.12,0.6"
+         id="path8909"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="947.27002"
-         inkscape:export-xdpi="947.27002"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path7034-3-6-3"
-         d="m -25.30147,20.70921 c -0.392879,1.152413 -2.855507,1.350582 -3.42943,0.26673"
-         style="fill:none;stroke:#008700;stroke-width:0.25547042;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         d="m 91.077301,35.618125 c 2.026663,-0.373326 3.719994,-1.146659 5.08,-2.32 1.386658,-1.19999 2.399991,-2.626655 3.04,-4.28 0.373323,-1.039985 0.439989,-1.986651 0.2,-2.84 -0.186677,-0.879983 -0.733343,-1.319982 -1.64,-1.32 -0.853341,1.8e-5 -1.73334,0.440017 -2.64,1.32 -0.906672,0.880016 -1.706671,2.053348 -2.4,3.52 -0.933336,1.866678 -1.480002,3.840009 -1.64,5.92 m 0.16,1.6 c 0.559997,1.54667 1.239997,2.626669 2.04,3.24 0.826662,0.613335 1.733327,0.920001 2.72,0.92 1.013325,1e-6 2.013324,-0.319998 3,-0.96 0.959989,-0.639997 1.746659,-1.559996 2.359999,-2.76 0.10666,-0.239995 0.25332,-0.386661 0.44,-0.44 0.21332,-0.05333 0.41332,-0.02666 0.6,0.08 0.21332,0.08 0.34665,0.226672 0.4,0.44 0.08,0.186671 0.08,0.386671 0,0.6 -0.74668,1.466669 -1.73334,2.613335 -2.959999,3.44 -1.226676,0.826667 -2.520008,1.226666 -3.88,1.2 -1.413339,-0.02667 -2.693337,-0.506667 -3.84,-1.44 -1.120002,-0.933331 -1.933334,-2.25333 -2.44,-3.96 -0.266667,-1.173327 -0.266667,-2.519992 0,-4.04 0.293332,-1.546656 0.826665,-3.079988 1.6,-4.6 0.77333,-1.599985 1.733329,-2.959983 2.88,-4.08 1.093327,-1.039981 2.293326,-1.573314 3.6,-1.6 0.87999,-0.02665 1.586656,0.200019 2.12,0.68 0.533319,0.453352 0.893319,1.053351 1.079999,1.8 0.31999,1.200016 0.22666,2.453348 -0.28,3.76 -0.72001,2.000011 -1.893342,3.693343 -3.519999,5.08 -1.600006,1.360007 -3.573338,2.240006 -5.92,2.64"
+         id="path8911"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="947.27002"
-         inkscape:export-xdpi="947.27002"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path7032-2-0"
-         d="m -23.896272,17.89077 0.686825,0.482779 c -0.687115,-0.184936 -1.229625,-0.01239 -1.581797,0.258942 l 0.901007,0.279558 -2.838607,1.241657 1.298353,-2.35901 0.231987,0.65862 c 0.358038,-0.344292 0.92587,-0.60309 1.302232,-0.562546 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         d="m 116.61543,15.578125 c 4.31999,-0.10664 8.45332,-0.413306 12.4,-0.92 0.21332,-0.02664 0.39998,0.0267 0.56,0.16 0.18665,0.133361 0.29332,0.320027 0.32,0.56 0.0266,0.21336 -0.0267,0.41336 -0.16,0.6 -0.13335,0.160026 -0.30668,0.25336 -0.52,0.28 -1.78668,0.213359 -3.76001,0.413359 -5.92,0.6 0.13332,2.58669 0.19999,5.160021 0.2,7.72 0.0267,2.560015 0.0133,5.533346 -0.04,8.92 -0.0533,3.360006 -0.08,5.94667 -0.08,7.76 2.82665,-0.186665 5.22665,-0.159999 7.2,0.08 0.21332,0.02667 0.38665,0.133334 0.52,0.32 0.13331,0.160001 0.18665,0.360001 0.16,0.6 -0.0267,0.213333 -0.13335,0.386667 -0.32,0.52 -0.16002,0.133333 -0.34668,0.186666 -0.56,0.16 -0.88002,-0.106667 -1.77335,-0.173334 -2.68,-0.2 -0.88001,-0.05333 -1.88001,-0.04 -3,0.04 -1.09334,0.08 -1.93334,0.146666 -2.52,0.2 -0.56001,0.05333 -1.57334,0.159999 -3.04,0.32 -1.46667,0.186666 -2.38667,0.306666 -2.76,0.36 -0.18667,0.02667 -0.36,-0.02667 -0.52,-0.16 -0.18667,-0.133334 -0.29334,-0.320001 -0.32,-0.56 -0.0267,-0.213333 0.0267,-0.4 0.16,-0.56 0.13333,-0.186666 0.32,-0.293333 0.56,-0.32 0.4,-0.05333 1.18666,-0.146666 2.36,-0.28 l 3.16,-0.36 c -1e-5,-1.866664 0.0267,-4.453328 0.08,-7.76 0.0533,-3.333321 0.0667,-6.293318 0.04,-8.88 -1e-5,-2.586646 -0.0667,-5.199977 -0.2,-7.84 -1.78667,0.133359 -3.46667,0.213359 -5.04,0.24 -0.21334,2.5e-5 -0.4,-0.06664 -0.56,-0.2 -0.16,-0.159974 -0.24,-0.346641 -0.24,-0.56 0,-0.239974 0.08,-0.439973 0.24,-0.6 0.13333,-0.159973 0.30666,-0.239973 0.52,-0.24"
+         id="path8913"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 143.1323,27.698125 c -0.37334,-1.413317 -0.88001,-2.346649 -1.52,-2.8 -0.48001,-0.319982 -1.04001,-0.346649 -1.68,-0.08 -0.69334,0.293351 -1.38667,0.866684 -2.08,1.72 -0.66667,0.826682 -1.17334,1.773348 -1.52,2.84 -0.50667,1.653345 -0.74667,3.213343 -0.72,4.68 0.0533,1.466674 0.29333,2.760006 0.72,3.88 0.42666,1.093337 0.98666,1.946669 1.68,2.56 1.06666,0.960001 2.22666,1.173334 3.48,0.64 1.59999,-0.613331 3.10666,-2.21333 4.52,-4.8 0.10666,-0.159994 0.26665,-0.26666 0.48,-0.32 0.21332,-0.07999 0.41332,-0.06666 0.6,0.04 0.18665,0.106673 0.30665,0.266673 0.36,0.48 0.08,0.213339 0.0666,0.413339 -0.04,0.6 -1.60001,2.906669 -3.36001,4.733334 -5.28,5.48 -1.89334,0.746666 -3.61334,0.44 -5.16,-0.92 -1.38667,-1.199998 -2.30667,-2.973329 -2.76,-5.32 -0.42667,-2.346658 -0.24,-4.839989 0.56,-7.48 0.42667,-1.226652 1.05333,-2.359984 1.88,-3.4 0.82666,-1.066649 1.72,-1.799981 2.68,-2.2 1.17333,-0.47998 2.23999,-0.386647 3.2,0.28 0.98666,0.666685 1.70666,1.906684 2.16,3.72 0.0533,0.240015 0.0267,0.453348 -0.08,0.64 -0.10668,0.160014 -0.28001,0.266681 -0.52,0.32 -0.21334,0.05335 -0.41334,0.02668 -0.6,-0.08 -0.18668,-0.106652 -0.30668,-0.266652 -0.36,-0.48"
+         id="path8915"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 155.9973,25.058125 c -0.21334,0.02668 -0.37334,0.04002 -0.48,0.04 -0.0533,1.7e-5 -0.13334,0.01335 -0.24,0.04 -0.10667,1.7e-5 -0.18667,1.7e-5 -0.24,0 -0.26667,0.02668 -0.45334,0.08002 -0.56,0.16 -0.93334,0.480017 -1.76,1.560016 -2.48,3.24 -0.74667,1.733346 -1.17333,3.56001 -1.28,5.48 -0.10667,2.106673 0.2,3.826671 0.92,5.16 0.72,1.333335 1.82666,2.053335 3.32,2.16 1.89333,0.133334 3.37333,-0.533332 4.44,-2 0.98666,-1.413329 1.46666,-3.22666 1.44,-5.44 -0.0267,-1.946656 -0.46668,-3.733321 -1.32,-5.36 -0.82668,-1.653318 -2.00001,-2.813316 -3.52,-3.48 m -2,-1.2 c 0.13333,-0.373314 0.28,-0.599981 0.44,-0.68 0.18666,-0.106647 0.37333,-0.146647 0.56,-0.12 1.57333,0.293353 2.93333,1.026685 4.08,2.2 1.14666,1.146683 1.98666,2.453348 2.52,3.92 0.53332,1.520012 0.81332,3.08001 0.84,4.68 0.0533,2.586673 -0.53335,4.720004 -1.76,6.4 -1.41334,1.973334 -3.34667,2.866666 -5.8,2.68 -1.14667,-0.106667 -2.12,-0.426667 -2.92,-0.96 -0.77333,-0.559999 -1.37333,-1.279998 -1.8,-2.16 -0.4,-0.879996 -0.69333,-1.813329 -0.88,-2.8 -0.16,-0.98666 -0.21333,-1.999992 -0.16,-3.04 0.13333,-2.159989 0.6,-4.186654 1.4,-6.08 0.90667,-2.02665 1.98666,-3.373315 3.24,-4.04 -0.0267,1.9e-5 0.0533,1.9e-5 0.24,0"
+         id="path8917"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 164.75918,40.738125 c 0.0267,-1.81333 0.0267,-3.119995 0,-3.92 -0.0267,-0.82666 -0.0533,-2.159992 -0.08,-4 0,-1.866655 -0.04,-3.466653 -0.12,-4.8 -0.0533,-1.359984 -0.17334,-2.666649 -0.36,-3.92 -0.0267,-0.213315 0.0133,-0.413314 0.12,-0.6 0.13333,-0.186647 0.30666,-0.293314 0.52,-0.32 0.23999,-0.02665 0.45333,0.02669 0.64,0.16 0.18666,0.133352 0.29333,0.306686 0.32,0.52 0.26666,2.000017 0.42666,5.30668 0.48,9.92 1.17333,-2.426655 2.23999,-4.33332 3.2,-5.72 0.85332,-1.226651 1.78666,-2.199983 2.8,-2.92 0.74665,-0.506649 1.46665,-0.799982 2.16,-0.88 0.90665,-0.106648 1.66665,0.200018 2.28,0.92 0.55998,0.61335 1.01332,1.733349 1.36,3.36 0.26665,1.226679 0.46665,2.840011 0.6,4.84 0.15998,2.21334 0.23998,5.093337 0.24,8.64 -2e-5,0.213334 -0.08,0.4 -0.24,0.56 -0.16002,0.16 -0.34668,0.24 -0.56,0.24 -0.21335,0 -0.40002,-0.08 -0.56,-0.24 -0.16002,-0.16 -0.24002,-0.346666 -0.24,-0.56 -2e-5,-3.626662 -0.0667,-6.479993 -0.2,-8.56 -0.13335,-1.866656 -0.32002,-3.399987 -0.56,-4.6 -0.29335,-1.359985 -0.62668,-2.239984 -1,-2.64 -0.29335,-0.26665 -0.61335,-0.38665 -0.96,-0.36 -0.40001,0.02668 -0.85335,0.226683 -1.36,0.6 -0.88001,0.613349 -1.69334,1.440015 -2.44,2.48 -2.72001,3.973343 -4.20001,7.946672 -4.44,11.92 -1e-5,0.746668 -0.0133,1.253334 -0.04,1.52 l 0,0.16 0,0.04 0,0.04 c -10e-6,0.02667 -0.0267,0.06667 -0.08,0.12 -0.0267,0.16 -0.08,0.28 -0.16,0.36 -0.18667,0.159999 -0.38667,0.226666 -0.6,0.2 -0.21334,-0.02667 -0.40001,-0.120001 -0.56,-0.28 -0.10667,-0.08 -0.16,-0.16 -0.16,-0.24 0,-0.05333 -0.0133,-0.09333 -0.04,-0.12 0,-0.05333 0,-0.08 0,-0.08 l 0,-0.52 c 0,-0.426666 0.0133,-0.866665 0.04,-1.32"
+         id="path8919"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 189.78855,28.538125 c -10e-6,-0.02665 -0.0933,-0.506652 -0.28,-1.44 -0.08,-0.453317 -0.18667,-0.813317 -0.32,-1.08 -0.29334,-0.479983 -0.74667,-0.813316 -1.36,-1 -0.58667,-0.213316 -1.22667,-0.253316 -1.92,-0.12 -0.66667,0.160018 -1.18667,0.466684 -1.56,0.92 -0.37334,0.426683 -0.53334,0.946682 -0.48,1.56 0.0533,0.586681 0.52,1.346681 1.4,2.28 0.34666,0.373346 0.89333,0.906679 1.64,1.6 0.74666,0.666677 1.19999,1.08001 1.36,1.24 0.39999,0.373343 0.73333,0.720009 1,1.04 0.29333,0.320009 0.61333,0.693342 0.96,1.12 0.37332,0.400008 0.65332,0.81334 0.84,1.24 0.21332,0.426673 0.39999,0.880006 0.56,1.36 0.15999,0.453338 0.22666,0.933338 0.2,1.44 -1e-5,0.50667 -0.08,1.02667 -0.24,1.56 -0.40001,1.386668 -1.20001,2.32 -2.4,2.8 -1.17334,0.479999 -2.4,0.519999 -3.68,0.12 -1.28,-0.373334 -2.37333,-1.119999 -3.28,-2.24 -0.88,-1.119997 -1.32,-2.466663 -1.32,-4.04 0,-0.213327 0.08,-0.399994 0.24,-0.56 0.16,-0.159994 0.34667,-0.239994 0.56,-0.24 0.21333,6e-6 0.4,0.08001 0.56,0.24 0.16,0.160006 0.24,0.346673 0.24,0.56 0,1.200004 0.33333,2.22667 1,3.08 0.66666,0.853335 1.48,1.426668 2.44,1.72 0.96,0.266667 1.81333,0.240001 2.56,-0.08 0.77333,-0.346665 1.29333,-0.959998 1.56,-1.84 0.31999,-1.01333 0.21333,-1.999995 -0.32,-2.96 -0.50667,-0.959993 -1.36001,-2.026659 -2.56,-3.2 -0.13334,-0.106658 -0.6,-0.519991 -1.4,-1.24 l -1.68,-1.6 c -1.09333,-1.17332 -1.70667,-2.253319 -1.84,-3.24 -0.13333,-1.093317 0.13333,-1.999983 0.8,-2.72 0.66667,-0.746648 1.49333,-1.226648 2.48,-1.44 0.96,-0.239981 1.91999,-0.186647 2.88,0.16 0.93333,0.266685 1.63999,0.853352 2.12,1.76 0.23999,0.37335 0.41332,0.85335 0.52,1.44 -10e-6,0.02668 0.0267,0.213349 0.08,0.56 0.0533,0.320015 0.10666,0.573348 0.16,0.76 0.0533,0.213348 0.0267,0.413347 -0.08,0.6 -0.10668,0.18668 -0.26668,0.30668 -0.48,0.36 -0.21334,0.05335 -0.41334,0.02668 -0.6,-0.08 -0.18667,-0.106653 -0.30667,-0.239986 -0.36,-0.4"
+         id="path8921"
+         inkscape:connector-curvature="0" />
     </g>
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect6135-6-6"
-       width="6.0104074"
-       height="6.0104074"
-       x="-9.3177032"
-       y="19.919479"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/new.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03" />
-    <g
-       id="g6879"
-       transform="matrix(0.96331183,0,0,0.96331183,11.506231,3.8372174)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/new.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03">
+    <g
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:100;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:All Things Pink Skinny;-inkscape-font-specification:All Things Pink Skinny Thin"
+       id="text6423-3"
+       transform="translate(1.0571253,-172.94308)">
       <path
-         inkscape:export-ydpi="597.56848"
-         inkscape:export-xdpi="597.56848"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path3121-2"
-         d="m -17.308276,17.684998 c 0.256989,0.06327 0.02318,0.351206 -0.182406,0.325508 l -3.020404,0.09336 -0.04998,4.152879 3.220428,-0.006 0.213746,-4.194466 c 0.03953,-0.245126 0.285377,-0.03258 0.348635,0.173003 l -0.147599,4.381363 c 0,0 -4.014209,0.05615 -3.989006,0.06201 l -0.08015,-4.987537 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         d="m 21.218413,238.18317 c 5.173326,0.56 9.079988,-0.17333 11.72,-2.2 2.986649,-2.31999 3.893315,-5.94666 2.72,-10.88 -0.560017,-2.39998 -1.613349,-4.51998 -3.16,-6.36 -1.546679,-1.86664 -3.426677,-3.21331 -5.64,-4.04 -1.040007,-0.39997 -2.946672,-0.61331 -5.72,-0.64 0.53333,8.13335 0.559997,16.17334 0.08,24.12 m -0.16,-25.72 0.76,0 c 0.346663,3e-5 0.586663,0.0134 0.72,0.04 0.159996,3e-5 0.426662,3e-5 0.8,0 0.373328,3e-5 0.653328,0.0134 0.84,0.04 0.186661,0.0267 0.439994,0.0667 0.76,0.12 0.34666,0.0267 0.62666,0.0667 0.84,0.12 l 0.88,0.2 c 0.266658,0.0534 0.506658,0.12003 0.72,0.2 2.506655,0.90669 4.61332,2.40002 6.32,4.48 1.733316,2.08002 2.906649,4.42669 3.52,7.04 0.639981,2.93335 0.679981,5.44001 0.12,7.52 -0.586685,2.05334 -1.720017,3.72 -3.4,5 -3.040012,2.32 -7.320008,3.16 -12.84,2.52 -0.240002,0.42667 -0.520002,0.62667 -0.84,0.6 -0.213335,-0.0267 -0.400001,-0.12 -0.56,-0.28 -0.133334,-0.16 -0.186668,-0.34667 -0.16,-0.56 0.613332,-8.66666 0.599998,-17.43998 -0.04,-26.32 -0.02667,-0.21331 0.02667,-0.39997 0.16,-0.56 0.159999,-0.15997 0.359999,-0.25331 0.6,-0.28 0.133332,-0.0266 0.293331,0.0134 0.48,0.12 l 0.32,0"
+         id="path8924"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="597.56848"
-         inkscape:export-xdpi="597.56848"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3759-9-9"
-         d="m -16.923445,17.844149 c 0.17745,-0.241597 0.292074,-0.47272 0.532349,-0.724788 -6.6e-4,0.01443 0.391377,0.355232 0.391377,0.355232 -0.370735,0.196481 -0.615817,0.246369 -0.923726,0.369556 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         d="m 41.897163,232.58317 c 2.026663,-0.37333 3.719995,-1.14666 5.08,-2.32 1.386659,-1.19999 2.399991,-2.62665 3.04,-4.28 0.373323,-1.03998 0.43999,-1.98665 0.2,-2.84 -0.186676,-0.87998 -0.733343,-1.31998 -1.64,-1.32 -0.853341,2e-5 -1.73334,0.44002 -2.64,1.32 -0.906671,0.88002 -1.706671,2.05335 -2.4,3.52 -0.933336,1.86668 -1.480002,3.84001 -1.64,5.92 m 0.16,1.6 c 0.559998,1.54667 1.239997,2.62667 2.04,3.24 0.826662,0.61334 1.733328,0.92 2.72,0.92 1.013326,0 2.013325,-0.32 3,-0.96 0.95999,-0.64 1.746655,-1.56 2.36,-2.76 0.106655,-0.23999 0.253321,-0.38666 0.44,-0.44 0.213321,-0.0533 0.413321,-0.0267 0.6,0.08 0.21332,0.08 0.346653,0.22667 0.4,0.44 0.07999,0.18667 0.07999,0.38667 0,0.6 -0.746679,1.46667 -1.733345,2.61334 -2.96,3.44 -1.226676,0.82667 -2.520008,1.22667 -3.88,1.2 -1.413338,-0.0267 -2.693337,-0.50667 -3.84,-1.44 -1.120002,-0.93333 -1.933334,-2.25333 -2.44,-3.96 -0.266667,-1.17333 -0.266667,-2.51999 0,-4.04 0.293333,-1.54666 0.826666,-3.07999 1.6,-4.6 0.773331,-1.59998 1.73333,-2.95998 2.88,-4.08 1.093328,-1.03998 2.293326,-1.57331 3.6,-1.6 0.879991,-0.0267 1.586657,0.20002 2.12,0.68 0.533322,0.45335 0.893322,1.05335 1.08,1.8 0.319988,1.20002 0.226655,2.45335 -0.28,3.76 -0.72001,2.00001 -1.893343,3.69334 -3.52,5.08 -1.600006,1.36001 -3.573337,2.24001 -5.92,2.64"
+         id="path8926"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="597.56848"
-         inkscape:export-xdpi="597.56848"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-         inkscape:transform-center-y="2.9619778"
-         inkscape:transform-center-x="1.3939388"
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3759-9-2-5"
-         d="m -17.024881,17.809807 c -0.08583,-0.284541 -0.171635,-0.569081 -0.257452,-0.853621 -0.173146,0.008 -0.420729,0.133041 -0.483388,0.202352 0.335013,0.248299 0.493893,0.434179 0.74084,0.651269 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         d="m 64.124038,225.50317 c -8e-6,-0.0267 -0.09334,-0.50665 -0.28,-1.44 -0.08001,-0.45332 -0.186674,-0.81332 -0.32,-1.08 -0.293341,-0.47998 -0.746674,-0.81332 -1.36,-1 -0.586672,-0.21331 -1.226672,-0.25331 -1.92,-0.12 -0.66667,0.16002 -1.18667,0.46668 -1.56,0.92 -0.373336,0.42668 -0.533336,0.94668 -0.48,1.56 0.05333,0.58668 0.519997,1.34668 1.4,2.28 0.346663,0.37335 0.893329,0.90668 1.64,1.6 0.746661,0.66668 1.199993,1.08001 1.36,1.24 0.399993,0.37334 0.733326,0.72001 1,1.04 0.293325,0.32001 0.613325,0.69334 0.96,1.12 0.373324,0.40001 0.653324,0.81334 0.84,1.24 0.213324,0.42667 0.39999,0.88001 0.56,1.36 0.15999,0.45334 0.226656,0.93334 0.2,1.44 -1e-5,0.50667 -0.08001,1.02667 -0.24,1.56 -0.40001,1.38667 -1.200009,2.32 -2.4,2.8 -1.17334,0.48 -2.400005,0.52 -3.68,0.12 -1.280003,-0.37333 -2.373335,-1.12 -3.28,-2.24 -0.88,-1.12 -1.319999,-2.46666 -1.32,-4.04 10e-7,-0.21333 0.08,-0.39999 0.24,-0.56 0.16,-0.15999 0.346667,-0.23999 0.56,-0.24 0.213333,10e-6 0.399999,0.08 0.56,0.24 0.159999,0.16001 0.239999,0.34667 0.24,0.56 -10e-7,1.20001 0.333332,2.22667 1,3.08 0.666664,0.85334 1.479997,1.42667 2.44,1.72 0.959995,0.26667 1.813327,0.24 2.56,-0.08 0.773326,-0.34666 1.293325,-0.96 1.56,-1.84 0.319991,-1.01333 0.213325,-1.99999 -0.32,-2.96 -0.506674,-0.95999 -1.360007,-2.02666 -2.56,-3.2 -0.133339,-0.10666 -0.600005,-0.51999 -1.4,-1.24 l -1.68,-1.6 c -1.093335,-1.17332 -1.706668,-2.25332 -1.84,-3.24 -0.133334,-1.09332 0.133332,-1.99998 0.8,-2.72 0.666664,-0.74665 1.49333,-1.22665 2.48,-1.44 0.959995,-0.23998 1.919994,-0.18665 2.88,0.16 0.933325,0.26669 1.639991,0.85335 2.12,1.76 0.239991,0.37335 0.413324,0.85335 0.52,1.44 -1e-5,0.0267 0.02666,0.21335 0.08,0.56 0.05332,0.32002 0.106657,0.57335 0.16,0.76 0.05332,0.21335 0.02666,0.41335 -0.08,0.6 -0.106676,0.18668 -0.266676,0.30668 -0.48,0.36 -0.213342,0.0533 -0.413342,0.0267 -0.6,-0.08 -0.186675,-0.10665 -0.306675,-0.23999 -0.36,-0.4"
+         id="path8928"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="597.56848"
-         inkscape:export-xdpi="597.56848"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3759-6-2"
-         d="m -16.774627,17.963374 c 0.250946,0.132084 0.630666,0.274059 0.752838,0.39623 6.07e-4,0.0123 -0.277362,0.416043 -0.277362,0.416043 -0.138689,-0.181606 -0.316984,-0.541516 -0.475476,-0.812273 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         d="m 80.094663,221.34317 c -0.373344,0.58669 -2.000009,2.52002 -4.88,5.8 l -2.76,3.16 -0.92,1.08 -0.12,0.32 c 0.21333,0.45334 0.586663,0.92001 1.12,1.4 0.853329,0.66667 2.066661,1.40001 3.64,2.2 1.333325,0.64 2.693323,1.22667 4.08,1.76 1.386654,0.53334 2.399986,0.86667 3.04,1 0.213319,0.0267 0.373318,0.13334 0.48,0.32 0.106652,0.18667 0.133318,0.4 0.08,0.64 -0.02668,0.21333 -0.133348,0.37333 -0.32,0.48 -0.186681,0.10667 -0.400014,0.13333 -0.64,0.08 -0.66668,-0.16 -1.733346,-0.50667 -3.2,-1.04 -1.44001,-0.53333 -2.840008,-1.13333 -4.2,-1.8 -1.680005,-0.82666 -3.000004,-1.61333 -3.96,-2.36 l -0.68,-0.72 c -0.08,2.10667 -0.186669,3.94667 -0.32,5.52 -0.02667,0.21333 -0.133335,0.38667 -0.32,0.52 -0.160001,0.16 -0.346668,0.22667 -0.56,0.2 -0.213334,-0.0267 -0.400001,-0.12 -0.56,-0.28 -0.133334,-0.16 -0.186667,-0.36 -0.16,-0.6 0.24,-2.61333 0.386666,-5.25333 0.44,-7.92 0.05333,-2.66665 0.05333,-6.07998 0,-10.24 -0.05333,-4.15998 -0.08,-6.81331 -0.08,-7.96 -10e-7,-0.21331 0.08,-0.39997 0.24,-0.56 0.159999,-0.15997 0.346666,-0.23997 0.56,-0.24 0.213332,3e-5 0.399998,0.08 0.56,0.24 0.159998,0.16003 0.239998,0.34669 0.24,0.56 -2e-6,1.38669 0.01333,3.85336 0.04,7.4 0.05333,3.54668 0.05333,6.65335 0,9.32 l 3.08,-3.52 c 2.879992,-3.30665 4.43999,-5.18665 4.68,-5.64 0.133323,-0.15998 0.306656,-0.26665 0.52,-0.32 0.213323,-0.0533 0.413322,-0.0266 0.6,0.08 0.186655,0.10669 0.306655,0.28002 0.36,0.52 0.05332,0.21335 0.02666,0.41335 -0.08,0.6"
+         id="path8930"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="597.56848"
-         inkscape:export-xdpi="597.56848"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect3927-3"
-         d="m -20.819121,17.839185 3.866675,0.225358 -0.04745,4.412281 -3.771788,0.07116 z"
-         style="fill:url(#linearGradient6887);fill-opacity:1;stroke:none" />
+         d="m 90.389038,221.10317 c -1.493336,0.0533 -3.026668,0.12002 -4.6,0.2 -0.213332,0.0267 -0.399999,-0.04 -0.56,-0.2 -0.159999,-0.15998 -0.239999,-0.34665 -0.24,-0.56 -0.02666,-0.21331 0.04,-0.39998 0.2,-0.56 0.133334,-0.15998 0.320001,-0.25331 0.56,-0.28 1.679999,-0.08 3.279997,-0.17331 4.8,-0.28 0.213329,-2.45331 0.519995,-4.67997 0.92,-6.68 0.02666,-0.21331 0.119995,-0.37331 0.28,-0.48 0.186661,-0.1333 0.386661,-0.1733 0.6,-0.12 0.239994,0.0267 0.413327,0.13336 0.52,0.32 0.133327,0.16003 0.173327,0.36003 0.12,0.6 -0.320006,1.84003 -0.600006,3.94669 -0.84,6.32 1.946659,-0.13331 3.653324,-0.26665 5.12,-0.4 0.213322,-0.0266 0.399989,0.04 0.56,0.2 0.186655,0.13335 0.279988,0.32002 0.28,0.56 0.02666,0.21335 -0.02668,0.40002 -0.16,0.56 -0.133345,0.16002 -0.306678,0.25335 -0.52,0.28 -1.626676,0.13335 -3.440008,0.26669 -5.44,0.4 -0.506672,8.10668 0.119994,14.33334 1.88,18.68 0.07999,0.18667 0.07999,0.37333 0,0.56 -0.08001,0.21333 -0.226674,0.36 -0.44,0.44 -0.186673,0.08 -0.386673,0.08 -0.6,0 -0.213339,-0.08 -0.360006,-0.22667 -0.44,-0.44 -1.840004,-4.50666 -2.50667,-10.87999 -2,-19.12"
+         id="path8932"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:transform-center-y="-0.1295921"
-         inkscape:transform-center-x="-0.17278971"
-         inkscape:export-ydpi="597.56848"
-         inkscape:export-xdpi="597.56848"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3759-8"
-         d="m -17.245838,18.121041 c -0.01737,0.02056 -0.773811,0.407269 -0.773811,0.407269 0.135758,0.122185 0.271512,0.325814 0.285088,0.427633 0.162908,-0.278301 0.213816,-0.485329 0.488723,-0.834902 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-    </g>
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:none"
-       id="rect6135-6-6-0"
-       width="6.0104074"
-       height="6.0104074"
-       x="-16.741379"
-       y="26.96376"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/close.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03" />
-    <g
-       id="g6928"
-       transform="translate(12.25,3.0662926)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/close.png"
-       inkscape:export-xdpi="14974.03"
-       inkscape:export-ydpi="14974.03">
+         d="m 106.50466,222.02317 c -0.21334,0.0267 -0.37334,0.04 -0.48,0.04 -0.0533,2e-5 -0.13334,0.0133 -0.24,0.04 -0.10667,2e-5 -0.18667,2e-5 -0.24,0 -0.26667,0.0267 -0.45334,0.08 -0.56,0.16 -0.93333,0.48002 -1.76,1.56002 -2.48,3.24 -0.74667,1.73335 -1.17333,3.56001 -1.28,5.48 -0.10666,2.10667 0.2,3.82667 0.92,5.16 0.72,1.33334 1.82667,2.05334 3.32,2.16 1.89333,0.13334 3.37333,-0.53333 4.44,-2 0.98666,-1.41333 1.46666,-3.22666 1.44,-5.44 -0.0267,-1.94666 -0.46667,-3.73332 -1.32,-5.36 -0.82667,-1.65332 -2.00001,-2.81332 -3.52,-3.48 m -2,-1.2 c 0.13333,-0.37331 0.28,-0.59998 0.44,-0.68 0.18666,-0.10665 0.37333,-0.14665 0.56,-0.12 1.57333,0.29335 2.93333,1.02669 4.08,2.2 1.14666,1.14668 1.98666,2.45335 2.52,3.92 0.53332,1.52001 0.81332,3.08001 0.84,4.68 0.0533,2.58667 -0.53334,4.72 -1.76,6.4 -1.41334,1.97333 -3.34667,2.86667 -5.8,2.68 -1.14667,-0.10667 -2.12,-0.42667 -2.92,-0.96 -0.77333,-0.56 -1.37333,-1.28 -1.8,-2.16 -0.4,-0.88 -0.69333,-1.81333 -0.879997,-2.8 -0.16,-0.98666 -0.213333,-1.99999 -0.16,-3.04 0.133334,-2.15999 0.599997,-4.18665 1.399997,-6.08 0.90667,-2.02665 1.98667,-3.37331 3.24,-4.04 -0.0267,2e-5 0.0533,2e-5 0.24,0"
+         id="path8934"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="1250.21"
-         inkscape:export-xdpi="1250.21"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_big.png"
-         sodipodi:nodetypes="ccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path3837-0"
-         d="m -27.022027,24.321944 c -0.451471,0.273334 -1.143411,0.615374 -1.457468,0.923064 0.615374,0.550598 1.23075,1.101197 1.846125,1.651795 l -2.009204,1.353835 c 0.354784,0.502015 1.083295,1.285272 1.747253,1.546819 0,0 1.064982,-2.003099 1.08785,-2.026174 0.24291,0.663958 0.485822,1.327916 0.728734,1.991872 0.548633,-0.338586 1.406446,-1.226821 1.748961,-1.94329 -0.806926,-0.419895 -1.410005,-0.79902 -2.216931,-1.218915 -0.06094,-0.01199 1.223533,-0.920808 1.937224,-1.360827 -0.104597,-0.307686 -0.552704,-0.821492 -1.138229,-1.232237 -0.457939,0.462108 -0.915879,0.924213 -1.373819,1.38632 -0.300164,-0.35742 -0.600329,-0.714842 -0.900496,-1.072262 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         d="m 117.34654,228.78317 c -0.10667,3.73334 -0.16,6.84 -0.16,9.32 1.41333,0.10667 2.51999,0.0933 3.32,-0.04 0.79999,-0.16 1.55999,-0.49333 2.28,-1 0.93332,-0.66666 1.73332,-1.66666 2.4,-3 0.66665,-1.33333 1.10665,-2.78666 1.32,-4.36 0.21332,-1.59999 0.13332,-3.05332 -0.24,-4.36 -0.34668,-1.33332 -1.00001,-2.34665 -1.96,-3.04 -0.66668,-0.50665 -1.34668,-0.65331 -2.04,-0.44 -0.69334,0.21335 -1.38667,0.73335 -2.08,1.56 -0.61334,0.72002 -1.17334,1.57335 -1.68,2.56 -0.48001,0.98668 -0.82667,1.84001 -1.04,2.56 l -0.12,0.24 m -0.12,10.92 c 0.0267,2.26667 0.0933,4.29333 0.2,6.08 0.0267,0.21333 -0.04,0.39999 -0.2,0.56 -0.16,0.15999 -0.34667,0.25333 -0.56,0.28 -0.21334,0.0267 -0.4,-0.04 -0.56,-0.2 -0.16,-0.16001 -0.25334,-0.34667 -0.28,-0.56 -0.10667,-1.92 -0.17334,-4.04 -0.2,-6.36 -0.0267,-2.34666 -0.0267,-4.35999 0,-6.04 0.0533,-1.70666 0.12,-3.90666 0.2,-6.6 0.08,-2.69332 0.13333,-4.74665 0.16,-6.16 0,-0.21331 0.08,-0.38665 0.24,-0.52 0.16,-0.15998 0.34666,-0.23998 0.56,-0.24 0.24,2e-5 0.42666,0.08 0.56,0.24 0.16,0.16002 0.24,0.36002 0.24,0.6 -0.0267,0.69335 -0.04,1.84002 -0.04,3.44 l 1.44,-1.84 c 0.90666,-1.03998 1.82666,-1.70665 2.76,-2 1.22666,-0.39998 2.39999,-0.18665 3.52,0.64 1.22665,0.90669 2.06665,2.17335 2.52,3.8 0.45332,1.60001 0.55998,3.30668 0.32,5.12 -0.24001,1.70668 -0.74668,3.33334 -1.52,4.88 -0.77335,1.52 -1.72001,2.69334 -2.84,3.52 -1.54668,1.12 -3.72001,1.57333 -6.52,1.36"
+         id="path8936"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:export-ydpi="717"
-         inkscape:export-xdpi="717"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/close.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4103-9"
-         d="m -28.407783,28.315211 c 0.418156,0.464756 1.121703,1.051823 1.49909,1.210803 0.262072,-0.377669 0.870687,-1.631892 1.153146,-1.989178 0.259458,0.615011 0.559686,1.474643 0.778374,1.845035 0.328174,-0.114706 1.227125,-1.105982 1.412605,-1.383776"
-         style="fill:none;stroke:#ffffff;stroke-width:0.36900684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
-    </g>
-    <rect
-       style="fill:none;stroke:none"
-       id="rect5681"
-       width="4.5961943"
-       height="4.5961943"
-       x="63.374439"
-       y="40.094631"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/share.png"
-       inkscape:export-xdpi="1174.89"
-       inkscape:export-ydpi="1174.89" />
-    <g
-       id="g5683"
-       transform="translate(-2.5964132,-2.8408269)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/share.png"
-       inkscape:export-xdpi="1174.89"
-       inkscape:export-ydpi="1174.89">
-      <g
-         transform="translate(-8.7946407,-2.3422912)"
-         id="g5673">
-        <g
-           id="g5623"
-           transform="matrix(0.72656251,0,0,0.72656251,21.064047,13.053967)">
-          <path
-             inkscape:export-ydpi="354.93695"
-             inkscape:export-xdpi="354.93695"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
-             transform="matrix(1.7777778,0,0,1.7777778,26.16295,-13.953894)"
-             sodipodi:open="true"
-             sodipodi:end="6.2745801"
-             sodipodi:start="0"
-             d="m 29.43332,35.498436 c 0,0.43934 -0.356155,0.795495 -0.795495,0.795495 -0.43934,0 -0.795495,-0.356155 -0.795495,-0.795495 0,-0.43934 0.356155,-0.795495 0.795495,-0.795495 0.436669,0 0.791708,0.351997 0.795466,0.78865"
-             sodipodi:ry="0.79549515"
-             sodipodi:rx="0.79549515"
-             sodipodi:cy="35.498436"
-             sodipodi:cx="28.637825"
-             id="path4400-8"
-             style="fill:#008700;fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             inkscape:export-ydpi="354.93695"
-             inkscape:export-xdpi="354.93695"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/info_message.png"
-             transform="matrix(1.7777778,0,0,1.7777778,25.432013,-14.221562)"
-             sodipodi:open="true"
-             sodipodi:end="6.2745801"
-             sodipodi:start="0"
-             d="m 29.21875,35.38562 c 0,0.194163 -0.1574,0.351563 -0.351563,0.351563 -0.194162,0 -0.351562,-0.1574 -0.351562,-0.351563 0,-0.194162 0.1574,-0.351562 0.351562,-0.351562 0.192983,0 0.349889,0.155562 0.35155,0.348537"
-             sodipodi:ry="0.3515625"
-             sodipodi:rx="0.3515625"
-             sodipodi:cy="35.38562"
-             sodipodi:cx="28.867188"
-             id="path3619-7"
-             style="fill:#ffffff;fill-opacity:0.10576926;stroke:none"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g5669"
-           transform="translate(0.07107907,0)">
-          <path
-             inkscape:export-ydpi="300.9415"
-             inkscape:export-xdpi="300.9415"
-             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_backward.png"
-             sodipodi:nodetypes="cccccccc"
-             inkscape:connector-curvature="0"
-             id="path5233-7-8-2"
-             d="m 75.429817,45.356443 1.533873,1.064917 -0.65233,0.270785 0.611386,0.945794 c -0.161575,0.0056 -0.385687,0.08879 -0.524822,0.180311 l -0.441268,-0.914542 -0.60655,0.334182 z"
-             style="fill:#008700;fill-opacity:1;stroke:none" />
-          <path
-             inkscape:export-ydpi="300.9415"
-             inkscape:export-xdpi="300.9415"
-             inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/move_frame_backward.png"
-             sodipodi:nodetypes="cccccccc"
-             inkscape:connector-curvature="0"
-             id="path5233-7-8-2-8"
-             d="m 78.555206,45.356443 -1.533873,1.064917 0.65233,0.270785 -0.611386,0.945794 c 0.213642,0.02715 0.38047,0.09838 0.519298,0.207932 l 0.446792,-0.942163 0.60655,0.334182 z"
-             style="fill:#008700;fill-opacity:1;stroke:none" />
-        </g>
-      </g>
+         d="m 142.35716,212.54317 c 4.32,-0.10664 8.45333,-0.4133 12.4,-0.92 0.21332,-0.0266 0.39999,0.0267 0.56,0.16 0.18666,0.13336 0.29332,0.32003 0.32,0.56 0.0267,0.21336 -0.0267,0.41336 -0.16,0.6 -0.13334,0.16003 -0.30668,0.25336 -0.52,0.28 -1.78667,0.21336 -3.76001,0.41336 -5.92,0.6 0.13333,2.58669 0.2,5.16002 0.2,7.72 0.0267,2.56002 0.0133,5.53335 -0.04,8.92 -0.0533,3.36001 -0.08,5.94667 -0.08,7.76 2.82666,-0.18666 5.22666,-0.16 7.2,0.08 0.21332,0.0267 0.38666,0.13334 0.52,0.32 0.13332,0.16 0.18666,0.36 0.16,0.6 -0.0267,0.21333 -0.13334,0.38667 -0.32,0.52 -0.16001,0.13333 -0.34668,0.18667 -0.56,0.16 -0.88001,-0.10667 -1.77334,-0.17333 -2.68,-0.2 -0.88001,-0.0533 -1.88001,-0.04 -3,0.04 -1.09334,0.08 -1.93334,0.14667 -2.52,0.2 -0.56,0.0533 -1.57333,0.16 -3.04,0.32 -1.46666,0.18667 -2.38666,0.30667 -2.76,0.36 -0.18666,0.0267 -0.36,-0.0267 -0.52,-0.16 -0.18666,-0.13333 -0.29333,-0.32 -0.32,-0.56 -0.0267,-0.21333 0.0267,-0.4 0.16,-0.56 0.13334,-0.18667 0.32,-0.29333 0.56,-0.32 0.4,-0.0533 1.18667,-0.14667 2.36,-0.28 l 3.16,-0.36 c 0,-1.86666 0.0267,-4.45333 0.08,-7.76 0.0533,-3.33332 0.0667,-6.29332 0.04,-8.88 0,-2.58665 -0.0667,-5.19998 -0.2,-7.84 -1.78667,0.13336 -3.46666,0.21336 -5.04,0.24 -0.21333,3e-5 -0.4,-0.0666 -0.56,-0.2 -0.16,-0.15997 -0.24,-0.34664 -0.24,-0.56 0,-0.23997 0.08,-0.43997 0.24,-0.6 0.13334,-0.15997 0.30667,-0.23997 0.52,-0.24"
+         id="path8938"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 168.87404,224.66317 c -0.37334,-1.41332 -0.88001,-2.34665 -1.52,-2.8 -0.48001,-0.31998 -1.04001,-0.34665 -1.68,-0.08 -0.69334,0.29335 -1.38667,0.86668 -2.08,1.72 -0.66667,0.82668 -1.17334,1.77335 -1.52,2.84 -0.50667,1.65335 -0.74667,3.21334 -0.72,4.68 0.0533,1.46667 0.29333,2.76001 0.72,3.88 0.42666,1.09334 0.98666,1.94667 1.68,2.56 1.06666,0.96 2.22666,1.17334 3.48,0.64 1.59999,-0.61333 3.10665,-2.21333 4.52,-4.8 0.10665,-0.15999 0.26665,-0.26666 0.48,-0.32 0.21332,-0.08 0.41332,-0.0667 0.6,0.04 0.18665,0.10667 0.30665,0.26667 0.36,0.48 0.08,0.21334 0.0667,0.41334 -0.04,0.6 -1.60001,2.90667 -3.36001,4.73333 -5.28,5.48 -1.89334,0.74667 -3.61334,0.44 -5.16,-0.92 -1.38667,-1.2 -2.30667,-2.97333 -2.76,-5.32 -0.42667,-2.34666 -0.24,-4.83999 0.56,-7.48 0.42666,-1.22665 1.05333,-2.35998 1.88,-3.4 0.82666,-1.06665 1.71999,-1.79998 2.68,-2.2 1.17332,-0.47998 2.23999,-0.38665 3.2,0.28 0.98665,0.66669 1.70665,1.90668 2.16,3.72 0.0533,0.24002 0.0266,0.45335 -0.08,0.64 -0.10668,0.16002 -0.28001,0.26668 -0.52,0.32 -0.21335,0.0533 -0.41335,0.0267 -0.6,-0.08 -0.18668,-0.10665 -0.30668,-0.26665 -0.36,-0.48"
+         id="path8940"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 181.73904,222.02317 c -0.21334,0.0267 -0.37334,0.04 -0.48,0.04 -0.0533,2e-5 -0.13334,0.0133 -0.24,0.04 -0.10667,2e-5 -0.18667,2e-5 -0.24,0 -0.26667,0.0267 -0.45334,0.08 -0.56,0.16 -0.93334,0.48002 -1.76001,1.56002 -2.48,3.24 -0.74667,1.73335 -1.17334,3.56001 -1.28,5.48 -0.10667,2.10667 0.2,3.82667 0.92,5.16 0.72,1.33334 1.82666,2.05334 3.32,2.16 1.89332,0.13334 3.37332,-0.53333 4.44,-2 0.98665,-1.41333 1.46665,-3.22666 1.44,-5.44 -0.0267,-1.94666 -0.46668,-3.73332 -1.32,-5.36 -0.82668,-1.65332 -2.00001,-2.81332 -3.52,-3.48 m -2,-1.2 c 0.13333,-0.37331 0.27999,-0.59998 0.44,-0.68 0.18666,-0.10665 0.37333,-0.14665 0.56,-0.12 1.57332,0.29335 2.93332,1.02669 4.08,2.2 1.14665,1.14668 1.98665,2.45335 2.52,3.92 0.53332,1.52001 0.81332,3.08001 0.84,4.68 0.0533,2.58667 -0.53335,4.72 -1.76,6.4 -1.41335,1.97333 -3.34668,2.86667 -5.8,2.68 -1.14667,-0.10667 -2.12001,-0.42667 -2.92,-0.96 -0.77334,-0.56 -1.37334,-1.28 -1.8,-2.16 -0.4,-0.88 -0.69334,-1.81333 -0.88,-2.8 -0.16,-0.98666 -0.21333,-1.99999 -0.16,-3.04 0.13333,-2.15999 0.6,-4.18665 1.4,-6.08 0.90666,-2.02665 1.98666,-3.37331 3.24,-4.04 -0.0267,2e-5 0.0533,2e-5 0.24,0"
+         id="path8942"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 190.50091,237.70317 c 0.0267,-1.81333 0.0267,-3.11999 0,-3.92 -0.0267,-0.82666 -0.0533,-2.15999 -0.08,-4 0,-1.86665 -0.04,-3.46665 -0.12,-4.8 -0.0533,-1.35998 -0.17333,-2.66665 -0.36,-3.92 -0.0267,-0.21331 0.0133,-0.41331 0.12,-0.6 0.13334,-0.18665 0.30667,-0.29331 0.52,-0.32 0.24,-0.0266 0.45334,0.0267 0.64,0.16 0.18667,0.13335 0.29333,0.30669 0.32,0.52 0.26667,2.00002 0.42667,5.30668 0.48,9.92 1.17333,-2.42665 2.24,-4.33332 3.2,-5.72 0.85333,-1.22665 1.78666,-2.19998 2.8,-2.92 0.74666,-0.50665 1.46666,-0.79998 2.16,-0.88 0.90666,-0.10665 1.66666,0.20002 2.28,0.92 0.55999,0.61335 1.01332,1.73335 1.36,3.36 0.26666,1.22668 0.46666,2.84001 0.6,4.84 0.15999,2.21334 0.23999,5.09334 0.24,8.64 -1e-5,0.21333 -0.08,0.4 -0.24,0.56 -0.16001,0.16 -0.34668,0.24 -0.56,0.24 -0.21334,0 -0.40001,-0.08 -0.56,-0.24 -0.16001,-0.16 -0.24001,-0.34667 -0.24,-0.56 -1e-5,-3.62666 -0.0667,-6.47999 -0.2,-8.56 -0.13334,-1.86665 -0.32001,-3.39999 -0.56,-4.6 -0.29334,-1.35998 -0.62668,-2.23998 -1,-2.64 -0.29334,-0.26665 -0.61334,-0.38665 -0.96,-0.36 -0.40001,0.0267 -0.85334,0.22668 -1.36,0.6 -0.88,0.61335 -1.69334,1.44002 -2.44,2.48 -2.72,3.97334 -4.2,7.94667 -4.44,11.92 0,0.74667 -0.0133,1.25333 -0.04,1.52 l 0,0.16 0,0.04 0,0.04 c 0,0.0267 -0.0267,0.0667 -0.08,0.12 -0.0267,0.16 -0.08,0.28 -0.16,0.36 -0.18667,0.16 -0.38666,0.22667 -0.6,0.2 -0.21333,-0.0267 -0.4,-0.12 -0.56,-0.28 -0.10666,-0.08 -0.16,-0.16 -0.16,-0.24 0,-0.0533 -0.0133,-0.0933 -0.04,-0.12 0,-0.0533 0,-0.08 0,-0.08 l 0,-0.52 c 0,-0.42666 0.0133,-0.86666 0.04,-1.32"
+         id="path8944"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 215.53029,225.50317 c -1e-5,-0.0267 -0.0933,-0.50665 -0.28,-1.44 -0.08,-0.45332 -0.18668,-0.81332 -0.32,-1.08 -0.29334,-0.47998 -0.74668,-0.81332 -1.36,-1 -0.58667,-0.21331 -1.22667,-0.25331 -1.92,-0.12 -0.66667,0.16002 -1.18667,0.46668 -1.56,0.92 -0.37334,0.42668 -0.53334,0.94668 -0.48,1.56 0.0533,0.58668 0.52,1.34668 1.4,2.28 0.34666,0.37335 0.89333,0.90668 1.64,1.6 0.74666,0.66668 1.19999,1.08001 1.36,1.24 0.39999,0.37334 0.73332,0.72001 1,1.04 0.29332,0.32001 0.61332,0.69334 0.96,1.12 0.37332,0.40001 0.65332,0.81334 0.84,1.24 0.21332,0.42667 0.39999,0.88001 0.56,1.36 0.15999,0.45334 0.22665,0.93334 0.2,1.44 -1e-5,0.50667 -0.08,1.02667 -0.24,1.56 -0.40001,1.38667 -1.20001,2.32 -2.4,2.8 -1.17334,0.48 -2.40001,0.52 -3.68,0.12 -1.28,-0.37333 -2.37334,-1.12 -3.28,-2.24 -0.88,-1.12 -1.32,-2.46666 -1.32,-4.04 0,-0.21333 0.08,-0.39999 0.24,-0.56 0.16,-0.15999 0.34666,-0.23999 0.56,-0.24 0.21333,10e-6 0.4,0.08 0.56,0.24 0.16,0.16001 0.24,0.34667 0.24,0.56 0,1.20001 0.33333,2.22667 1,3.08 0.66666,0.85334 1.47999,1.42667 2.44,1.72 0.95999,0.26667 1.81333,0.24 2.56,-0.08 0.77332,-0.34666 1.29332,-0.96 1.56,-1.84 0.31999,-1.01333 0.21332,-1.99999 -0.32,-2.96 -0.50668,-0.95999 -1.36001,-2.02666 -2.56,-3.2 -0.13334,-0.10666 -0.60001,-0.51999 -1.4,-1.24 l -1.68,-1.6 c -1.09334,-1.17332 -1.70667,-2.25332 -1.84,-3.24 -0.13334,-1.09332 0.13333,-1.99998 0.8,-2.72 0.66666,-0.74665 1.49333,-1.22665 2.48,-1.44 0.95999,-0.23998 1.91999,-0.18665 2.88,0.16 0.93332,0.26669 1.63999,0.85335 2.12,1.76 0.23999,0.37335 0.41332,0.85335 0.52,1.44 -1e-5,0.0267 0.0267,0.21335 0.08,0.56 0.0533,0.32002 0.10665,0.57335 0.16,0.76 0.0533,0.21335 0.0267,0.41335 -0.08,0.6 -0.10668,0.18668 -0.26668,0.30668 -0.48,0.36 -0.21334,0.0533 -0.41334,0.0267 -0.6,-0.08 -0.18668,-0.10665 -0.30668,-0.23999 -0.36,-0.4"
+         id="path8946"
+         inkscape:connector-curvature="0" />
     </g>
     <g
-       id="g5190"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="669.03003"
-       inkscape:export-ydpi="669.03003">
-      <g
-         transform="translate(-2.71875,1.9375)"
-         id="g5156">
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           d="m -10.5625,35.424683 4.0625,-0.15625 0.09375,3.625 -4.125,0.28125 z"
-           id="rect4385"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <g
-           id="g4374"
-           transform="translate(-0.6875,-1.6875)">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-48-3"
-             d="m -9.9047412,38.080241 1.7317051,-1.060078"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-4-26-2"
-             d="m -10.099437,37.068528 4.648858,-0.109375"
-             style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-4-2-3-6"
-             d="m -10.236921,40.853602 4.634803,-0.1875"
-             style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-4-5-3-0"
-             d="m -9.934606,36.855711 0.04956,4.167624"
-             style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-4-5-2-6-1"
-             d="m -5.758257,36.701031 -0.01674,4.233915"
-             style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-48-3-8"
-             d="m -10.074326,39.215549 3.4552782,-2.076544"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-48-3-6"
-             d="M -9.6765781,39.944752 -5.7793585,37.62514"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-48-3-86"
-             d="m -9.146248,40.607665 3.4552779,-2.076544"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-48-3-5"
-             d="M -7.5773548,40.696053 -5.7572613,39.52549"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        </g>
-      </g>
+       id="g15590"
+       transform="translate(195.16147,-6.8043535)">
+      <rect
+         inkscape:export-ydpi="14974.02"
+         inkscape:export-xdpi="14974.02"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/undo.png"
+         y="-122.42773"
+         x="-177.04521"
+         height="53.52066"
+         width="53.52066"
+         id="rect6135"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
       <g
-         id="g5172">
-        <path
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           d="m -16.25,34.955933 4.28125,-0.03125 0,3.71875 -4.25,0.125 z"
-           id="rect5169"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <g
-           id="g6468-7"
-           transform="translate(-40.917718,9.609749)">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-48"
-             d="m 24.7531,26.275701 4.03125,0"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path5062-3-6-4"
-             d="m 24.686809,27.214713 4.101332,-0.02321"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path5062-3-7-2-1"
-             d="m 24.731003,28.076498 4.079235,-0.0054"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path5062-3-7-0-7-6"
-             d="m 25.61889,25.446406 0.0054,3.628791"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         transform="matrix(17.427805,0,0,17.427805,-192.90052,-210.31619)"
+         inkscape:export-ydpi="14974.02"
+         inkscape:export-xdpi="14974.02"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/undo.png"
+         id="g3961-1-4">
+        <g
+           id="g3919-5-0"
+           transform="translate(-0.171875,-0.59375)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
+           inkscape:export-xdpi="1200"
+           inkscape:export-ydpi="1200">
+          <path
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path3899-1-3"
+             d="M 3.6570679,6.5899207 C 3.2022362,6.3063414 2.3828026,6.5144224 1.7898641,6.8274644 1.7861812,6.7132961 1.7051586,6.5549337 1.6572815,6.5070566 1.5136504,6.7943187 1.3700194,7.4461829 1.3589708,7.7776391 1.8672039,7.6450566 2.5190679,7.6229596 2.8726213,7.6450566 2.6921618,7.4940598 2.5117022,7.3430631 2.3312427,7.1920663 2.649809,6.9729368 3.2390646,6.6985648 3.6570679,6.5899207 z"
+             style="fill:url(#linearGradient15722);fill-opacity:1;stroke:none" />
           <path
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             sodipodi:nodetypes="cc"
+             sodipodi:nodetypes="ccccccccccccccc"
              inkscape:connector-curvature="0"
-             id="path5062-3-7-0-6-6-9"
-             d="m 26.656344,25.360699 0.0011,3.769416"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+             id="path3897-0-9"
+             d="m 1.6257457,6.4537659 c 0.057292,0.049479 0.1695009,0.139036 0.28148,0.2275777 C 2.2130817,6.4433307 3.1045105,6.0948323 3.9959394,6.6412659 3.2214587,6.6469346 2.7618617,6.9840588 2.5508568,7.2438436 2.7904401,7.4417603 2.8201012,7.5291915 3.0596845,7.7271082 2.5232909,7.6159786 1.9603842,7.6248254 1.2383568,7.9938436 1.2774198,7.4287394 1.4110646,6.6543634 1.6024709,6.4486342 c 0.083333,0.1354167 0.05082,0.152698 0.084434,0.2881147 C 1.5801345,7.0570614 1.4623151,7.3610311 1.4649193,7.6813436 1.8841135,7.4831017 2.1537597,7.481838 2.6281966,7.5156155 2.4713148,7.4165038 2.4028212,7.3284407 2.2348908,7.2624747 2.3714086,7.0017328 3.0990235,6.6028841 3.6111918,6.5686373 2.6434384,6.2651949 2.0041352,6.7928442 1.7696068,6.9938436 1.6758568,6.7021769 1.6432664,6.8548076 1.5495164,6.5631409 c 0.083333,0.020833 -0.0071,-0.130208 0.076229,-0.109375 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g15597"
+       transform="translate(212.80783,-6.8043535)">
+      <rect
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/redo.png"
+         y="-122.42773"
+         x="-116.04739"
+         height="53.52066"
+         width="53.52066"
+         id="rect6135-6"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
+      <g
+         transform="matrix(-17.427805,0,0,17.427805,-46.671241,-210.31619)"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/redo.png"
+         id="g3961-1-9-5">
+        <g
+           id="g3919-5-8-6"
+           transform="translate(-0.171875,-0.59375)"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/undo.png"
+           inkscape:export-xdpi="1200"
+           inkscape:export-ydpi="1200">
+          <path
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path3899-1-8-4"
+             d="M 3.6570679,6.5899207 C 3.2022362,6.3063414 2.3828026,6.5144224 1.7898641,6.8274644 1.7861812,6.7132961 1.7051586,6.5549337 1.6572815,6.5070566 1.5136504,6.7943187 1.3700194,7.4461829 1.3589708,7.7776391 1.8672039,7.6450566 2.5190679,7.6229596 2.8726213,7.6450566 2.6921618,7.4940598 2.5117022,7.3430631 2.3312427,7.1920663 2.649809,6.9729368 3.2390646,6.6985648 3.6570679,6.5899207 z"
+             style="fill:url(#linearGradient15724);fill-opacity:1;stroke:none" />
           <path
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             sodipodi:nodetypes="cc"
+             sodipodi:nodetypes="ccccccccccccccc"
              inkscape:connector-curvature="0"
-             id="path5062-3-7-0-6-3-5-9"
-             d="m 27.745573,25.27185 0.01941,3.71875"
-             style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-4-26"
-             d="m 24.537031,25.396279 4.648858,-0.109375"
-             style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-4-2-3"
-             d="m 24.399547,29.181353 4.634803,-0.1875"
-             style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-4-5-3"
-             d="m 24.701862,25.183462 0.04956,4.167624"
-             style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:export-ydpi="486.3132"
-             inkscape:export-xdpi="486.3132"
-             inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
-             inkscape:connector-curvature="0"
-             id="path5062-7-4-5-2-6"
-             d="m 28.878211,25.028782 -0.01674,4.233915"
-             style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+             id="path3897-0-5-4"
+             d="m 1.6257457,6.4537659 c 0.057292,0.049479 0.1695009,0.139036 0.28148,0.2275777 C 2.2130817,6.4433307 3.1045105,6.0948323 3.9959394,6.6412659 3.2214587,6.6469346 2.7618617,6.9840588 2.5508568,7.2438436 2.7904401,7.4417603 2.8201012,7.5291915 3.0596845,7.7271082 2.5232909,7.6159786 1.9603842,7.6248254 1.2383568,7.9938436 1.2774198,7.4287394 1.4110646,6.6543634 1.6024709,6.4486342 c 0.083333,0.1354167 0.05082,0.152698 0.084434,0.2881147 C 1.5801345,7.0570614 1.4623151,7.3610311 1.4649193,7.6813436 1.8841135,7.4831017 2.1537597,7.481838 2.6281966,7.5156155 2.4713148,7.4165038 2.4028212,7.3284407 2.2348908,7.2624747 2.3714086,7.0017328 3.0990235,6.6028841 3.6111918,6.5686373 2.6434384,6.2651949 2.0041352,6.7928442 1.7696068,6.9938436 1.6758568,6.7021769 1.6432664,6.8548076 1.5495164,6.5631409 c 0.083333,0.020833 -0.0071,-0.130208 0.076229,-0.109375 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
         </g>
       </g>
     </g>
-    <rect
-       style="fill:none;stroke:none;stroke-width:0.09290780000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect5188"
-       width="8.0713654"
-       height="8.0713654"
-       x="-16.723183"
-       y="33.92025"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
-       inkscape:export-xdpi="669.03003"
-       inkscape:export-ydpi="669.03003" />
-    <g
-       id="g4283"
-       transform="matrix(1.0532506,0,0,1.0532506,0.53956351,-2.7089174)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/metadata.png"
-       inkscape:export-xdpi="1437.51"
-       inkscape:export-ydpi="1437.51">
+    <g
+       id="g15604"
+       transform="translate(353.63031,-66.228044)">
+      <rect
+         inkscape:export-ydpi="14974.02"
+         inkscape:export-xdpi="14974.02"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/palette.png"
+         y="-63.004036"
+         x="-178.22569"
+         height="53.52066"
+         width="53.52066"
+         id="rect6135-6-0"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
+      <g
+         inkscape:export-ydpi="14974.02"
+         inkscape:export-xdpi="14974.02"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/palette.png"
+         transform="matrix(0,13.376459,-13.376459,0,-59.213817,-516.83077)"
+         id="g4827-6-9">
+        <path
+           style="fill:#009aff;fill-opacity:1;stroke:none"
+           d="m 34.260023,5.0859996 1.440663,0.1038316 -0.05192,1.6353479 -1.349809,-0.090852 z"
+           id="rect4291-3-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
+           inkscape:export-xdpi="1017.6678"
+           inkscape:export-ydpi="1017.6678" />
+        <path
+           style="fill:#009a00;fill-opacity:1;stroke:none"
+           d="m 37.225713,5.1768518 -1.245978,-0.038936 -0.02597,1.7521584 1.427683,-0.2076624 z"
+           id="rect4291-8-1-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
+           inkscape:export-xdpi="1017.6678"
+           inkscape:export-ydpi="1017.6678" />
+        <path
+           style="fill:#ff5900;fill-opacity:1;stroke:none"
+           d="m 35.759092,7.0198629 -1.440663,0.1038316 -0.194685,1.5834321 1.59641,-0.038936 z"
+           id="rect4291-8-9-8-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
+           inkscape:export-xdpi="1017.6678"
+           inkscape:export-ydpi="1017.6678" />
+        <path
+           style="fill:#e89aff;fill-opacity:1;stroke:none"
+           d="m 35.966757,7.0717787 1.466621,-0.012975 0.298516,1.6223689 -1.700241,-0.077874 z"
+           id="rect4291-1-6-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/color_palette.png"
+           inkscape:export-xdpi="1017.6678"
+           inkscape:export-ydpi="1017.6678" />
+      </g>
+    </g>
+    <g
+       id="g15617"
+       transform="translate(513.86417,-127.69205)">
+      <rect
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/opacity.png"
+         y="-1.5400316"
+         x="-181.17117"
+         height="53.52066"
+         width="53.52066"
+         id="rect6135-7-4"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
       <path
-         inkscape:export-ydpi="426.04535"
-         inkscape:export-xdpi="426.04535"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
-         sodipodi:nodetypes="ccccccccccc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/opacity.png"
+         transform="matrix(29.858356,0,0,29.886824,-1425.4902,-1405.6953)"
+         d="m 43.359375,47.877808 c 0,0.431472 -0.353275,0.78125 -0.789063,0.78125 -0.435787,0 -0.789062,-0.349778 -0.789062,-0.78125 0,-0.431473 0.353275,-0.78125 0.789062,-0.78125 0.435788,0 0.789063,0.349777 0.789063,0.78125 z"
+         sodipodi:ry="0.78125"
+         sodipodi:rx="0.7890625"
+         sodipodi:cy="47.877808"
+         sodipodi:cx="42.570312"
+         id="path16171-9-5"
+         style="fill:url(#radialGradient15762);fill-opacity:1;stroke:#009100;stroke-width:0.0904228;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g15743"
+       transform="translate(370.48969,-67.998895)">
+      <rect
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/width.png"
+         y="-61.233185"
+         x="-116.44089"
+         height="53.52066"
+         width="53.52066"
+         id="rect6135-7"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
+      <path
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/width.png"
+         sodipodi:open="true"
+         sodipodi:end="6.2756908"
+         sodipodi:start="0"
+         d="m 68.302099,21.720903 c 0,0.933598 -0.75683,1.690428 -1.690428,1.690428 -0.933597,0 -1.690427,-0.75683 -1.690427,-1.690428 0,-0.933597 0.75683,-1.690427 1.690427,-1.690427 0.928654,0 1.68342,0.749131 1.69038,1.677759"
+         sodipodi:ry="1.6904272"
+         sodipodi:rx="1.6904272"
+         sodipodi:cy="21.720903"
+         sodipodi:cx="66.611671"
+         id="path6273-3-0"
+         style="fill:#008700;fill-opacity:1;stroke:#005600;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc"
+         transform="matrix(13.80044,0,0,13.80044,-1008.9509,-334.23092)" />
+    </g>
+    <g
+       id="g15747"
+       transform="translate(527.9971,-127.33225)">
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
          inkscape:connector-curvature="0"
-         id="path4758-9-1"
-         d="m -11.747196,42.986773 -2.740692,0.02895 -0.05351,3.290764 3.008233,-0.216234 -0.20782,-2.666631 -0.292198,0.0429 0.178968,2.356187 -2.392887,0.242989 0.107017,-2.835943 2.392887,0.02456 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4477-1-8-1-0-9-6-3-1-8"
+         d="m -112.99959,9.0587642 46.199889,0.017809"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
+         y="-1.899827"
+         x="-116.65991"
+         height="53.52066"
+         width="53.52066"
+         id="rect6135-7-8-7"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="426.04535"
-         inkscape:export-xdpi="426.04535"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
          inkscape:connector-curvature="0"
-         id="path4760-3-8"
-         d="m -13.955317,44.030358 1.63664,-0.05565 c 0,0 0.264853,0.189181 0.227017,0.179722 -0.03783,-0.0095 -1.948788,-0.01053 -1.948788,-0.01053 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4477-1-8-1-0-9-6-3-5"
+         d="m -105.70142,47.960483 0.0178,-46.1998927"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="426.04535"
-         inkscape:export-xdpi="426.04535"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
          inkscape:connector-curvature="0"
-         id="path4760-7-4-8"
-         d="m -13.916499,44.491942 1.619685,0.02992 c 0,0 0.250706,0.207563 0.213639,0.195435 -0.03706,-0.01213 -1.926323,-0.118212 -1.926323,-0.118212 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4477-1-8-1-0-9-6-3-74-61"
+         d="m -99.384806,47.960483 0.01781,-46.1998927"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="426.04535"
-         inkscape:export-xdpi="426.04535"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
          inkscape:connector-curvature="0"
-         id="path4760-7-3-8-1"
-         d="m -13.896619,45.11974 1.590972,0.129106 c 0,0 0.279606,-0.166604 0.241117,-0.160312 -0.03848,0.0063 -1.907533,-0.08895 -1.907533,-0.08895 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-    </g>
-    <g
-       id="g5080"
-       inkscape:export-filename="/home/xtingray/tupi/necessitas/tupi.mobile/src/images/checked.png"
-       inkscape:export-xdpi="22153.85"
-       inkscape:export-ydpi="22153.85">
+         id="path4477-1-8-1-0-9-6-3-3-8"
+         d="m -93.068193,47.960483 0.01781,-46.1998927"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="1366.3"
-         inkscape:export-xdpi="1366.3"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/ok.png"
-         sodipodi:nodetypes="ccccccc"
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
          inkscape:connector-curvature="0"
-         id="path3837-0-7"
-         d="m -11.767948,47.689466 c -0.131369,-0.174641 -0.463735,-0.629889 -0.92596,-0.673684 -0.381827,0.527897 -0.919963,1.489473 -1.152924,2.271103 l -1.247536,-0.893693 -0.625848,1.182989 c 0.71942,0.101708 1.710268,0.274371 2.084159,1.100212 0.323402,-1.043428 1.032756,-2.213664 1.868109,-2.986927 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4477-1-8-1-0-9-6-3-6-13"
+         d="M -86.75167,47.960483 -86.73386,1.7605903"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="1366.3"
-         inkscape:export-xdpi="1366.3"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/ok.png"
-         sodipodi:nodetypes="ccc"
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
          inkscape:connector-curvature="0"
-         id="path4103-9-5"
-         d="m -15.49037,49.477194 c 0.518934,-0.02083 1.510759,0.353869 1.826986,0.793083 0.0853,-0.44396 1.012192,-2.070042 1.715511,-2.590605"
-         style="fill:none;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
-    </g>
-    <rect
-       style="fill:#e8e8e8;fill-opacity:1;stroke:#969696;stroke-width:0.33656886;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3050"
-       width="13.663428"
-       height="3.8182292"
-       x="-16.607027"
-       y="52.02354"
-       ry="0.34976143"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/tip.png"
-       inkscape:export-xdpi="6582.8599"
-       inkscape:export-ydpi="6582.8599" />
-    <rect
-       style="fill:none;stroke:#c8c8c8;stroke-width:0.4709295;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3050-5"
-       width="12.962106"
-       height="3.2056854"
-       x="-16.256367"
-       y="52.329815"
-       ry="0.2936506"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/tip.png"
-       inkscape:export-xdpi="6582.8599"
-       inkscape:export-ydpi="6582.8599" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#e8e8e8;fill-opacity:1;stroke:#b6b6b6;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path3820"
-       sodipodi:cx="681.51788"
-       sodipodi:cy="659.23718"
-       sodipodi:rx="6.6964288"
-       sodipodi:ry="6.6964288"
-       d="m 688.21431,659.23718 a 6.6964288,6.6964288 0 1 1 -10e-4,-0.11585"
-       sodipodi:start="0"
-       sodipodi:end="6.2658845"
-       sodipodi:open="true"
-       transform="matrix(0.17337459,0,0,0.17337459,-127.9332,-60.362316)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/tip.png"
-       inkscape:export-xdpi="6582.8599"
-       inkscape:export-ydpi="6582.8599" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#e8e8e8;fill-opacity:1;stroke:#c0c0c0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path3820-0"
-       sodipodi:cx="681.51788"
-       sodipodi:cy="659.23718"
-       sodipodi:rx="6.6964288"
-       sodipodi:ry="6.6964288"
-       d="m 688.21431,659.23718 a 6.6964288,6.6964288 0 1 1 -10e-4,-0.11585"
-       sodipodi:start="0"
-       sodipodi:end="6.2658845"
-       sodipodi:open="true"
-       transform="matrix(0.12928613,0,0,0.12928613,-97.886123,-31.297564)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/tip.png"
-       inkscape:export-xdpi="6582.8599"
-       inkscape:export-ydpi="6582.8599" />
-    <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect5030"
-       width="3.09375"
-       height="3.09375"
-       x="-8.21875"
-       y="42.237183"
-       inkscape:export-filename="/home/xtingray/tupi/necessitas/tupi.mobile/src/images/unchecked.png"
-       inkscape:export-xdpi="879.39001"
-       inkscape:export-ydpi="879.39001" />
-    <g
-       id="g5108"
-       inkscape:export-filename="/home/xtingray/tupi/necessitas/tupi.mobile/src/images/checked.png"
-       inkscape:export-xdpi="22153.85"
-       inkscape:export-ydpi="22153.85">
+         id="path4477-1-8-1-0-9-6-3-79-5"
+         d="m -80.435057,47.960483 0.01781,-46.1998927"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-6-3-0-0"
+         d="m -74.118444,47.960483 0.01781,-46.1998927"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-6-3-74-6-3"
+         d="m -112.99959,15.375377 46.199889,0.01781"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-6-3-3-4-0"
+         d="m -112.99959,21.69199 46.199889,0.01781"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-6-3-6-1-0"
+         d="m -112.99959,28.008602 46.199889,0.01781"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-6-3-79-6-9"
+         d="m -112.99959,34.325215 46.199889,0.01781"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
+         inkscape:connector-curvature="0"
+         id="path4477-1-8-1-0-9-6-3-0-8-1"
+         d="m -112.99959,40.641828 46.199889,0.01781"
+         style="fill:none;stroke:#008700;stroke-width:1.7809329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g15645"
+       transform="translate(672.92952,-187.04307)">
       <rect
-         y="46.784058"
-         x="-8.203125"
-         height="3.09375"
-         width="3.09375"
-         id="rect5030-3"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/post.png"
+         y="57.810993"
+         x="-182.94814"
+         height="53.52066"
+         width="53.52066"
+         id="rect6135-2"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
       <g
-         id="g5080-7"
-         transform="translate(7.087832,-0.51515488)">
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/post.png"
+         transform="matrix(8.9046644,0,0,8.9046644,75.74127,-96.125625)"
+         id="g6809-2">
+        <path
+           style="fill:url(#linearGradient15764);fill-opacity:1;stroke:#008700;stroke-width:0.25547042;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m -25.334456,20.297999 c 0.515113,1.501636 -0.638136,2.364343 -1.627876,2.364343 -0.989739,0 -1.792083,-0.788858 -1.792083,-1.761963 0,-0.973107 0.802344,-1.761966 1.792083,-1.761966 0.716593,0 1.364296,0.419712 1.64687,1.067173"
+           id="path4545-8-2-1-7-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csssc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
+           inkscape:export-xdpi="947.27002"
+           inkscape:export-ydpi="947.27002" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.25547042;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m -25.30147,20.70921 c -0.392879,1.152413 -2.855507,1.350582 -3.42943,0.26673"
+           id="path7034-3-6-3-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
+           inkscape:export-xdpi="947.27002"
+           inkscape:export-ydpi="947.27002" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m -11.767948,47.689466 c -0.131369,-0.174641 -0.463735,-0.629889 -0.92596,-0.673684 -0.381827,0.527897 -0.919963,1.489473 -1.152924,2.271103 l -1.247536,-0.893693 -0.625848,1.182989 c 0.71942,0.101708 1.710268,0.274371 2.084159,1.100212 0.323402,-1.043428 1.032756,-2.213664 1.868109,-2.986927 z"
-           id="path3837-0-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/ok.png"
-           inkscape:export-xdpi="1366.3"
-           inkscape:export-ydpi="1366.3" />
-        <path
-           style="fill:none;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
-           d="m -15.49037,49.477194 c 0.518934,-0.02083 1.510759,0.353869 1.826986,0.793083 0.0853,-0.44396 1.012192,-2.070042 1.715511,-2.590605"
-           id="path4103-9-5-8"
+           d="m -23.896272,17.89077 0.686825,0.482779 c -0.687115,-0.184936 -1.229625,-0.01239 -1.581797,0.258942 l 0.901007,0.279558 -2.838607,1.241657 1.298353,-2.35901 0.231987,0.65862 c 0.358038,-0.344292 0.92587,-0.60309 1.302232,-0.562546 z"
+           id="path7032-2-0-5"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/ok.png"
-           inkscape:export-xdpi="1366.3"
-           inkscape:export-ydpi="1366.3" />
+           sodipodi:nodetypes="cccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/import_project.png"
+           inkscape:export-xdpi="947.27002"
+           inkscape:export-ydpi="947.27002" />
       </g>
     </g>
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 58.812643,33.805772 -0.01429,-2.185811 3.126143,-0.04152 0.01429,0.231235 -2.924817,0.03883 0,1.723573 2.752292,-0.01942 -0.07655,-1.614198 0.251762,0.03883 0.04285,1.815524 z"
-       id="path4304-2-4-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/dynamic_background_mode.png"
-       inkscape:export-xdpi="14124.43"
-       inkscape:export-ydpi="14124.43" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 59.39673,32.582644 -0.0023,0.212876 1.108292,4.26e-4 -0.122774,0.351816 1.008298,-0.439055 -1.003269,-0.472257 0.134308,0.355394 z"
-       id="path7032-6-3-6-0-9-9-97-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/dynamic_background_mode.png"
-       inkscape:export-xdpi="14124.43"
-       inkscape:export-ydpi="14124.43" />
-    <g
-       id="g4371-1"
-       transform="translate(17.99935,0.30257155)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/new_item.png"
-       inkscape:export-xdpi="725.5"
-       inkscape:export-ydpi="725.5">
-      <path
-         style="fill:#008700;fill-opacity:0.43269234;stroke:none"
-         d="m 46.726563,8.6434331 c -0.664468,0 -1.820313,0.1232635 -2.007814,-0.1484375 -0.01031,-0.3455895 1.163658,-0.3671875 1.828126,-0.3671875 0.558752,0 1.497092,0.038055 1.624768,0.1533009 0.437732,0.3918372 -0.780612,0.3623241 -1.44508,0.3623241 z"
-         id="path4204-0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="scscs" />
-      <g
-         transform="matrix(0.95243881,0,0,1.2224944,-5.2816729,3.4051066)"
-         id="g4144-0">
-        <path
-           style="fill:url(#linearGradient4383-2);fill-opacity:1;stroke:none"
-           d="m 53.071592,2.4983545 2.315893,-0.017679 -0.0088,1.3170537 -2.324732,0.035357 z"
-           id="rect3928-0-8"
+    <g
+       id="g15635"
+       transform="translate(684.68143,-183.3462)">
+      <rect
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/new.png"
+         y="54.11412"
+         x="-116.05582"
+         height="53.52066"
+         width="53.52066"
+         id="rect6135-6-6"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
+      <g
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/new.png"
+         transform="matrix(8.5779686,0,0,8.5779686,69.374434,-89.092988)"
+         id="g6879-5">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m -17.308276,17.684998 c 0.256989,0.06327 0.02318,0.351206 -0.182406,0.325508 l -3.020404,0.09336 -0.04998,4.152879 3.220428,-0.006 0.213746,-4.194466 c 0.03953,-0.245126 0.285377,-0.03258 0.348635,0.173003 l -0.147599,4.381363 c 0,0 -4.014209,0.05615 -3.989006,0.06201 l -0.08015,-4.987537 z"
+           id="path3121-2-1"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc"
-           inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
-           inkscape:export-xdpi="583.88239"
-           inkscape:export-ydpi="583.88239" />
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+           inkscape:export-xdpi="597.56848"
+           inkscape:export-ydpi="597.56848" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 53.001881,2.4047839 -0.0125,1.550079 2.512629,-0.012502 -0.05,-1.5625796 -2.262616,-0.012501 0,0.2125109 2.100107,-0.087505 0.025,1.3000664 -2.125108,0 -0.02501,-1.4000715 z"
-           id="path3132-2-2"
+           d="m -16.923445,17.844149 c 0.17745,-0.241597 0.292074,-0.47272 0.532349,-0.724788 -6.6e-4,0.01443 0.391377,0.355232 0.391377,0.355232 -0.370735,0.196481 -0.615817,0.246369 -0.923726,0.369556 z"
+           id="path3759-9-9-3"
            inkscape:connector-curvature="0"
-           inkscape:export-filename="/media/windows/linux/xtingray/Brasil/path3906-4.png"
-           inkscape:export-xdpi="583.88239"
-           inkscape:export-ydpi="583.88239" />
-      </g>
-      <path
-         transform="matrix(0.6656206,0,0,0.6656206,11.046434,5.8557945)"
-         d="m 55.949822,2.8499913 c 0,0.5369709 -0.435301,0.9722718 -0.972271,0.9722718 -0.536971,0 -0.972272,-0.4353009 -0.972272,-0.9722718 0,-0.5369709 0.435301,-0.9722718 0.972272,-0.9722718 0.53697,0 0.972271,0.4353009 0.972271,0.9722718 z"
-         sodipodi:ry="0.9722718"
-         sodipodi:rx="0.9722718"
-         sodipodi:cy="2.8499913"
-         sodipodi:cx="54.977551"
-         id="path4140-2-3"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.6656206,0,0,0.6656206,11.01578,5.8612866)"
-         d="m 55.949822,2.8499913 c 0,0.5369709 -0.435301,0.9722718 -0.972271,0.9722718 -0.536971,0 -0.972272,-0.4353009 -0.972272,-0.9722718 0,-0.5369709 0.435301,-0.9722718 0.972272,-0.9722718 0.53697,0 0.972271,0.4353009 0.972271,0.9722718 z"
-         sodipodi:ry="0.9722718"
-         sodipodi:rx="0.9722718"
-         sodipodi:cy="2.8499913"
-         sodipodi:cx="54.977551"
-         id="path4140-9"
-         style="fill:url(#linearGradient4385-5);fill-opacity:1;stroke:#008700;stroke-width:0.30047148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         sodipodi:type="arc" />
-      <g
-         transform="matrix(-1.4043648,0.03338636,0.03338636,1.4043648,121.08734,-0.1589198)"
-         id="g4150-2">
+           sodipodi:nodetypes="cccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+           inkscape:export-xdpi="597.56848"
+           inkscape:export-ydpi="597.56848" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m -17.024881,17.809807 c -0.08583,-0.284541 -0.171635,-0.569081 -0.257452,-0.853621 -0.173146,0.008 -0.420729,0.133041 -0.483388,0.202352 0.335013,0.248299 0.493893,0.434179 0.74084,0.651269 z"
+           id="path3759-9-2-5-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           inkscape:transform-center-x="1.3939388"
+           inkscape:transform-center-y="2.9619778"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+           inkscape:export-xdpi="597.56848"
+           inkscape:export-ydpi="597.56848" />
         <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m -16.774627,17.963374 c 0.250946,0.132084 0.630666,0.274059 0.752838,0.39623 6.07e-4,0.0123 -0.277362,0.416043 -0.277362,0.416043 -0.138689,-0.181606 -0.316984,-0.541516 -0.475476,-0.812273 z"
+           id="path3759-6-2-5"
+           inkscape:connector-curvature="0"
            sodipodi:nodetypes="cccc"
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           d="M 53.804739,3.5818324 53.34375,4.6824949 54.4273,4.7256384 z"
-           id="path4148-2"
-           inkscape:connector-curvature="0" />
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+           inkscape:export-xdpi="597.56848"
+           inkscape:export-ydpi="597.56848" />
+        <path
+           style="fill:url(#linearGradient15766);fill-opacity:1;stroke:none"
+           d="m -20.819121,17.839185 3.866675,0.225358 -0.04745,4.412281 -3.771788,0.07116 z"
+           id="rect3927-3-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+           inkscape:export-xdpi="597.56848"
+           inkscape:export-ydpi="597.56848" />
         <path
-           sodipodi:nodetypes="ccccccccc"
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 53.733355,3.5196701 -0.591586,1.3059784 1.413838,-0.03288 -0.612329,-1.2068077 -0.110476,0.1375425 0.504143,0.9226537 -0.940554,0.014349 0.502693,-1.162932 z"
-           id="path4142-1"
-           inkscape:connector-curvature="0" />
+           d="m -17.245838,18.121041 c -0.01737,0.02056 -0.773811,0.407269 -0.773811,0.407269 0.135758,0.122185 0.271512,0.325814 0.285088,0.427633 0.162908,-0.278301 0.213816,-0.485329 0.488723,-0.834902 z"
+           id="path3759-8-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/new.png"
+           inkscape:export-xdpi="597.56848"
+           inkscape:export-ydpi="597.56848"
+           inkscape:transform-center-x="-0.17278971"
+           inkscape:transform-center-y="-0.1295921" />
+      </g>
+    </g>
+    <g
+       id="g15652"
+       transform="translate(829.43094,-244.71211)">
+      <rect
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/close.png"
+         y="116.84108"
+         x="-182.16116"
+         height="53.52066"
+         width="53.52066"
+         id="rect6135-6-6-0-1"
+         style="fill:#ffffff;fill-opacity:0;stroke:none" />
+      <g
+         inkscape:export-ydpi="14974.03"
+         inkscape:export-xdpi="14974.03"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/close.png"
+         transform="matrix(8.9046644,0,0,8.9046644,75.997457,-95.957861)"
+         id="g6928-5">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m -27.022027,24.321944 c -0.451471,0.273334 -1.143411,0.615374 -1.457468,0.923064 0.615374,0.550598 1.23075,1.101197 1.846125,1.651795 l -2.009204,1.353835 c 0.354784,0.502015 1.083295,1.285272 1.747253,1.546819 0,0 1.064982,-2.003099 1.08785,-2.026174 0.24291,0.663958 0.485822,1.327916 0.728734,1.991872 0.548633,-0.338586 1.406446,-1.226821 1.748961,-1.94329 -0.806926,-0.419895 -1.410005,-0.79902 -2.216931,-1.218915 -0.06094,-0.01199 1.223533,-0.920808 1.937224,-1.360827 -0.104597,-0.307686 -0.552704,-0.821492 -1.138229,-1.232237 -0.457939,0.462108 -0.915879,0.924213 -1.373819,1.38632 -0.300164,-0.35742 -0.600329,-0.714842 -0.900496,-1.072262 z"
+           id="path3837-0-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccc"
+           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/close_big.png"
+           inkscape:export-xdpi="1250.21"
+           inkscape:export-ydpi="1250.21" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:0.36900684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
+           d="m -28.407783,28.315211 c 0.418156,0.464756 1.121703,1.051823 1.49909,1.210803 0.262072,-0.377669 0.870687,-1.631892 1.153146,-1.989178 0.259458,0.615011 0.559686,1.474643 0.778374,1.845035 0.328174,-0.114706 1.227125,-1.105982 1.412605,-1.383776"
+           id="path4103-9-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/close.png"
+           inkscape:export-xdpi="717"
+           inkscape:export-ydpi="717" />
       </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path4206-0"
-         d="m 46.988951,6.3880713 -0.0046,-0.4165133 0.95234,-0.012944 -0.03582,1.1821384"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g8929">
+       id="g15658"
+       transform="translate(196.57568,-244.65895)">
       <g
-         id="g8831">
+         inkscape:export-ydpi="669.03003"
+         inkscape:export-xdpi="669.03003"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
+         id="g5190-3"
+         transform="matrix(8.9046644,0,0,8.9046644,-33.084682,-123.26214)">
+        <g
+           id="g5156-3"
+           transform="translate(-2.71875,1.9375)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="rect4385-8"
+             d="m -10.5625,35.424683 4.0625,-0.15625 0.09375,3.625 -4.125,0.28125 z"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+          <g
+             transform="translate(-0.6875,-1.6875)"
+             id="g4374-9">
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m -9.9047412,38.080241 1.7317051,-1.060078"
+               id="path5062-7-48-3-67"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m -10.099437,37.068528 4.648858,-0.109375"
+               id="path5062-7-4-26-2-0"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m -10.236921,40.853602 4.634803,-0.1875"
+               id="path5062-7-4-2-3-6-9"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m -9.934606,36.855711 0.04956,4.167624"
+               id="path5062-7-4-5-3-0-4"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m -5.758257,36.701031 -0.01674,4.233915"
+               id="path5062-7-4-5-2-6-1-1"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m -10.074326,39.215549 3.4552782,-2.076544"
+               id="path5062-7-48-3-8-9"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="M -9.6765781,39.944752 -5.7793585,37.62514"
+               id="path5062-7-48-3-6-7"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m -9.146248,40.607665 3.4552779,-2.076544"
+               id="path5062-7-48-3-86-3"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="M -7.5773548,40.696053 -5.7572613,39.52549"
+               id="path5062-7-48-3-5-9"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+          </g>
+        </g>
+        <g
+           id="g5172-7">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="rect5169-7"
+             d="m -16.25,34.955933 4.28125,-0.03125 0,3.71875 -4.25,0.125 z"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+          <g
+             transform="translate(-40.917718,9.609749)"
+             id="g6468-7-1">
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 24.7531,26.275701 4.03125,0"
+               id="path5062-7-48-33"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 24.686809,27.214713 4.101332,-0.02321"
+               id="path5062-3-6-4-8"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 24.731003,28.076498 4.079235,-0.0054"
+               id="path5062-3-7-2-1-8"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 25.61889,25.446406 0.0054,3.628791"
+               id="path5062-3-7-0-7-6-4"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 26.656344,25.360699 0.0011,3.769416"
+               id="path5062-3-7-0-6-6-9-2"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 27.745573,25.27185 0.01941,3.71875"
+               id="path5062-3-7-0-6-3-5-9-0"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 24.537031,25.396279 4.648858,-0.109375"
+               id="path5062-7-4-26-0"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 24.399547,29.181353 4.634803,-0.1875"
+               id="path5062-7-4-2-3-8"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 24.701862,25.183462 0.04956,4.167624"
+               id="path5062-7-4-5-3-1"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 28.878211,25.028782 -0.01674,4.233915"
+               id="path5062-7-4-5-2-6-3"
+               inkscape:connector-curvature="0"
+               inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/subgrid.png"
+               inkscape:export-xdpi="486.3132"
+               inkscape:export-ydpi="486.3132"
+               sodipodi:nodetypes="cc" />
+          </g>
+        </g>
+      </g>
+      <rect
+         inkscape:export-ydpi="669.03003"
+         inkscape:export-xdpi="669.03003"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/brush.png"
+         y="178.78635"
+         x="-181.99892"
+         height="71.872803"
+         width="71.872803"
+         id="rect5188"
+         style="fill:none;stroke:none" />
+    </g>
+    <g
+       id="g15687"
+       transform="translate(292.24046,-301.22749)">
+      <rect
+         inkscape:export-ydpi="1437.51"
+         inkscape:export-xdpi="1437.51"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/metadata.png"
+         y="254.62437"
+         x="-167.27992"
+         height="33.450413"
+         width="33.450413"
+         id="rect4289-2"
+         style="fill:none;stroke:none" />
+      <g
+         inkscape:export-ydpi="1437.51"
+         inkscape:export-xdpi="1437.51"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/metadata.png"
+         transform="matrix(9.3788431,0,0,9.3788431,-28.280081,-147.38417)"
+         id="g4283-6">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m -11.747196,42.986773 -2.740692,0.02895 -0.05351,3.290764 3.008233,-0.216234 -0.20782,-2.666631 -0.292198,0.0429 0.178968,2.356187 -2.392887,0.242989 0.107017,-2.835943 2.392887,0.02456 z"
+           id="path4758-9-1-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+           inkscape:export-xdpi="426.04535"
+           inkscape:export-ydpi="426.04535" />
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m -13.955317,44.030358 1.63664,-0.05565 c 0,0 0.264853,0.189181 0.227017,0.179722 -0.03783,-0.0095 -1.948788,-0.01053 -1.948788,-0.01053 z"
+           id="path4760-3-8-6"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+           inkscape:export-xdpi="426.04535"
+           inkscape:export-ydpi="426.04535"
+           sodipodi:nodetypes="ccccc" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 63.782537,30.75963 -0.21085,-0.0017 0.0096,1.851611 -0.34847,-0.08926 0.434879,0.733101 0.467764,-0.729444 -0.352013,0.09765 z"
-           id="path7032-6-3-6-0-9-9-97-7-3"
+           d="m -13.916499,44.491942 1.619685,0.02992 c 0,0 0.250706,0.207563 0.213639,0.195435 -0.03706,-0.01213 -1.926323,-0.118212 -1.926323,-0.118212 z"
+           id="path4760-7-4-8-9"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back.png"
-           inkscape:export-xdpi="888.16077"
-           inkscape:export-ydpi="888.16077" />
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+           inkscape:export-xdpi="426.04535"
+           inkscape:export-ydpi="426.04535"
+           sodipodi:nodetypes="ccccc" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 64.455016,33.290935 0.0012,-0.07805 -1.543395,0.0017 -7.59e-4,0.07668 z"
-           id="path7032-6-3-6-0-9-9-97-7-3-5"
+           d="m -13.896619,45.11974 1.590972,0.129106 c 0,0 0.279606,-0.166604 0.241117,-0.160312 -0.03848,0.0063 -1.907533,-0.08895 -1.907533,-0.08895 z"
+           id="path4760-7-3-8-1-2"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back.png"
-           inkscape:export-xdpi="888.16077"
-           inkscape:export-ydpi="888.16077" />
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/paste.png"
+           inkscape:export-xdpi="426.04535"
+           inkscape:export-ydpi="426.04535"
+           sodipodi:nodetypes="ccccc" />
       </g>
     </g>
     <g
-       id="g8934">
-      <path
-         inkscape:export-ydpi="888.16077"
-         inkscape:export-xdpi="888.16077"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-9-97-7-3-4"
-         d="m 65.754648,30.762283 -0.21085,-0.0017 0.0096,0.882861 -0.34847,-0.08926 0.434879,0.733101 0.467764,-0.729444 -0.352013,0.09765 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="888.16077"
-         inkscape:export-xdpi="888.16077"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-9-97-7-3-5-0"
-         d="m 66.427126,33.290935 0.0012,-0.07805 -1.543395,0.0017 -7.59e-4,0.07668 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+       id="g15710"
+       transform="translate(519.9187,-339.35809)">
+      <g
+         id="g15705">
+        <g
+           transform="matrix(8.9046644,0,0,8.9046644,-33.084682,-123.26214)"
+           id="g5080-5"
+           inkscape:export-filename="/home/xtingray/tupi/necessitas/tupi.mobile/src/images/checked.png"
+           inkscape:export-xdpi="22153.85"
+           inkscape:export-ydpi="22153.85">
+          <path
+             inkscape:export-ydpi="1366.3"
+             inkscape:export-xdpi="1366.3"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/ok.png"
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path3837-0-7-00"
+             d="m -11.767948,47.689466 c -0.131369,-0.174641 -0.463735,-0.629889 -0.92596,-0.673684 -0.381827,0.527897 -0.919963,1.489473 -1.152924,2.271103 l -1.247536,-0.893693 -0.625848,1.182989 c 0.71942,0.101708 1.710268,0.274371 2.084159,1.100212 0.323402,-1.043428 1.032756,-2.213664 1.868109,-2.986927 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:export-ydpi="1366.3"
+             inkscape:export-xdpi="1366.3"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/ok.png"
+             sodipodi:nodetypes="ccc"
+             inkscape:connector-curvature="0"
+             id="path4103-9-5-4"
+             d="m -15.49037,49.477194 c 0.518934,-0.02083 1.510759,0.353869 1.826986,0.793083 0.0853,-0.44396 1.012192,-2.070042 1.715511,-2.590605"
+             style="fill:none;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g15716"
+       transform="translate(603.01852,-388.69606)">
+      <rect
+         inkscape:export-ydpi="6582.8599"
+         inkscape:export-xdpi="6582.8599"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/tip.png"
+         ry="3.1145082"
+         y="339.99005"
+         x="-180.96465"
+         height="34.00005"
+         width="121.66824"
+         id="rect3050-0"
+         style="fill:#e8e8e8;fill-opacity:1;stroke:#969696;stroke-width:2.99703288;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         inkscape:export-ydpi="6582.8599"
+         inkscape:export-xdpi="6582.8599"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/tip.png"
+         ry="2.6148601"
+         y="342.71732"
+         x="-177.84225"
+         height="28.545553"
+         width="115.4232"
+         id="rect3050-5-9"
+         style="fill:none;stroke:#c8c8c8;stroke-width:4.19346905;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="6582.8599"
+         inkscape:export-xdpi="6582.8599"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/tip.png"
+         transform="matrix(1.5438425,0,0,1.5438425,-1172.2869,-660.76835)"
+         sodipodi:open="true"
+         sodipodi:end="6.2658845"
+         sodipodi:start="0"
+         d="m 688.21431,659.23718 c 0,3.69834 -2.99809,6.69643 -6.69643,6.69643 -3.69833,0 -6.69643,-2.99809 -6.69643,-6.69643 0,-3.69833 2.9981,-6.69643 6.69643,-6.69643 3.65318,0 6.63223,2.92796 6.69543,6.58058"
+         sodipodi:ry="6.6964288"
+         sodipodi:rx="6.6964288"
+         sodipodi:cy="659.23718"
+         sodipodi:cx="681.51788"
+         id="path3820-03"
+         style="fill:#e8e8e8;fill-opacity:1;stroke:#b6b6b6;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
       <path
-         inkscape:export-ydpi="888.16077"
-         inkscape:export-xdpi="888.16077"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-9-97-7-3-5-0-4"
-         d="m 66.06051,32.341197 6.29e-4,-0.07805 -0.809381,0.0017 -3.98e-4,0.07668 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         inkscape:export-ydpi="6582.8599"
+         inkscape:export-xdpi="6582.8599"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/tip.png"
+         transform="matrix(1.1512496,0,0,1.1512496,-904.72773,-401.95641)"
+         sodipodi:open="true"
+         sodipodi:end="6.2658845"
+         sodipodi:start="0"
+         d="m 688.21431,659.23718 c 0,3.69834 -2.99809,6.69643 -6.69643,6.69643 -3.69833,0 -6.69643,-2.99809 -6.69643,-6.69643 0,-3.69833 2.9981,-6.69643 6.69643,-6.69643 3.65318,0 6.63223,2.92796 6.69543,6.58058"
+         sodipodi:ry="6.6964288"
+         sodipodi:rx="6.6964288"
+         sodipodi:cy="659.23718"
+         sodipodi:cx="681.51788"
+         id="path3820-0-8"
+         style="fill:#e8e8e8;fill-opacity:1;stroke:#c0c0c0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
     </g>
     <g
-       transform="matrix(1,0,0,-1,4.4548059,63.949282)"
-       id="g8929-6"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_export.png"
-       inkscape:export-xdpi="888.16077"
-       inkscape:export-ydpi="888.16077">
-      <g
-         id="g8831-2">
-        <path
-           style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 63.782537,30.75963 -0.21085,-0.0017 0.0096,1.851611 -0.34847,-0.08926 0.434879,0.733101 0.467764,-0.729444 -0.352013,0.09765 z"
-           id="path7032-6-3-6-0-9-9-97-7-3-1"
+       id="g15695"
+       transform="translate(307.6441,-294.15642)">
+      <rect
+         inkscape:export-ydpi="879.39001"
+         inkscape:export-xdpi="879.39001"
+         inkscape:export-filename="/home/xtingray/tupi/necessitas/tupi.mobile/src/images/unchecked.png"
+         y="252.84578"
+         x="-106.26987"
+         height="27.548805"
+         width="27.548805"
+         id="rect5030-0"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:8.90466404;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g15698"
+       transform="translate(382.46944,-335.06229)">
+      <g
+         inkscape:export-ydpi="22153.85"
+         inkscape:export-xdpi="22153.85"
+         inkscape:export-filename="/home/xtingray/tupi/necessitas/tupi.mobile/src/images/checked.png"
+         id="g5108-9"
+         transform="matrix(8.9046644,0,0,8.9046644,-33.084682,-123.26214)">
+        <rect
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect5030-3-9"
+           width="3.09375"
+           height="3.09375"
+           x="-8.203125"
+           y="46.784058" />
+        <g
+           transform="translate(7.087832,-0.51515488)"
+           id="g5080-7-7">
+          <path
+             inkscape:export-ydpi="1366.3"
+             inkscape:export-xdpi="1366.3"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/ok.png"
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path3837-0-7-0-6"
+             d="m -11.767948,47.689466 c -0.131369,-0.174641 -0.463735,-0.629889 -0.92596,-0.673684 -0.381827,0.527897 -0.919963,1.489473 -1.152924,2.271103 l -1.247536,-0.893693 -0.625848,1.182989 c 0.71942,0.101708 1.710268,0.274371 2.084159,1.100212 0.323402,-1.043428 1.032756,-2.213664 1.868109,-2.986927 z"
+             style="fill:#008700;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:export-ydpi="1366.3"
+             inkscape:export-xdpi="1366.3"
+             inkscape:export-filename="/home/xtingray/tupi/sources/tupi.mobile/images/ok.png"
+             sodipodi:nodetypes="ccc"
+             inkscape:connector-curvature="0"
+             id="path4103-9-5-8-0"
+             d="m -15.49037,49.477194 c 0.518934,-0.02083 1.510759,0.353869 1.826986,0.793083 0.0853,-0.44396 1.012192,-2.070042 1.715511,-2.590605"
+             style="fill:none;stroke:#ffffff;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g8612-0"
+       transform="translate(-40.061075,119.96918)"
+       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/edit_sign.png"
+       inkscape:export-xdpi="345.97"
+       inkscape:export-ydpi="345.97">
+      <g
+         transform="matrix(14.103129,0,0,14.103129,13.381306,238.70227)"
+         id="g4195-6">
+        <path
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="M 9.7545757,5.6673457 C 9.7283513,5.5669215 9.3424413,5.1352863 9.2410043,5.1669413 9.1149559,5.2502011 8.6160804,5.8258729 8.2192047,6.2463646 8.1204594,6.3740539 7.9700527,6.7787043 7.9100532,6.9698165 7.9834743,6.9778922 8.4266549,6.841396 8.5692109,6.7499763 8.9559569,6.3837907 9.213184,6.1395545 9.5999299,5.7733689 9.5553221,5.7313308 9.5107143,5.6892928 9.4661065,5.6472548 9.1119442,6.0195182 8.8873006,6.2698323 8.5331383,6.6420957 8.4930653,6.671148 8.3250047,6.7662395 8.2266148,6.7752823 c -0.09839,0.00904 -0.08237,-0.1270532 -0.08237,-0.1270532 L 8.289521,6.3212958 c 0.3579985,-0.382787 0.5875755,-0.5591267 0.945574,-0.9419136 0.1387946,0.1195484 0.277589,0.239097 0.4163836,0.3586456 0.034366,-0.023561 0.068731,-0.047122 0.1030971,-0.070682 z"
+           id="path4007-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccsccccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
+           inkscape:export-xdpi="1246.5846"
+           inkscape:export-ydpi="1246.5846" />
+        <path
+           style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 8.2768724,6.3353946 0.2368475,0.00842 0.027377,0.2792868"
+           id="path4009-4"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back.png"
-           inkscape:export-xdpi="888.16077"
-           inkscape:export-ydpi="888.16077" />
+           sodipodi:nodetypes="ccc"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
+           inkscape:export-xdpi="1246.5846"
+           inkscape:export-ydpi="1246.5846" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="m 64.455016,33.290935 0.0012,-0.07805 -1.543395,0.0017 -7.59e-4,0.07668 z"
-           id="path7032-6-3-6-0-9-9-97-7-3-5-9"
+           d="M 9.0445453,5.5573814 9.3333518,5.9371866 9.2743466,5.9823759 8.8922912,5.6807094 z"
+           id="path4011-0"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ccccc"
-           inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back.png"
-           inkscape:export-xdpi="888.16077"
-           inkscape:export-ydpi="888.16077" />
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
+           inkscape:export-xdpi="1246.5846"
+           inkscape:export-ydpi="1246.5846" />
+        <path
+           style="fill:url(#linearGradient11039-0);fill-opacity:1;stroke:none"
+           d="M 8.2642565,6.2852899 8.9599573,5.5805976 9.2525543,5.9292239 8.530033,6.6924913 8.5378726,6.3522219 z"
+           id="path4013-1"
+           inkscape:connector-curvature="0"
+           inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/illustration_mode.png"
+           inkscape:export-xdpi="1246.5846"
+           inkscape:export-ydpi="1246.5846" />
       </g>
     </g>
     <g
-       transform="matrix(1,0,0,-1,4.4548059,63.951935)"
-       id="g8934-8"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_front_one.png"
-       inkscape:export-xdpi="888.16077"
-       inkscape:export-ydpi="888.16077">
+       id="g8814"
+       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/sound_object.png"
+       inkscape:export-xdpi="49.779999"
+       inkscape:export-ydpi="49.779999">
       <path
-         inkscape:export-ydpi="888.16077"
-         inkscape:export-xdpi="888.16077"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-9-97-7-3-4-5"
-         d="m 65.754648,30.762283 -0.21085,-0.0017 0.0096,0.882861 -0.34847,-0.08926 0.434879,0.733101 0.467764,-0.729444 -0.352013,0.09765 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         sodipodi:open="true"
+         sodipodi:end="6.2756908"
+         sodipodi:start="0"
+         transform="matrix(2.2573494,0,0,2.6944606,-275.32382,-1795.0064)"
+         d="m 223.50975,951.78802 c 0,1.64852 -2.1204,2.98491 -4.73605,2.98491 -2.61565,0 -4.73605,-1.33639 -4.73605,-2.98491 0,-1.64851 2.1204,-2.9849 4.73605,-2.9849 2.60179,0 4.71642,1.32279 4.73591,2.96253"
+         sodipodi:ry="2.9849057"
+         sodipodi:rx="4.7360506"
+         sodipodi:cy="951.78802"
+         sodipodi:cx="218.7737"
+         id="path8806"
+         style="fill:#008700;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
       <path
-         inkscape:export-ydpi="888.16077"
-         inkscape:export-xdpi="888.16077"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
-         sodipodi:nodetypes="ccccc"
+         sodipodi:nodetypes="ccccccccc"
          inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-9-97-7-3-5-0-1"
-         d="m 66.427126,33.290935 0.0012,-0.07805 -1.543395,0.0017 -7.59e-4,0.07668 z"
+         id="path8808"
+         d="m 224.31166,744.44004 c 3.13862,0.0653 6.37533,0.32703 9.02355,0.68657 3.5092,2.29242 6.49923,6.41596 7.65038,10.78902 0.35963,1.96162 0.5231,5.10027 -0.58849,6.37532 -0.61613,-3.97278 -5.36973,-12.03258 -7.65038,-12.26024 -1.2097,-0.4251 -2.61551,-0.35954 -4.11944,-0.29423 0.19617,6.86572 0.39231,13.73144 0.58848,20.59717 -1.70009,0 -3.40017,0 -5.10027,0 0.0653,-8.63121 0.13087,-17.26241 0.19617,-25.89361 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
-         inkscape:export-ydpi="888.16077"
-         inkscape:export-xdpi="888.16077"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
-         sodipodi:nodetypes="ccccc"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path7032-6-3-6-0-9-9-97-7-3-5-0-4-7"
-         d="m 66.06051,32.341197 6.29e-4,-0.07805 -0.809381,0.0017 -3.98e-4,0.07668 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-    </g>
-    <g
-       id="g4335"
-       transform="translate(-5,-3)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/player.png"
-       inkscape:export-xdpi="11912.27"
-       inkscape:export-ydpi="11912.27">
+         id="path8810"
+         d="m 197.55667,760.01369 c 0.91545,-10.03705 9.57933,-18.11244 18.9298,-19.51829"
+         style="fill:none;stroke:#008700;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.25490196;stroke-dasharray:none" />
       <path
-         inkscape:export-ydpi="170"
-         inkscape:export-xdpi="170"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
-         sodipodi:nodetypes="ccccccccccccc"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path5081-9"
-         d="m 81.200849,30.196205 -2.612854,0.06296 0,0.550903 -0.456462,0.01574 0,-0.409242 -0.645343,-0.01574 0,1.054584 0.692563,-0.01574 0.01574,-0.299061 0.377762,-0.03148 0.04721,0.865705 2.534152,-0.03148 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:export-ydpi="170"
-         inkscape:export-xdpi="170"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
-         id="path5083-3-2-5"
-         d="m 79.280558,28.795339 c -0.382896,0 -0.692563,0.348591 -0.692563,0.771263 0,0.422672 0.309667,0.755524 0.692563,0.755524 0.382897,0 0.692564,-0.332852 0.692564,-0.755524 0,-0.422672 -0.309667,-0.771263 -0.692564,-0.771263 z m 0.0787,0.409242 c 0.190726,0 0.346282,0.182963 0.346282,0.393501 0,0.21054 -0.155556,0.377762 -0.346282,0.377762 -0.190726,0 -0.346281,-0.167222 -0.346281,-0.377762 0,-0.210538 0.155555,-0.393501 0.346281,-0.393501 z"
-         style="fill:#008700;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="170"
-         inkscape:export-xdpi="170"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/background_foreground.png"
-         id="path5083-3-2-7-9"
-         d="m 80.571245,28.749533 c 0.382896,0 0.692564,0.348591 0.692564,0.771264 0,0.422672 -0.309668,0.755524 -0.692564,0.755524 -0.382896,0 -0.692564,-0.332852 -0.692564,-0.755524 0,-0.422673 0.309668,-0.771264 0.692564,-0.771264 z m -0.0787,0.409242 c -0.190726,0 -0.346282,0.182963 -0.346282,0.393501 0,0.21054 0.155556,0.377763 0.346282,0.377763 0.190727,0 0.346282,-0.167223 0.346282,-0.377763 0,-0.210538 -0.155555,-0.393501 -0.346282,-0.393501 z"
-         style="fill:#008700;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0" />
+         id="path8812"
+         d="m 206.48213,760.406 c 0.59705,-4.33118 5.66889,-10.12229 10.39668,-11.08322"
+         style="fill:none;stroke:#008700;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.25490196;stroke-dasharray:none" />
     </g>
     <g
-       id="g8175"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/player.png"
-       inkscape:export-xdpi="11912.27"
-       inkscape:export-ydpi="11912.27">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44"
-         d="m 73.176672,14.94479 4.0089,-0.03817 0.175575,3.223609 -4.082409,0.189017 z"
-         style="fill:none;stroke:#008700;stroke-width:0.29999999999999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="g8078"
+       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/pause.png"
+       inkscape:export-xdpi="119.93343"
+       inkscape:export-ydpi="119.93343">
       <g
-         transform="matrix(0.86458333,0,0,1,73.295172,6.4215903)"
-         inkscape:export-ydpi="1008"
-         inkscape:export-xdpi="1008"
-         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/play_back.png"
-         id="g4401-5-6-3">
+         inkscape:export-ydpi="1018.1176"
+         inkscape:export-xdpi="1018.1176"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+         id="g4586-3-56"
+         transform="matrix(2.8664378,0,0,8.4891828,236.70983,666.497)">
+        <path
+           style="fill:url(#linearGradient8076);fill-opacity:1;stroke:none"
+           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+           id="path4576-9-3"
+           inkscape:connector-curvature="0" />
         <path
            style="fill:#008700;fill-opacity:1;stroke:none"
-           d="M 1.1330425,9.0504687 C 1.0991117,9.018957 1.0651808,8.9874452 1.03125,8.9559335 c 0,0.8333335 0,1.6666675 0,2.5000005 1,-0.302083 2,-0.604167 3,-0.90625 C 3.1085263,10.073645 2.1858026,9.5976056 1.2630789,9.1215664 1.2160959,9.1746194 1.1691119,9.2276734 1.1221286,9.2807269 1.1496196,9.4069907 1.1771096,9.5332544 1.2046006,9.6595182 1.7509839,9.8801641 2.2973671,10.10081 2.8437504,10.321456 2.3854171,10.480865 2.0677087,10.601212 1.6093754,10.760621 1.5976949,10.768565 1.4415215,9.4407013 1.4415215,9.4407013 1.3725493,9.3106238 1.2020147,9.1805462 1.1330425,9.0504687 z"
-           id="path4387-9-9-1"
+           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.769116,0.0073 0.07364,0.9981615 -0.6935087,0.03393 0.017018,-1.0805781 1.3804607,-0.035426 z"
+           id="path4574-3-1"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ccccccccccc" />
+      </g>
+      <g
+         inkscape:export-ydpi="1018.1176"
+         inkscape:export-xdpi="1018.1176"
+         inkscape:export-filename="/media/windows/linux/xtingray/tupi/sources/tupi/src/themes/default/icons/ff.png"
+         id="g4586-3-5-6"
+         transform="matrix(2.6141422,0,0,8.4891828,245.88203,666.08297)">
         <path
-           style="fill:#008700;fill-opacity:0.3942308;stroke:none"
-           d="M 1.281631,9.6116999 1.314777,10.992768 3.2814177,10.396146 z"
-           id="path4389-7-8-2"
+           style="fill:url(#linearGradient8074);fill-opacity:1;stroke:none"
+           d="M 9.2769368,9.5036803 9.2088688,11.375544 11.114767,11.205374 11.012663,9.4866633 z"
+           id="path4576-9-9-9"
            inkscape:connector-curvature="0" />
         <path
-           style="fill:none;stroke:#ffffff;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.17788463;stroke-dasharray:none"
-           d="M 1.2805659,9.2180855 3.825795,10.520916"
-           id="path4399-2-7-0"
+           style="fill:#008700;fill-opacity:1;stroke:none"
+           d="m 11.267919,9.3675441 -2.1951855,0.025525 -0.05956,2.1356249 2.2377285,-0.136136 -0.04254,-1.5400315 -0.814584,0.030738 0.07364,0.9981625 -0.6555468,0.0105 0.017018,-1.0805786 1.3879668,-0.035426 z"
+           id="path4574-3-5-5"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+           sodipodi:nodetypes="ccccccccccc" />
       </g>
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3"
-         d="m 72.419832,18.525879 0.1606,-3.767735"
-         style="fill:none;stroke:#008700;stroke-width:0.25016239;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3-4"
-         d="M 78.017032,18.277271 77.815607,14.77197"
-         style="fill:none;stroke:#008700;stroke-width:0.25016239;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3-4-6"
-         d="m 77.788058,15.436071 -0.607367,0.03972"
-         style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3-4-6-1"
-         d="m 77.897434,16.232946 -0.607367,0.03972"
-         style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3-4-6-1-7"
-         d="m 77.928684,16.982946 -0.607367,0.03972"
-         style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3-4-6-1-7-5"
-         d="m 77.928684,17.748571 -0.607367,0.03972"
-         style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3-4-6-1-7-5-6"
-         d="m 73.131809,15.436071 -0.607367,0.03972"
-         style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3-4-6-1-7-5-6-2"
-         d="m 73.194309,16.232946 -0.747992,0.05535"
-         style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3-4-6-1-7-5-6-3"
-         d="m 73.194309,16.982946 -0.794867,0.05535"
-         style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-44-3-4-6-1-7-5-6-9"
-         d="m 73.163059,17.748571 -0.794867,0.03972"
-         style="fill:none;stroke:#008700;stroke-width:0.21944718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
-    <g
-       id="g5323"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/security_frame.png"
-       inkscape:export-xdpi="511.89999"
-       inkscape:export-ydpi="511.89999">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-47-0"
-         d="m 71.49909,4.2030853 4.296837,0.00919 0.0037,3.4437752 -4.302413,-0.021662 z"
-         style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-47"
-         d="m 72.744534,5.2514209 1.806918,0.00361 0.0016,1.3526841 -1.809263,-0.00851 z"
-         style="fill:none;stroke:#008700;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
-         inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-47-6-8-3"
-         d="m 71.01121,6.0855989 0.0026,-0.311928 0.98174,-2.69e-4 -0.0062,0.312332 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#008700;fill-opacity:1;stroke:none"
+       d="M 310.6875 945.46875 C 305.99942 945.46875 294.1875 949.28067 294.1875 953.96875 C 294.1875 958.65683 305.99942 962.4375 310.6875 962.4375 C 315.37558 962.4375 327.1875 958.65683 327.1875 953.96875 L 327.1875 953.90625 C 327.15255 949.24313 315.35075 945.46875 310.6875 945.46875 z M 310.6875 948.875 C 313.48236 948.875 315.7603 951.11147 315.78125 953.90625 L 315.78125 953.96875 C 315.78125 956.77848 313.49723 959.03125 310.6875 959.03125 C 307.87777 959.03125 305.59375 956.77848 305.59375 953.96875 C 305.59375 951.15902 307.87777 948.875 310.6875 948.875 z "
+       transform="translate(0,-197.63782)"
+       id="path6273-5-9"
+       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/show_hide_all_layers.png"
+       inkscape:export-xdpi="35.48"
+       inkscape:export-ydpi="35.48" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ff0000;fill-opacity:0.50869565;stroke:none"
+       d="m 354.36799,747.46363 c -4.68808,0 -16.5,3.81192 -16.5,8.5 0,4.68808 11.81192,8.46875 16.5,8.46875 4.68808,0 16.5,-3.78067 16.5,-8.46875 l 0,-0.0625 c -0.0349,-4.66312 -11.83675,-8.4375 -16.5,-8.4375 z m 0,3.40625 c 2.79486,0 5.0728,2.23647 5.09375,5.03125 l 0,0.0625 c 0,2.80973 -2.28402,5.0625 -5.09375,5.0625 -2.80973,0 -5.09375,-2.25277 -5.09375,-5.0625 0,-2.80973 2.28402,-5.09375 5.09375,-5.09375 z"
+       id="path6273-5-9-1"
+       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/hide_layer.png"
+       inkscape:export-xdpi="35.48"
+       inkscape:export-ydpi="35.48" />
+    <g
+       id="g4651"
+       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/reset_workspace.png"
+       inkscape:export-xdpi="1446.5699"
+       inkscape:export-ydpi="1446.5699">
       <path
          sodipodi:nodetypes="ccccc"
          inkscape:export-ydpi="392.73001"
          inkscape:export-xdpi="392.73001"
          inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
          inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-47-6-8-5"
-         d="m 75.301301,6.0855989 0.0026,-0.311928 0.98174,-2.69e-4 -0.0062,0.312332 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="path4477-1-8-1-0-9-3"
+         d="m 386.62256,747.24958 21.59146,0.0356 0.0187,17.36124 -21.61947,-0.0841 z"
+         style="fill:none;stroke:#008700;stroke-width:1.69783664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
+         inkscape:export-ydpi="888.16077"
+         inkscape:export-xdpi="888.16077"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
          sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
          inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-47-6"
-         d="m 72.77738,3.7015257 0.311928,0.00263 2.69e-4,0.9817392 -0.312332,-0.00618 z"
+         id="path7032-6-3-6-0-9-9-97-7-3-5-0-8"
+         d="m 410.96687,756.27791 0.0102,-0.66258 -27.10217,0.0144 -0.006,0.65095 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
       <path
+         inkscape:export-ydpi="888.16077"
+         inkscape:export-xdpi="888.16077"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/to_back_one.png"
          sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
          inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-47-6-8"
-         d="m 74.20741,3.7015257 0.311928,0.00263 2.69e-4,0.9817392 -0.312332,-0.00618 z"
+         id="path7032-6-3-6-0-9-9-97-7-3-5-0-8-3"
+         d="m 397.75289,745.40412 -0.66258,-0.0102 0.0144,21.10217 0.65095,0.006 z"
          style="fill:#008700;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g5456"
+       inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/shift.png"
+       inkscape:export-xdpi="1578.1899"
+       inkscape:export-ydpi="1578.1899">
+      <g
+         inkscape:export-ydpi="1578.1899"
+         inkscape:export-xdpi="1578.1899"
+         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/shift.png"
+         transform="matrix(0.89626814,0,0,0.89626814,37.4726,78.467983)"
+         style="fill:none;stroke:#008700;stroke-width:1.11573756;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="g8075">
+        <rect
+           style="fill:none;stroke:#008700;stroke-width:1.11573756;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect8073"
+           width="6.3037992"
+           height="6.3037992"
+           x="433.72388"
+           y="950.45697"
+           transform="translate(0,-197.63782)" />
+      </g>
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-47-6-85"
-         d="m 72.77738,7.1390257 0.311928,0.00263 2.69e-4,0.9817392 -0.312332,-0.00618 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="rect5425"
+         d="m 436.37741,756.02075 -14.69394,0"
+         style="fill:none;stroke:#008700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:export-ydpi="392.73001"
-         inkscape:export-xdpi="392.73001"
-         inkscape:export-filename="/home/xtingray/tupi/sources/tupi/src/themes/default/icons/frame_number.png"
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4477-1-8-1-0-9-47-6-8-8"
-         d="m 74.20741,7.1390257 0.311928,0.00263 2.69e-4,0.9817392 -0.312332,-0.00618 z"
-         style="fill:#008700;fill-opacity:1;stroke:none" />
+         id="rect5425-8"
+         d="m 429.03044,748.67378 0,14.69394"
+         style="fill:none;stroke:#008700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     </g>
-    <path
-       style="fill:none;fill-opacity:1;stroke:none"
-       d="m 78.067346,5.3255758 0.261088,-0.3724144 c 1.105357,0.054686 2.211094,0.072242 3.317457,0.083814 l 0.482059,0.3236463 -0.03773,2.1292512 -4.109375,0.0625 z"
-       id="rect3928-2-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 78.498438,5.4263292 -0.05792,1.7931954 3.326397,-0.040403 -0.116961,-1.6838203 z"
-       id="path4327-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 77.87325,5.6994658 -0.0065,2.0681635 4.441515,-0.0221 -0.07734,-2.5522132 -0.576527,-0.3110924 -3.371808,-0.034879 -0.465855,0.7304485 0.359375,-0.030925 0.314412,-0.4200748 3.124211,-0.00541 0.32893,0.2708044 0.03314,2.0881747 -3.756504,0 -0.05982,-1.8029987 z"
-       id="path3132-4-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862"
-       sodipodi:nodetypes="ccccccccccccccc" />
-    <path
-       style="fill:none;fill-opacity:1;stroke:#008700;stroke-width:0.22586207000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       d="m 81.063224,6.3366539 c 0,0.4823691 -0.418969,0.8734065 -0.935793,0.8734065 -0.516824,0 -0.935792,-0.3910374 -0.935792,-0.8734065 0,-0.482369 0.358726,-0.8762857 0.873406,-0.9233153 0.409644,-0.037432 1.049067,0.2043973 1.048376,0.8738293"
-       id="path4303-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#linearGradient4339-2);fill-opacity:1;stroke:#008700;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path4325-7"
-       sodipodi:cx="53.806408"
-       sodipodi:cy="7.3577971"
-       sodipodi:rx="0.68500972"
-       sodipodi:ry="0.66291261"
-       d="m 54.491418,7.3577971 a 0.68500972,0.66291261 0 1 1 -8.2e-4,-0.032422"
-       sodipodi:start="0"
-       sodipodi:end="6.2342569"
-       sodipodi:open="true"
-       transform="matrix(0.81142293,0,0,0.81142293,36.492633,0.33438897)"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="M 80.860931,4.9690877 80.7173,4.2067382 l 0.850737,0.011048 c 0,0 -0.110485,0.8065437 -0.165728,0.8065437 -0.05524,0 -0.243068,-0.066291 -0.243068,-0.066291 l 0.110486,-0.4640388 -0.232019,-0.011049 0.06629,0.4971844 z"
-       id="path4329-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccsccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       style="fill:#008700;fill-opacity:1;stroke:none"
-       d="m 81.248995,5.3347997 0.531251,0.00781 0.0078,0.296875 -0.429688,0.03125 z"
-       id="rect4341-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/photo.png"
-       inkscape:export-xdpi="541.01862"
-       inkscape:export-ydpi="541.01862" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 71.603688,37.224779 4.648858,-0.109375"
-       id="path5062-7-4-7-6"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
-       inkscape:export-xdpi="433.32001"
-       inkscape:export-ydpi="433.32001"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 71.528704,40.666103 4.634803,-0.1875"
-       id="path5062-7-4-2-5-0"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
-       inkscape:export-xdpi="433.32001"
-       inkscape:export-ydpi="433.32001"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 72.065394,36.840087 0.04956,4.167624"
-       id="path5062-7-4-5-6-6"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
-       inkscape:export-xdpi="433.32001"
-       inkscape:export-ydpi="433.32001"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 75.819868,36.747907 -0.01674,4.233915"
-       id="path5062-7-4-5-2-9-2"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
-       inkscape:export-xdpi="433.32001"
-       inkscape:export-ydpi="433.32001"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 74.858482,38.247529 0.910803,0.607012"
-       id="path5062-3-7-2-4-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
-       inkscape:export-xdpi="433.32001"
-       inkscape:export-ydpi="433.32001" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 75.788941,38.76258 -3.543793,0.136711"
-       id="path5062-3-7-0-6-3-5-6-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
-       inkscape:export-xdpi="433.32001"
-       inkscape:export-ydpi="433.32001" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 74.908416,39.329477 0.821555,-0.621908"
-       id="path5062-3-7-2-4-2-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
-       inkscape:export-xdpi="433.32001"
-       inkscape:export-ydpi="433.32001" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 73.186243,39.4004 72.297818,38.903629"
-       id="path5062-3-7-2-4-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
-       inkscape:export-xdpi="433.32001"
-       inkscape:export-ydpi="433.32001" />
-    <path
-       style="fill:none;stroke:#008700;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 73.079262,38.298195 -0.837179,0.668782"
-       id="path5062-3-7-2-4-2-2-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/xtingray/tupi/sources/huayra/tupi/src/themes/default/icons/grid_spacing.png"
-       inkscape:export-xdpi="433.32001"
-       inkscape:export-ydpi="433.32001" />
   </g>
 </svg>
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/move_layer_down.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/move_layer_down.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/move_layer_up.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/move_layer_up.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/papagayo.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/papagayo.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/pause.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/pause.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/reset_workspace.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/reset_workspace.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/shift.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/shift.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/show_hide_all_layers.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/show_hide_all_layers.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/show_layer.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/show_layer.png differ
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/src/themes/default/icons/sound_object.png and /tmp/x_3ooyo8DI/tupi-0.2+git05/src/themes/default/icons/sound_object.png differ
diff -Nru tupi-0.2+git04/tools/build_mac_osx_app.sh tupi-0.2+git05/tools/build_mac_osx_app.sh
--- tupi-0.2+git04/tools/build_mac_osx_app.sh	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/tools/build_mac_osx_app.sh	2014-12-15 14:21:34.000000000 +0000
@@ -38,6 +38,9 @@
 #Usage:
 # ./tools/build_mac_osx_app.sh /Users/username/Projects/tupi /Users/username/Projects/dist
 
+export PATH=/Users/parquesoft/Qt5.3.0/5.3/clang_64/bin:$PATH
+export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
+
 TUPI_GIT_REPOSITORY=$1
 TUPI_INSTALL=$2
 INSTALL_NAME=$TUPI_GIT_REPOSITORY/tools/update_dylib_path.rb
@@ -48,7 +51,7 @@
 
 cd $TUPI_GIT_REPOSITORY
 
-make uninstall
+# make uninstall
 make install
 
 cd $TUPI_INSTALL
@@ -67,18 +70,17 @@
     find . -name "*.dylib" -exec $INSTALL_NAME $TUPI_INSTALL/Tupi.app/Contents/MacOS/plugins/{} $lib @executable_path/../Frameworks/$lib \;
 done
 
-
 cd $TUPI_INSTALL/Tupi.app/Contents/MacOS
 
 for lib in ${LIBS[@]}; do
     $INSTALL_NAME $TUPI_INSTALL/Tupi.app/Contents/MacOS/Tupi $lib @executable_path/../Frameworks/$lib  \;
 done
 
-cp -r /usr/local/Cellar/qt/4.8.3/lib/QtGui.framework/Versions/4/Resources/qt_menu.nib $TUPI_INSTALL/Tupi.app/Contents/Resources
+# cp -r /usr/local/Cellar/qt/4.8.3/lib/QtGui.framework/Versions/4/Resources/qt_menu.nib $TUPI_INSTALL/Tupi.app/Contents/Resources
+cp -r /Users/parquesoft/Qt5.3.0/MaintenanceTool.app/Contents/Resources/qt_menu.nib $TUPI_INSTALL/Tupi.app/Contents/Resources
 
 cd $TUPI_INSTALL
 
-
 mkdir Tupi.app/Contents/Frameworks/
 
 for lib in ${LIBS[@]}; do
diff -Nru tupi-0.2+git04/tools/update_dylib_path.rb tupi-0.2+git05/tools/update_dylib_path.rb
--- tupi-0.2+git04/tools/update_dylib_path.rb	2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/tools/update_dylib_path.rb	2014-12-15 14:21:34.000000000 +0000
@@ -43,7 +43,7 @@
 
 puts "---------------------------------------------"
 puts "Libs for: #{library}"
-libs.each do |line|
+libs.each_line do |line|
   parsed = line.chop().gsub(/#{oldpath}/, newpath)
   cmd = "install_name_tool -change #{line.chop()} #{parsed} #{library}"
   puts cmd
diff -Nru tupi-0.2+git04/tools/win32/copy64.vbs tupi-0.2+git05/tools/win32/copy64.vbs
--- tupi-0.2+git04/tools/win32/copy64.vbs	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/tools/win32/copy64.vbs	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,74 @@
+Set fileSystem = CreateObject("Scripting.FileSystemObject")
+
+zlibDir = "c:\zlib64\dllx64"
+quazipDir = "c:\Quazip\lib"
+sourceDir = "c:\tupi\sources\tupi\src"
+tupiDir = "c:\maefloresta"
+
+If fileSystem.FolderExists(tupiDir) Then
+fileSystem.DeleteFolder tupiDir
+End If
+
+fileSystem.CreateFolder tupiDir
+fileSystem.CreateFolder tupiDir & "\bin"
+fileSystem.CreateFolder tupiDir & "\bin\platforms"
+fileSystem.CreateFolder tupiDir & "\data"
+fileSystem.CreateFolder tupiDir & "\plugins"
+fileSystem.CreateFolder tupiDir & "\lib"
+fileSystem.CreateFolder tupiDir & "\lib\qt5"
+fileSystem.CreateFolder tupiDir & "\lib\libav"
+
+fileSystem.CopyFile "c:\tupi\sources\platforms\qwindows.dll", tupiDir & "\bin\platforms\qwindows.dll"
+fileSystem.CopyFile quazipDir & "\quazip.dll", tupiDir & "\lib\quazip.dll"
+fileSystem.CopyFile "c:\tupi\sources\tupi\tools\win32\tupi.iss", tupiDir & "\tupi.iss"
+fileSystem.CopyFile "c:\tupi\sources\tupi\tools\win32\tupi.ico", tupiDir & "\bin\tupi.ico"
+fileSystem.CopyFile "c:\tupi\sources\tupi\tools\win32\tupi.bat", tupiDir & "\bin\tupi.bat"
+fileSystem.CopyFile sourceDir & "\shell\release\tupi.exe", tupiDir & "\bin\tupi.exe"
+fileSystem.CopyFile sourceDir & "\framework\tcore\release\tupifwcore.dll", tupiDir & "\lib\tupifwcore.dll"
+fileSystem.CopyFile sourceDir & "\framework\tgui\release\tupifwgui.dll", tupiDir & "\lib\tupifwgui.dll"
+fileSystem.CopyFile sourceDir & "\store\release\tupistore.dll", tupiDir & "\lib\tupistore.dll"
+fileSystem.CopyFile sourceDir & "\libbase\release\tupibase.dll", tupiDir & "\lib\tupibase.dll"
+fileSystem.CopyFile sourceDir & "\libtupi\release\tupi.dll", tupiDir & "\lib\tupi.dll"
+fileSystem.CopyFile sourceDir & "\libui\release\tupigui.dll", tupiDir & "\lib\tupigui.dll"
+fileSystem.CopyFile sourceDir & "\net\release\tupinet.dll", tupiDir & "\lib\tupinet.dll"
+fileSystem.CopyFile sourceDir & "\components\animation\release\tupianimation.dll", tupiDir & "\lib\tupianimation.dll"
+fileSystem.CopyFile sourceDir & "\components\colorpalette\release\tupicolorpalette.dll", tupiDir & "\lib\tupicolorpalette.dll"
+fileSystem.CopyFile sourceDir & "\components\export\release\tupiexport.dll", tupiDir & "\lib\tupiexport.dll"
+fileSystem.CopyFile sourceDir & "\components\exposure\release\tupiexposure.dll", tupiDir & "\lib\tupiexposure.dll"
+fileSystem.CopyFile sourceDir & "\components\help\release\tupihelp.dll", tupiDir & "\lib\tupihelp.dll"
+fileSystem.CopyFile sourceDir & "\components\import\release\tupimport.dll", tupiDir & "\lib\tupimport.dll"
+fileSystem.CopyFile sourceDir & "\components\library\release\tupilibrary.dll", tupiDir & "\lib\tupilibrary.dll"
+fileSystem.CopyFile sourceDir & "\components\paintarea\release\tupipaintarea.dll", tupiDir & "\lib\tupipaintarea.dll"
+fileSystem.CopyFile sourceDir & "\components\pen\release\tupipen.dll", tupiDir & "\lib\tupipen.dll"
+fileSystem.CopyFile sourceDir & "\components\scenes\release\tupiscenes.dll", tupiDir & "\lib\tupiscenes.dll"
+fileSystem.CopyFile sourceDir & "\components\timeline\release\tupitimeline.dll", tupiDir & "\lib\tupitimeline.dll"
+fileSystem.CopyFile sourceDir & "\components\twitter\release\tupitwitter.dll", tupiDir & "\lib\tupitwitter.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\common\release\tupiplugincommon.dll", tupiDir & "\lib\tupiplugincommon.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\color\release\tupicoloringtool.dll", tupiDir & "\plugins\tupicoloringtool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\compound\release\tupicompoundtool.dll", tupiDir & "\plugins\tupicompoundtool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\eraser\release\tupierasertool.dll", tupiDir & "\plugins\tupierasertool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\fill\release\tupifilltool.dll", tupiDir & "\plugins\tupifilltool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\geometric\release\tupigeometrictool.dll", tupiDir & "\plugins\tupigeometrictool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\ink\release\tupiinktool.dll", tupiDir & "\plugins\tupiinktool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\nodes\release\tupinodestool.dll", tupiDir & "\plugins\tupinodestool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\opacity\release\tupiopacitytool.dll", tupiDir & "\plugins\tupiopacitytool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\pencil\release\tupipenciltool.dll", tupiDir & "\plugins\tupipenciltool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\polyline\release\tupipolylinetool.dll", tupiDir & "\plugins\tupipolylinetool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\position\release\tupipositiontool.dll", tupiDir & "\plugins\tupipositiontool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\rotation\release\tupirotationtool.dll", tupiDir & "\plugins\tupirotationtool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\scale\release\tupiscaletool.dll", tupiDir & "\plugins\tupiscaletool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\selection\release\tupiselectiontool.dll", tupiDir & "\plugins\tupiselectiontool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\shear\release\tupisheartool.dll", tupiDir & "\plugins\tupisheartool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\shift\release\tupishifttool.dll", tupiDir & "\plugins\tupishifttool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\text\release\tupitexttool.dll", tupiDir & "\plugins\tupitexttool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\export\imageplugin\release\tupiimageplugin.dll", tupiDir & "\plugins\tupiimageplugin.dll"
+fileSystem.CopyFile sourceDir & "\plugins\export\libavplugin\release\tupilibavplugin.dll", tupiDir & "\plugins\tupilibavplugin.dll"
+
+fileSystem.CopyFolder sourceDir & "\shell\data", tupiDir & "\data"
+fileSystem.CopyFolder sourceDir & "\components\help\help", tupiDir & "\data\help"
+fileSystem.CopyFolder sourceDir & "\components\colorpalette\palettes", tupiDir & "\data\palettes"
+fileSystem.CopyFolder sourceDir & "\themes", tupiDir & "\data\themes"
+fileSystem.CopyFolder "c:\tupi\sources\qt5", tupiDir & "\lib\qt5"
+fileSystem.CopyFolder "c:\tupi\sources\libav", tupiDir & "\lib\libav"
+
+MsgBox "Copy is done! :D"
diff -Nru tupi-0.2+git04/tools/win32/copy.vbs tupi-0.2+git05/tools/win32/copy.vbs
--- tupi-0.2+git04/tools/win32/copy.vbs	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/tools/win32/copy.vbs	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,73 @@
+Set fileSystem = CreateObject("Scripting.FileSystemObject")
+
+quazipDir = "c:\Quazip\lib"
+sourceDir = "c:\tupi\sources\tupi\src"
+tupiDir = "c:\maefloresta"
+
+If fileSystem.FolderExists(tupiDir) Then
+fileSystem.DeleteFolder tupiDir
+End If
+
+fileSystem.CreateFolder tupiDir
+fileSystem.CreateFolder tupiDir & "\bin"
+fileSystem.CreateFolder tupiDir & "\bin\platforms"
+fileSystem.CreateFolder tupiDir & "\data"
+fileSystem.CreateFolder tupiDir & "\plugins"
+fileSystem.CreateFolder tupiDir & "\lib"
+fileSystem.CreateFolder tupiDir & "\lib\qt5"
+fileSystem.CreateFolder tupiDir & "\lib\libav"
+
+fileSystem.CopyFile "c:\tupi\sources\platforms\qwindows.dll", tupiDir & "\bin\platforms\qwindows.dll"
+fileSystem.CopyFile quazipDir & "\quazip.dll", tupiDir & "\lib\quazip.dll"
+fileSystem.CopyFile "c:\tupi\sources\tupi\tools\win32\tupi.iss", tupiDir & "\tupi.iss"
+fileSystem.CopyFile "c:\tupi\sources\tupi\tools\win32\tupi.ico", tupiDir & "\bin\tupi.ico"
+fileSystem.CopyFile "c:\tupi\sources\tupi\tools\win32\tupi.bat", tupiDir & "\bin\tupi.bat"
+fileSystem.CopyFile sourceDir & "\shell\release\tupi.exe", tupiDir & "\bin\tupi.exe"
+fileSystem.CopyFile sourceDir & "\framework\tcore\release\tupifwcore.dll", tupiDir & "\lib\tupifwcore.dll"
+fileSystem.CopyFile sourceDir & "\framework\tgui\release\tupifwgui.dll", tupiDir & "\lib\tupifwgui.dll"
+fileSystem.CopyFile sourceDir & "\store\release\tupistore.dll", tupiDir & "\lib\tupistore.dll"
+fileSystem.CopyFile sourceDir & "\libbase\release\tupibase.dll", tupiDir & "\lib\tupibase.dll"
+fileSystem.CopyFile sourceDir & "\libtupi\release\tupi.dll", tupiDir & "\lib\tupi.dll"
+fileSystem.CopyFile sourceDir & "\libui\release\tupigui.dll", tupiDir & "\lib\tupigui.dll"
+fileSystem.CopyFile sourceDir & "\net\release\tupinet.dll", tupiDir & "\lib\tupinet.dll"
+fileSystem.CopyFile sourceDir & "\components\animation\release\tupianimation.dll", tupiDir & "\lib\tupianimation.dll"
+fileSystem.CopyFile sourceDir & "\components\colorpalette\release\tupicolorpalette.dll", tupiDir & "\lib\tupicolorpalette.dll"
+fileSystem.CopyFile sourceDir & "\components\export\release\tupiexport.dll", tupiDir & "\lib\tupiexport.dll"
+fileSystem.CopyFile sourceDir & "\components\exposure\release\tupiexposure.dll", tupiDir & "\lib\tupiexposure.dll"
+fileSystem.CopyFile sourceDir & "\components\help\release\tupihelp.dll", tupiDir & "\lib\tupihelp.dll"
+fileSystem.CopyFile sourceDir & "\components\import\release\tupimport.dll", tupiDir & "\lib\tupimport.dll"
+fileSystem.CopyFile sourceDir & "\components\library\release\tupilibrary.dll", tupiDir & "\lib\tupilibrary.dll"
+fileSystem.CopyFile sourceDir & "\components\paintarea\release\tupipaintarea.dll", tupiDir & "\lib\tupipaintarea.dll"
+fileSystem.CopyFile sourceDir & "\components\pen\release\tupipen.dll", tupiDir & "\lib\tupipen.dll"
+fileSystem.CopyFile sourceDir & "\components\scenes\release\tupiscenes.dll", tupiDir & "\lib\tupiscenes.dll"
+fileSystem.CopyFile sourceDir & "\components\timeline\release\tupitimeline.dll", tupiDir & "\lib\tupitimeline.dll"
+fileSystem.CopyFile sourceDir & "\components\twitter\release\tupitwitter.dll", tupiDir & "\lib\tupitwitter.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\common\release\tupiplugincommon.dll", tupiDir & "\lib\tupiplugincommon.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\color\release\tupicoloringtool.dll", tupiDir & "\plugins\tupicoloringtool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\compound\release\tupicompoundtool.dll", tupiDir & "\plugins\tupicompoundtool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\eraser\release\tupierasertool.dll", tupiDir & "\plugins\tupierasertool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\fill\release\tupifilltool.dll", tupiDir & "\plugins\tupifilltool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\geometric\release\tupigeometrictool.dll", tupiDir & "\plugins\tupigeometrictool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\ink\release\tupiinktool.dll", tupiDir & "\plugins\tupiinktool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\nodes\release\tupinodestool.dll", tupiDir & "\plugins\tupinodestool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\opacity\release\tupiopacitytool.dll", tupiDir & "\plugins\tupiopacitytool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\pencil\release\tupipenciltool.dll", tupiDir & "\plugins\tupipenciltool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\polyline\release\tupipolylinetool.dll", tupiDir & "\plugins\tupipolylinetool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\position\release\tupipositiontool.dll", tupiDir & "\plugins\tupipositiontool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\rotation\release\tupirotationtool.dll", tupiDir & "\plugins\tupirotationtool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\scale\release\tupiscaletool.dll", tupiDir & "\plugins\tupiscaletool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\selection\release\tupiselectiontool.dll", tupiDir & "\plugins\tupiselectiontool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\shear\release\tupisheartool.dll", tupiDir & "\plugins\tupisheartool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\text\release\tupitexttool.dll", tupiDir & "\plugins\tupitexttool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\tools\shift\release\tupishifttool.dll", tupiDir & "\plugins\tupishifttool.dll"
+fileSystem.CopyFile sourceDir & "\plugins\export\imageplugin\release\tupiimageplugin.dll", tupiDir & "\plugins\tupiimageplugin.dll"
+fileSystem.CopyFile sourceDir & "\plugins\export\libavplugin\release\tupilibavplugin.dll", tupiDir & "\plugins\tupilibavplugin.dll"
+
+fileSystem.CopyFolder sourceDir & "\shell\data", tupiDir & "\data"
+fileSystem.CopyFolder sourceDir & "\components\help\help", tupiDir & "\data\help"
+fileSystem.CopyFolder sourceDir & "\components\colorpalette\palettes", tupiDir & "\data\palettes"
+fileSystem.CopyFolder sourceDir & "\themes", tupiDir & "\data\themes"
+fileSystem.CopyFolder "c:\tupi\sources\qt5", tupiDir & "\lib\qt5"
+fileSystem.CopyFolder "c:\tupi\sources\libav", tupiDir & "\lib\libav"
+
+MsgBox "Copy is done! :D"
diff -Nru tupi-0.2+git04/tools/win32/libav.bat tupi-0.2+git05/tools/win32/libav.bat
--- tupi-0.2+git04/tools/win32/libav.bat	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/tools/win32/libav.bat	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,18 @@
+copy C:\libav\bin\avcodec-55.dll C:\tupi\sources\libav\
+copy C:\libav\bin\avdevice-54.dll C:\tupi\sources\libav\
+copy C:\libav\bin\avfilter-4.dll C:\tupi\sources\libav\
+copy C:\libav\bin\avformat-55.dll C:\tupi\sources\libav\
+copy C:\libav\bin\avresample-1.dll C:\tupi\sources\libav\
+copy C:\libav\bin\avutil-53.dll C:\tupi\sources\libav\
+copy C:\libav\bin\libmp3lame-0.dll C:\tupi\sources\libav\
+copy C:\libav\bin\libogg-0.dll C:\tupi\sources\libav\
+copy C:\libav\bin\libopus-0.dll C:\tupi\sources\libav\
+copy C:\libav\bin\librtmp.dll C:\tupi\sources\libav\
+copy C:\libav\bin\libvo-aacenc-0.dll C:\tupi\sources\libav\
+copy C:\libav\bin\libvorbis-0.dll C:\tupi\sources\libav\
+copy C:\libav\bin\libvorbisenc-2.dll C:\tupi\sources\libav\
+copy C:\libav\bin\libvorbisfile-3.dll C:\tupi\sources\libav\
+copy C:\libav\bin\libx264-125.dll C:\tupi\sources\libav\
+copy C:\libav\bin\SDL.dll C:\tupi\sources\libav\
+copy C:\libav\bin\swscale-2.dll C:\tupi\sources\libav\
+copy C:\libav\bin\zlib1.dll C:\tupi\sources\libav\
diff -Nru tupi-0.2+git04/tools/win32/qt5.bat tupi-0.2+git05/tools/win32/qt5.bat
--- tupi-0.2+git04/tools/win32/qt5.bat	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/tools/win32/qt5.bat	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,17 @@
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\icudt52.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\icuin52.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\icuuc52.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\libgcc_s_dw2-1.dll C:\tupi\sources\qt5\
+copy "C:\Qt-5.3.2\5.3\mingw482_32\bin\libstdc++-6.dll" C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\libwinpthread-1.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5Core.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5Gui.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5Multimedia.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5MultimediaWidgets.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5Network.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5OpenGL.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5PrintSupport.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5Svg.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5Widgets.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\bin\Qt5Xml.dll C:\tupi\sources\qt5\
+copy C:\Qt-5.3.2\5.3\mingw482_32\plugins\platforms\qwindows.dll C:\tupi\sources\platforms\
diff -Nru tupi-0.2+git04/tools/win32/tupi.bat tupi-0.2+git05/tools/win32/tupi.bat
--- tupi-0.2+git04/tools/win32/tupi.bat	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/tools/win32/tupi.bat	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,5 @@
+set TUPI_HOME=c:\maefloresta
+set PATH=c:\maefloresta\lib;c:\maefloresta\lib\qt5;c:\maefloresta\lib\libav
+set TUPI_SHARE=c:\maefloresta\data
+set TUPI_PLUGIN=c:\maefloresta\plugins
+tupi.exe
Binary files /tmp/_5KeXDu2Bl/tupi-0.2+git04/tools/win32/tupi.ico and /tmp/x_3ooyo8DI/tupi-0.2+git05/tools/win32/tupi.ico differ
diff -Nru tupi-0.2+git04/tools/win32/tupi.iss tupi-0.2+git05/tools/win32/tupi.iss
--- tupi-0.2+git04/tools/win32/tupi.iss	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/tools/win32/tupi.iss	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,89 @@
+[Setup]
+AppName=Tupi
+AppVersion=0.2-5
+DefaultDirName={pf}\Tupi
+DefaultGroupName=Tupi Open 2D Magic
+OutputDir=c:\tupi\installer
+ChangesEnvironment=yes
+ChangesAssociations=yes
+
+[Dirs]
+Name: "{app}\bin"
+Name: "{app}\bin\platforms"
+Name: "{app}\data"
+Name: "{app}\data\help"
+Name: "{app}\data\help\css"
+Name: "{app}\data\help\en"
+Name: "{app}\data\help\es"
+Name: "{app}\data\help\examples"
+Name: "{app}\data\help\gl"
+Name: "{app}\data\help\images"
+Name: "{app}\data\help\ru"
+Name: "{app}\data\palettes"
+Name: "{app}\data\storyboard"
+Name: "{app}\data\themes"
+Name: "{app}\data\themes\default"
+Name: "{app}\data\themes\default\cursors"
+Name: "{app}\data\themes\default\icons"
+Name: "{app}\data\themes\default\images"
+Name: "{app}\data\translations"
+Name: "{app}\data\xml"
+Name: "{app}\data\xml\ca"
+Name: "{app}\data\xml\cs"
+Name: "{app}\data\xml\da"
+Name: "{app}\data\xml\de"
+Name: "{app}\data\xml\en"
+Name: "{app}\data\xml\es"
+Name: "{app}\data\xml\gl"
+Name: "{app}\data\xml\pt"
+Name: "{app}\data\xml\ru"
+Name: "{app}\data\xml\uk"
+Name: "{app}\plugins"
+Name: "{app}\lib"
+Name: "{app}\lib\qt5"
+Name: "{app}\lib\libav"
+
+[Files]
+Source: "bin\*"; DestDir: "{app}\bin"
+Source: "bin\platforms\*"; DestDir: "{app}\bin\platforms"
+Source: "data\help\css\*"; DestDir: "{app}\data\help\css"
+Source: "data\help\en\*"; DestDir: "{app}\data\help\en"
+Source: "data\help\es\*"; DestDir: "{app}\data\help\es"
+Source: "data\help\examples\*"; DestDir: "{app}\data\help\examples"
+Source: "data\help\gl\*"; DestDir: "{app}\data\help\gl"
+Source: "data\help\images\*"; DestDir: "{app}\data\help\images"
+Source: "data\help\ru\*"; DestDir: "{app}\data\help\ru"
+Source: "data\palettes\*"; DestDir: "{app}\data\palettes"
+Source: "data\storyboard\*"; DestDir: "{app}\data\storyboard"
+Source: "data\themes\default\cursors\*"; DestDir: "{app}\data\themes\default\cursors"
+Source: "data\themes\default\icons\*"; DestDir: "{app}\data\themes\default\icons"
+Source: "data\themes\default\images\*"; DestDir: "{app}\data\themes\default\images"
+Source: "data\translations\*"; DestDir: "{app}\data\translations"
+Source: "data\xml\ca\*"; DestDir: "{app}\data\xml\ca"
+Source: "data\xml\cs\*"; DestDir: "{app}\data\xml\cs"
+Source: "data\xml\da\*"; DestDir: "{app}\data\xml\da"
+Source: "data\xml\de\*"; DestDir: "{app}\data\xml\de"
+Source: "data\xml\en\*"; DestDir: "{app}\data\xml\en"
+Source: "data\xml\es\*"; DestDir: "{app}\data\xml\es"
+Source: "data\xml\gl\*"; DestDir: "{app}\data\xml\gl"
+Source: "data\xml\pt\*"; DestDir: "{app}\data\xml\pt"
+Source: "data\xml\ru\*"; DestDir: "{app}\data\xml\ru"
+Source: "data\xml\uk\*"; DestDir: "{app}\data\xml\uk"
+Source: "plugins\*"; DestDir: "{app}\plugins"
+Source: "lib\*"; DestDir: "{app}\lib"
+Source: "lib\qt5\*"; DestDir: "{app}\lib\qt5"
+Source: "lib\libav\*"; DestDir: "{app}\lib\libav"
+
+[Registry]
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: string; ValueName: "TUPI_HOME"; ValueData: "{app}"
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\lib;{app}\lib\qt5;{app}\lib\libav"
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: string; ValueName: "TUPI_SHARE"; ValueData: "{app}\data"
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: string; ValueName: "TUPI_PLUGIN"; ValueData: "{app}\plugins"
+Root: HKCR; Subkey: ".tup"; ValueType: string; ValueName: ""; ValueData: "TupiOpen2DMagic"; Flags: uninsdeletevalue 
+Root: HKCR; Subkey: "TupiOpen2DMagic"; ValueType: string; ValueName: ""; ValueData: "Tupi Open 2D Magic"; Flags: uninsdeletekey
+Root: HKCR; Subkey: "TupiOpen2DMagic\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\tupi.ico,0" 
+Root: HKCR; Subkey: "TupiOpen2DMagic\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\tupi.exe"" ""%1""" 
+
+[Icons]
+Name: "{group}\Tupi"; Filename: "{app}\bin\tupi.exe"; IconFilename: "{app}\bin\tupi.ico"
+
diff -Nru tupi-0.2+git04/tupiglobal.pri tupi-0.2+git05/tupiglobal.pri
--- tupi-0.2+git04/tupiglobal.pri	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/tupiglobal.pri	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,10 @@
+# Generated automatically at 2014-12-14 22:24:40 -0500! PLEASE DO NOT EDIT!
+INCLUDEPATH += /usr/include/libavformat/ /usr/include/libavcodec/ /usr/include/quazip/
+LIBS += -ltheora -ltheoraenc -ltheoradec -logg -lquazip-qt5 -lavformat -lavcodec -lz -ltupifwgui -ltupifwcore
+QT += opengl core gui svg xml network
+DEFINES += HAVE_THEORA HAVE_LIBAV HAVE_QUAZIP HAVE_MULTIMEDIA HAVE_ZLIB VERSION=\\\"0.2\\\" CODE_NAME=\\\"Amandy\\\" REVISION=\\\"git05\\\" K_DEBUG
+unix {
+    MOC_DIR = .moc
+    UI_DIR = .ui
+    OBJECTS_DIR = .obj
+}
diff -Nru tupi-0.2+git04/win.pri tupi-0.2+git05/win.pri
--- tupi-0.2+git04/win.pri	1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/win.pri	2014-12-15 14:21:34.000000000 +0000
@@ -0,0 +1,5 @@
+#DEFINES += K_DEBUG HAVE_LIBAV
+DEFINES += HAVE_LIBAV
+contains(DEFINES, K_DEBUG) {
+    CONFIG += console
+}